[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  32c12cc libcli/auth Fix compile on hosts without krb5
      from  e1078b8 lib/util Move alpha_strcpy() from s3 into common code

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


- Log -----------------------------------------------------------------
commit 32c12cc27998eca564d1e2ca8c9201f1acc1a6a4
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Apr 14 18:21:45 2011 +1000

    libcli/auth Fix compile on hosts without krb5
    
    Andrew Bartlett
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Thu Apr 14 11:08:49 CEST 2011 on sn-devel-104

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

Summary of changes:
 libcli/auth/krb5_wrap.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/auth/krb5_wrap.c b/libcli/auth/krb5_wrap.c
index 48f50ec..0a466fd 100644
--- a/libcli/auth/krb5_wrap.c
+++ b/libcli/auth/krb5_wrap.c
@@ -21,10 +21,10 @@
 */
 
 #include "includes.h"
-#include "libcli/auth/krb5_wrap.h"
-
 #ifdef HAVE_KRB5
 
+#include "libcli/auth/krb5_wrap.h"
+
 #if defined(HAVE_KRB5_PRINCIPAL2SALT) && defined(HAVE_KRB5_USE_ENCTYPE) && defined(HAVE_KRB5_STRING_TO_KEY) && defined(HAVE_KRB5_ENCRYPT_BLOCK)
 int create_kerberos_key_from_string_direct(krb5_context context,
 						  krb5_principal host_princ,


-- 
Samba Shared Repository