summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-02-10 07:43:39 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:40 -0500
commita0e6f6c05b438765c8bbb6f8e7f7e6478dc67293 (patch)
tree9decfdcbfb19618549abe4f43acfcfd4f76ca457
parent75ddf59ea110117578acd3a7b889549bfb40473c (diff)
downloadsamba-a0e6f6c05b438765c8bbb6f8e7f7e6478dc67293.tar.gz
samba-a0e6f6c05b438765c8bbb6f8e7f7e6478dc67293.tar.bz2
samba-a0e6f6c05b438765c8bbb6f8e7f7e6478dc67293.zip
r5309: removed ads.h from includes.h
(This used to be commit 196c45b834c39f293b9533cec5cfe5a77382d4e2)
-rw-r--r--source4/dsdb/common/flag_mapping.c1
-rw-r--r--source4/include/ads.h2
-rw-r--r--source4/include/includes.h1
-rw-r--r--source4/include/structs.h2
-rw-r--r--source4/libcli/auth/kerberos.c3
-rw-r--r--source4/ntvfs/common/sidmap.c1
-rw-r--r--source4/rpc_server/samr/dcesrv_samr.c1
-rw-r--r--source4/rpc_server/samr/samr_password.c1
8 files changed, 9 insertions, 3 deletions
diff --git a/source4/dsdb/common/flag_mapping.c b/source4/dsdb/common/flag_mapping.c
index 8fdded98f5..eab0d67825 100644
--- a/source4/dsdb/common/flag_mapping.c
+++ b/source4/dsdb/common/flag_mapping.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "librpc/gen_ndr/ndr_samr.h"
+#include "ads.h"
/*
translated the ACB_CTRL Flags to UserFlags (userAccountControl)
diff --git a/source4/include/ads.h b/source4/include/ads.h
index cdaccbab14..43d9a14777 100644
--- a/source4/include/ads.h
+++ b/source4/include/ads.h
@@ -20,7 +20,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-typedef struct {
+typedef struct ads_struct {
void *ld; /* the active ldap structure */
struct ipv4_addr ldap_ip; /* the ip of the active connection, if any */
time_t last_attempt; /* last attempt to reconnect */
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 32a1946e51..2e04e365eb 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -132,7 +132,6 @@ extern int errno;
#include "smb_interfaces.h"
#include "ntvfs/ntvfs.h"
#include "cli_context.h"
-#include "ads.h"
#define malloc_p(type) (type *)malloc(sizeof(type))
#define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), count)
diff --git a/source4/include/structs.h b/source4/include/structs.h
index bccbe36efb..61c1f4211c 100644
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -175,3 +175,5 @@ struct nbtd_server;
struct nbtd_interface;
struct mutex_ops;
+
+struct ads_struct;
diff --git a/source4/libcli/auth/kerberos.c b/source4/libcli/auth/kerberos.c
index 4bf9e626ce..2e5a53bb00 100644
--- a/source4/libcli/auth/kerberos.c
+++ b/source4/libcli/auth/kerberos.c
@@ -27,6 +27,7 @@
#include "system/time.h"
#include "secrets.h"
#include "pstring.h"
+#include "ads.h"
#ifdef HAVE_KRB5
@@ -149,7 +150,7 @@ int kerberos_kinit_password(const char *principal,
}
/* run kinit to setup our ccache */
-int ads_kinit_password(ADS_STRUCT *ads)
+int ads_kinit_password(struct ads_struct *ads)
{
char *s;
int ret;
diff --git a/source4/ntvfs/common/sidmap.c b/source4/ntvfs/common/sidmap.c
index 8e040d5081..2a530c4a6b 100644
--- a/source4/ntvfs/common/sidmap.c
+++ b/source4/ntvfs/common/sidmap.c
@@ -24,6 +24,7 @@
#include "system/filesys.h"
#include "system/passwd.h"
#include "librpc/gen_ndr/ndr_security.h"
+#include "ads.h"
/*
these are used for the fallback local uid/gid to sid mapping
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index f9752678ad..d498d951d5 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -29,6 +29,7 @@
#include "rpc_server/samr/dcesrv_samr.h"
#include "system/time.h"
#include "lib/ldb/include/ldb.h"
+#include "ads.h"
/*
diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index ae20de1623..a1c61f03ec 100644
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -28,6 +28,7 @@
#include "system/time.h"
#include "lib/crypto/crypto.h"
#include "lib/ldb/include/ldb.h"
+#include "ads.h"
/*
samr_ChangePasswordUser