[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1159-gc21d54f

[Jeremy Allison]

The branch, master has been updated
       via  c21d54f913c770f3530de500768919a2debbcc61 (commit)
       via  3a88316e233079199117731756d35d0aea4670e4 (commit)
      from  e3746ac922c29f90d0dbb23a76f5387daf21c8c3 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c21d54f913c770f3530de500768919a2debbcc61
Merge: 3a88316e233079199117731756d35d0aea4670e4 e3746ac922c29f90d0dbb23a76f5387daf21c8c3
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 24 12:35:33 2009 -0800

    Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba

commit 3a88316e233079199117731756d35d0aea4670e4
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 24 12:19:06 2009 -0800

    Fix the build. Looks like no one ever compiled this on a system
    with a libintl.h before.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source4/client/mount.cifs.c        |    2 ++
 source4/heimdal/kuser/kinit.c      |    2 ++
 source4/heimdal/lib/krb5/context.c |   12 ++++++++++++
 3 files changed, 16 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/client/mount.cifs.c b/source4/client/mount.cifs.c
index 7167859..899c90c 100644
--- a/source4/client/mount.cifs.c
+++ b/source4/client/mount.cifs.c
@@ -313,8 +313,10 @@ int main(int argc, char ** argv)
 	FILE * pmntfile;
 
 	/* setlocale(LC_ALL, "");
+#if defined(LOCALEDIR)
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE); */
+#endif
 
 	if(argc && argv) {
 		thisprogram = argv[0];
diff --git a/source4/heimdal/kuser/kinit.c b/source4/heimdal/kuser/kinit.c
index d1ef776..fbb2d22 100644
--- a/source4/heimdal/kuser/kinit.c
+++ b/source4/heimdal/kuser/kinit.c
@@ -726,8 +726,10 @@ main (int argc, char **argv)
     setprogname (argv[0]);
 
     setlocale (LC_ALL, "");
+#if defined(HEIMDAL_LOCALEDIR)
     bindtextdomain ("heimdal_kuser", HEIMDAL_LOCALEDIR);
     textdomain("heimdal_kuser");
+#endif
 
     ret = krb5_init_context (&context);
     if (ret == KRB5_CONFIG_BADFORMAT)
diff --git a/source4/heimdal/lib/krb5/context.c b/source4/heimdal/lib/krb5/context.c
index aa35a18..127dfa1 100644
--- a/source4/heimdal/lib/krb5/context.c
+++ b/source4/heimdal/lib/krb5/context.c
@@ -295,7 +295,9 @@ krb5_init_context(krb5_context *context)
     *context = NULL;
 
     /* should have a run_once */
+#if defined(HEIMDAL_LOCALEDIR)
     bindtextdomain(HEIMDAL_TEXTDOMAIN, HEIMDAL_LOCALEDIR);
+#endif
 
     p = calloc(1, sizeof(*p));
     if(!p)
@@ -836,21 +838,31 @@ krb5_init_ets(krb5_context context)
 {
     if(context->et_list == NULL){
 	krb5_add_et_list(context, initialize_krb5_error_table_r);
+#if defined(HEIMDAL_LOCALEDIR)
 	bindtextdomain(COM_ERR_BINDDOMAIN_krb5, HEIMDAL_LOCALEDIR);
+#endif
 
 	krb5_add_et_list(context, initialize_asn1_error_table_r);
+#if defined(HEIMDAL_LOCALEDIR)
 	bindtextdomain(COM_ERR_BINDDOMAIN_asn1, HEIMDAL_LOCALEDIR);
+#endif
 
 	krb5_add_et_list(context, initialize_heim_error_table_r);
+#if defined(HEIMDAL_LOCALEDIR)
 	bindtextdomain(COM_ERR_BINDDOMAIN_heim, HEIMDAL_LOCALEDIR);
+#endif
 
 	krb5_add_et_list(context, initialize_k524_error_table_r);
+#if defined(HEIMDAL_LOCALEDIR)
 	bindtextdomain(COM_ERR_BINDDOMAIN_k524, HEIMDAL_LOCALEDIR);
+#endif
 
 #ifdef PKINIT
 	krb5_add_et_list(context, initialize_hx_error_table_r);
+#if defined(HEIMDAL_LOCALEDIR)
 	bindtextdomain(COM_ERR_BINDDOMAIN_hx, HEIMDAL_LOCALEDIR);
 #endif
+#endif
     }
 }
 


-- 
Samba Shared Repository