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

lib/krb5_wrap/krb5_samba.h

@@ -210,6 +210,12 @@ char *smb_get_krb5_error_message(krb5_context context,
 				 krb5_error_code code,
 				 TALLOC_CTX *mem_ctx);
 
+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,
@@ -217,11 +223,4 @@ int cli_krb5_get_ticket(TALLOC_CTX *mem_ctx,
 			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 */
-
-
 #endif /* _KRB5_SAMBA_H */

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;
 
 /****************************************************************

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);

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"