s3: Attempt to fix the build without kerberos

Autobuild-User: Volker Lendecke <vl@samba.org>
Autobuild-Date: Tue Apr 24 15:04:14 CEST 2012 on sn-devel-104

diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h
index 70aebdb2c78be1cf5c3417d8a5c7b8690fdf5617..6a0f9dc2fdc6ecedc981aafb0cc9e63180503d42 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.h
+++ b/lib/krb5_wrap/krb5_samba.h
@@ -210,18 +210,17 @@ char *smb_get_krb5_error_message(krb5_context context,
                                 krb5_error_code code,
                                 TALLOC_CTX *mem_ctx);
 
-int cli_krb5_get_ticket(TALLOC_CTX *mem_ctx,
-                       const char *principal, time_t time_offset,
-                       DATA_BLOB *ticket, DATA_BLOB *session_key_krb5,
-                       uint32_t extra_ap_opts, const char *ccname,
-                       time_t *tgs_expire,
-                       const char *impersonate_princ_s);
-
 bool unwrap_edata_ntstatus(TALLOC_CTX *mem_ctx,
                           DATA_BLOB *edata,
                           DATA_BLOB *edata_out);
 
 #endif /* HAVE_KRB5 */
 
+int cli_krb5_get_ticket(TALLOC_CTX *mem_ctx,
+                       const char *principal, time_t time_offset,
+                       DATA_BLOB *ticket, DATA_BLOB *session_key_krb5,
+                       uint32_t extra_ap_opts, const char *ccname,
+                       time_t *tgs_expire,
+                       const char *impersonate_princ_s);
 
 #endif /* _KRB5_SAMBA_H */

diff --git a/source3/libads/authdata.c b/source3/libads/authdata.c
index cb218dd7b2bfbf5efca91776c62f7741e9986b71..f4ec5b907563ac380382ad2964b5a6d6ed9afdb7 100644 (file)
--- a/source3/libads/authdata.c
+++ b/source3/libads/authdata.c
@@ -31,10 +31,11 @@
 #include "librpc/crypto/gse.h"
 #include "auth/gensec/gensec.h"
 #include "../libcli/auth/spnego.h"
-#include "auth/kerberos/pac_utils.h"
 
 #ifdef HAVE_KRB5
 
+#include "auth/kerberos/pac_utils.h"
+
 struct smb_krb5_context;
 
 /****************************************************************

diff --git a/source3/librpc/crypto/gse.c b/source3/librpc/crypto/gse.c
index 96a1240554fc46b82a86ad1d300adbccd289af3d..a9c9c474108419efd8a801c10cafde326edf1d7c 100644 (file)
--- a/source3/librpc/crypto/gse.c
+++ b/source3/librpc/crypto/gse.c
@@ -28,10 +28,10 @@
 #include "auth/gensec/gensec.h"
 #include "auth/credentials/credentials.h"
 #include "../librpc/gen_ndr/dcerpc.h"
-#include "auth/kerberos/pac_utils.h"
 
 #if defined(HAVE_KRB5)
 
+#include "auth/kerberos/pac_utils.h"
 #include "gse_krb5.h"
 
 static char *gse_errstr(TALLOC_CTX *mem_ctx, OM_uint32 maj, OM_uint32 min);

diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index db9e4d0ff1c15fde978113e42c779d212df46b1a..0f8e54460bb02140731021f6f16023cf23c78650 100644 (file)
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -45,7 +45,10 @@
 #include "source3/include/auth.h"
 #include "source3/auth/proto.h"
 #include "nsswitch/libwbclient/wbclient.h"
+
+#if HAVE_KRB5
 #include "auth/kerberos/pac_utils.h"
+#endif
 
 #ifndef PAM_WINBIND_CONFIG_FILE
 #define PAM_WINBIND_CONFIG_FILE "/etc/security/pam_winbind.conf"