svn commit: samba r5309 - in branches/SAMBA_4_0/source: dsdb/common include libcli/auth ntvfs/common rpc_server/samr

[tridge at samba.org]

Author: tridge
Date: 2005-02-10 07:43:39 +0000 (Thu, 10 Feb 2005)
New Revision: 5309

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5309

Log:
removed ads.h from includes.h
Modified:
   branches/SAMBA_4_0/source/dsdb/common/flag_mapping.c
   branches/SAMBA_4_0/source/include/ads.h
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/include/structs.h
   branches/SAMBA_4_0/source/libcli/auth/kerberos.c
   branches/SAMBA_4_0/source/ntvfs/common/sidmap.c
   branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c
   branches/SAMBA_4_0/source/rpc_server/samr/samr_password.c


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/common/flag_mapping.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/common/flag_mapping.c	2005-02-10 07:39:14 UTC (rev 5308)
+++ branches/SAMBA_4_0/source/dsdb/common/flag_mapping.c	2005-02-10 07:43:39 UTC (rev 5309)
@@ -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) 

Modified: branches/SAMBA_4_0/source/include/ads.h
===================================================================
--- branches/SAMBA_4_0/source/include/ads.h	2005-02-10 07:39:14 UTC (rev 5308)
+++ branches/SAMBA_4_0/source/include/ads.h	2005-02-10 07:43:39 UTC (rev 5309)
@@ -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 */

Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h	2005-02-10 07:39:14 UTC (rev 5308)
+++ branches/SAMBA_4_0/source/include/includes.h	2005-02-10 07:43:39 UTC (rev 5309)
@@ -132,7 +132,6 @@
 #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)

Modified: branches/SAMBA_4_0/source/include/structs.h
===================================================================
--- branches/SAMBA_4_0/source/include/structs.h	2005-02-10 07:39:14 UTC (rev 5308)
+++ branches/SAMBA_4_0/source/include/structs.h	2005-02-10 07:43:39 UTC (rev 5309)
@@ -175,3 +175,5 @@
 struct nbtd_interface;
 
 struct mutex_ops;
+
+struct ads_struct;

Modified: branches/SAMBA_4_0/source/libcli/auth/kerberos.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/kerberos.c	2005-02-10 07:39:14 UTC (rev 5308)
+++ branches/SAMBA_4_0/source/libcli/auth/kerberos.c	2005-02-10 07:43:39 UTC (rev 5309)
@@ -27,6 +27,7 @@
 #include "system/time.h"
 #include "secrets.h"
 #include "pstring.h"
+#include "ads.h"
 
 #ifdef HAVE_KRB5
 
@@ -149,7 +150,7 @@
 }
 
 /* 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;

Modified: branches/SAMBA_4_0/source/ntvfs/common/sidmap.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/common/sidmap.c	2005-02-10 07:39:14 UTC (rev 5308)
+++ branches/SAMBA_4_0/source/ntvfs/common/sidmap.c	2005-02-10 07:43:39 UTC (rev 5309)
@@ -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

Modified: branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c	2005-02-10 07:39:14 UTC (rev 5308)
+++ branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c	2005-02-10 07:43:39 UTC (rev 5309)
@@ -29,6 +29,7 @@
 #include "rpc_server/samr/dcesrv_samr.h"
 #include "system/time.h"
 #include "lib/ldb/include/ldb.h"
+#include "ads.h"
 
 
 /*

Modified: branches/SAMBA_4_0/source/rpc_server/samr/samr_password.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/samr/samr_password.c	2005-02-10 07:39:14 UTC (rev 5308)
+++ branches/SAMBA_4_0/source/rpc_server/samr/samr_password.c	2005-02-10 07:43:39 UTC (rev 5309)
@@ -28,6 +28,7 @@
 #include "system/time.h"
 #include "lib/crypto/crypto.h"
 #include "lib/ldb/include/ldb.h"
+#include "ads.h"
 
 /* 
   samr_ChangePasswordUser