r14363: Remove credentials.h from the global includes.

(This used to be commit 98c4c3051391c6f89df5d133665f51bef66b1563)

6 files changed, 14 insertions, 1 deletions

diff --git a/source4/auth/credentials/credentials.h b/source4/auth/credentials/credentials.h
index eb4e5c96d0..58d393f762 100644
--- a/source4/auth/credentials/credentials.h
+++ b/source4/auth/credentials/credentials.h
@@ -20,6 +20,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
+#ifndef __CREDENTIALS_H__
+#define __CREDENTIALS_H__
 
 struct ccache_container;
 
@@ -103,3 +105,5 @@ struct cli_credentials {
 };
 
 #include "auth/credentials/credentials_proto.h"
+
+#endif /* __CREDENTIALS_H__ */
diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c
index c4e384c2cd..dd510f97f1 100644
--- a/source4/auth/credentials/credentials_files.c
+++ b/source4/auth/credentials/credentials_files.c
@@ -28,6 +28,7 @@
 #include "passdb/secrets.h"
 #include "system/filesys.h"
 #include "db_wrap.h"
+#include "auth/credentials/credentials.h"
 
 /**
  * Read a file descriptor, and parse it for a password (eg from a file or stdin)
diff --git a/source4/auth/credentials/credentials_ntlm.c b/source4/auth/credentials/credentials_ntlm.c
index eafd5e00a2..768ed9bb3f 100644
--- a/source4/auth/credentials/credentials_ntlm.c
+++ b/source4/auth/credentials/credentials_ntlm.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
 #include "lib/crypto/crypto.h"
+#include "auth/credentials/credentials.h"
 #include "libcli/auth/proto.h"
 
 void cli_credentials_get_ntlm_username_domain(struct cli_credentials *cred, TALLOC_CTX *mem_ctx, 
diff --git a/source4/auth/gensec/gensec.h b/source4/auth/gensec/gensec.h
index 2084ebb97a..1e9c74566c 100644
--- a/source4/auth/gensec/gensec.h
+++ b/source4/auth/gensec/gensec.h
@@ -21,6 +21,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef __GENSEC_H__
+#define __GENSEC_H__
+
 #define GENSEC_OID_NTLMSSP "1 3 6 1 4 1 311 2 2 10"
 #define GENSEC_OID_SPNEGO "1 3 6 1 5 5 2"
 #define GENSEC_OID_KERBEROS5 "1 2 840 113554 1 2 2"
@@ -124,4 +127,7 @@ struct gensec_critical_sizes {
 	int sizeof_gensec_security;
 };
 
+#include "auth/credentials/credentials.h"
 #include "gensec_proto.h"
+
+#endif /* __GENSEC_H__ */
diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h
index 2408291a48..d8f6155620 100644
--- a/source4/auth/kerberos/kerberos.h
+++ b/source4/auth/kerberos/kerberos.h
@@ -21,6 +21,7 @@
 
 #if defined(HAVE_KRB5)
 
+#include "auth/credentials/credentials.h"
 #include "auth/kerberos/krb5_init_context.h"
 
 struct ccache_container {
@@ -166,4 +167,3 @@ NTSTATUS kerberos_decode_pac(TALLOC_CTX *mem_ctx,
 #include "auth/kerberos/proto.h"
 
 #endif /* HAVE_KRB5 */
-
diff --git a/source4/auth/ntlm_check.c b/source4/auth/ntlm_check.c
index 390caa0071..cea6eeafc1 100644
--- a/source4/auth/ntlm_check.c
+++ b/source4/auth/ntlm_check.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "lib/crypto/crypto.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
+#include "auth/credentials/credentials.h"
 #include "libcli/auth/proto.h"
 
 /****************************************************************************