summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-05-06 12:54:59 +0200
committerGünther Deschner <gd@samba.org>2011-05-06 16:37:22 +0200
commit1e208a705718adb105d89093041c0ba5d51f2429 (patch)
tree5aa4d4936db2b3484d713049f19bf0cf3fa6e858
parent675573d54b717ffc24cf3b49301ff649aecc259a (diff)
downloadsamba-1e208a705718adb105d89093041c0ba5d51f2429.tar.gz
samba-1e208a705718adb105d89093041c0ba5d51f2429.tar.bz2
samba-1e208a705718adb105d89093041c0ba5d51f2429.zip
s3-includes: no need to globally include libads/ads_status.h.
Guenther
-rw-r--r--source3/include/ads.h1
-rw-r--r--source3/include/includes.h1
-rw-r--r--source3/libads/ads_status.c1
-rw-r--r--source3/libads/ads_status.h4
-rw-r--r--source3/libads/kerberos_proto.h2
-rw-r--r--source3/libsmb/libsmb.h1
-rw-r--r--source3/utils/net_proto.h1
7 files changed, 10 insertions, 1 deletions
diff --git a/source3/include/ads.h b/source3/include/ads.h
index ee6e5b8649..8a8ce28e53 100644
--- a/source3/include/ads.h
+++ b/source3/include/ads.h
@@ -6,6 +6,7 @@
basically this is a wrapper around ldap
*/
+#include "libads/ads_status.h"
#include "smb_ldap.h"
struct ads_struct;
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 5e8b21235d..e6b70c782c 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -521,7 +521,6 @@ typedef char fstring[FSTRING_LEN];
#include "../lib/util/debug_s3.h"
#include "../libcli/util/ntstatus.h"
-#include "libads/ads_status.h"
#include "../libcli/util/error.h"
#include "../lib/util/charset/charset.h"
#include "dynconfig/dynconfig.h"
diff --git a/source3/libads/ads_status.c b/source3/libads/ads_status.c
index b99464118d..a9e59edadd 100644
--- a/source3/libads/ads_status.c
+++ b/source3/libads/ads_status.c
@@ -23,6 +23,7 @@
#include "includes.h"
#include "smb_krb5.h"
#include "smb_ldap.h"
+#include "libads/ads_status.h"
/*
build a ADS_STATUS structure
diff --git a/source3/libads/ads_status.h b/source3/libads/ads_status.h
index 4c27e16f50..cc8d9a5c08 100644
--- a/source3/libads/ads_status.h
+++ b/source3/libads/ads_status.h
@@ -1,3 +1,5 @@
+#ifndef _LIBADS_ADS_STATUS_H_
+#define _LIBADS_ADS_STATUS_H_
/* there are 5 possible types of errors the ads subsystem can produce */
enum ads_error_type {ENUM_ADS_ERROR_KRB5, ENUM_ADS_ERROR_GSS,
@@ -40,3 +42,5 @@ ADS_STATUS ads_build_nt_error(enum ads_error_type etype,
NTSTATUS ads_ntstatus(ADS_STATUS status);
const char *ads_errstr(ADS_STATUS status);
NTSTATUS gss_err_to_ntstatus(uint32 maj, uint32 min);
+
+#endif /* _LIBADS_ADS_STATUS_H_ */
diff --git a/source3/libads/kerberos_proto.h b/source3/libads/kerberos_proto.h
index afd57fe220..f23346f709 100644
--- a/source3/libads/kerberos_proto.h
+++ b/source3/libads/kerberos_proto.h
@@ -1,5 +1,7 @@
struct PAC_LOGON_INFO;
+#include "libads/ads_status.h"
+
/* The following definitions come from libads/kerberos_verify.c */
NTSTATUS ads_verify_ticket(TALLOC_CTX *mem_ctx,
diff --git a/source3/libsmb/libsmb.h b/source3/libsmb/libsmb.h
index 7a9fb633b8..48d6ae5e0e 100644
--- a/source3/libsmb/libsmb.h
+++ b/source3/libsmb/libsmb.h
@@ -19,6 +19,7 @@
#define _LIBSMB_LIBSMB_H
#include "client.h"
+#include "libads/ads_status.h"
#include "libsmb/proto.h"
#endif /* _LIBSMB_LIBSMB_H */
diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h
index ba3860a88d..ad20f6e074 100644
--- a/source3/utils/net_proto.h
+++ b/source3/utils/net_proto.h
@@ -23,6 +23,7 @@
#ifndef _NET_PROTO_H_
#define _NET_PROTO_H_
+#include "libads/ads_status.h"
/* The following definitions come from utils/net.c */