summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-06-30 23:38:57 +0200
committerGünther Deschner <gd@samba.org>2010-07-01 23:20:40 +0200
commitdff7be8ccb9538cfe8468884aa2eecd129c631cb (patch)
tree5394ea1ffb34086c168bfe901c1b8ff53e376c18
parent6d810eff81f6a0abb371b2661cb0711e46e1bf1d (diff)
downloadsamba-dff7be8ccb9538cfe8468884aa2eecd129c631cb.tar.gz
samba-dff7be8ccb9538cfe8468884aa2eecd129c631cb.tar.bz2
samba-dff7be8ccb9538cfe8468884aa2eecd129c631cb.zip
s3-libads: only include libds flags where needed.
Guenther
-rw-r--r--source3/include/ads.h2
-rw-r--r--source3/lib/netapi/user.c1
-rw-r--r--source3/libads/ldap.c1
-rw-r--r--source3/libads/ldap_user.c1
-rw-r--r--source3/libnet/libnet_join.c2
-rw-r--r--source3/passdb/pdb_ads.c1
-rw-r--r--source3/utils/net_ads.c1
-rw-r--r--source3/utils/net_ads_gpo.c1
-rw-r--r--source3/winbindd/idmap_ad.c1
-rw-r--r--source3/winbindd/idmap_adex/cell_util.c1
-rw-r--r--source3/winbindd/winbindd_ads.c1
11 files changed, 11 insertions, 2 deletions
diff --git a/source3/include/ads.h b/source3/include/ads.h
index 784af848fa..06a48f9691 100644
--- a/source3/include/ads.h
+++ b/source3/include/ads.h
@@ -6,8 +6,6 @@
basically this is a wrapper around ldap
*/
-#include "../libds/common/flags.h"
-
#define TOK_ID_KRB_AP_REQ ((const uint8_t *)"\x01\x00")
#define TOK_ID_KRB_AP_REP ((const uint8_t *)"\x02\x00")
#define TOK_ID_KRB_ERROR ((const uint8_t *)"\x03\x00")
diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index c586d11ceb..dcc28e7af9 100644
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -25,6 +25,7 @@
#include "lib/netapi/libnetapi.h"
#include "../librpc/gen_ndr/cli_samr.h"
#include "rpc_client/init_samr.h"
+#include "../libds/common/flags.h"
/****************************************************************
****************************************************************/
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 20a3439248..5adbd6d039 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -25,6 +25,7 @@
#include "libads/sitename_cache.h"
#include "libads/cldap.h"
#include "libads/dns.h"
+#include "../libds/common/flags.h"
#ifdef HAVE_LDAP
diff --git a/source3/libads/ldap_user.c b/source3/libads/ldap_user.c
index 69dc05335e..ffd20f9bd2 100644
--- a/source3/libads/ldap_user.c
+++ b/source3/libads/ldap_user.c
@@ -18,6 +18,7 @@
*/
#include "includes.h"
+#include "../libds/common/flags.h"
#ifdef HAVE_ADS
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index a4aecd2112..7fd7259736 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -29,6 +29,8 @@
#include "rpc_client/cli_netlogon.h"
#include "lib/smbconf/smbconf.h"
#include "lib/smbconf/smbconf_reg.h"
+#include "../libds/common/flags.h"
+
/****************************************************************
****************************************************************/
diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c
index 096063b0a0..1c420f8584 100644
--- a/source3/passdb/pdb_ads.c
+++ b/source3/passdb/pdb_ads.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "tldap.h"
#include "tldap_util.h"
+#include "../libds/common/flags.h"
struct pdb_ads_state {
struct sockaddr_un socket_address;
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 0fcbbc43f2..0571fc8d25 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -27,6 +27,7 @@
#include "nsswitch/libwbclient/wbclient.h"
#include "libads/cldap.h"
#include "libads/dns.h"
+#include "../libds/common/flags.h"
#ifdef HAVE_ADS
diff --git a/source3/utils/net_ads_gpo.c b/source3/utils/net_ads_gpo.c
index 3d89045c49..05c3676160 100644
--- a/source3/utils/net_ads_gpo.c
+++ b/source3/utils/net_ads_gpo.c
@@ -21,6 +21,7 @@
#include "utils/net.h"
#include "../libgpo/gpo.h"
#include "libgpo/gpo_proto.h"
+#include "../libds/common/flags.h"
#ifdef HAVE_ADS
diff --git a/source3/winbindd/idmap_ad.c b/source3/winbindd/idmap_ad.c
index 1671d90499..55d571704d 100644
--- a/source3/winbindd/idmap_ad.c
+++ b/source3/winbindd/idmap_ad.c
@@ -27,6 +27,7 @@
#include "includes.h"
#include "winbindd.h"
+#include "../libds/common/flags.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_IDMAP
diff --git a/source3/winbindd/idmap_adex/cell_util.c b/source3/winbindd/idmap_adex/cell_util.c
index 4ca3bf516a..257647a797 100644
--- a/source3/winbindd/idmap_adex/cell_util.c
+++ b/source3/winbindd/idmap_adex/cell_util.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "idmap_adex.h"
+#include "../libds/common/flags.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_IDMAP
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index a50d889b7b..366732ad4d 100644
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -24,6 +24,7 @@
#include "includes.h"
#include "winbindd.h"
#include "../librpc/gen_ndr/cli_netlogon.h"
+#include "../libds/common/flags.h"
#ifdef HAVE_ADS