From 809c9d4d3136cc46dc228107918ca19d5a008a0a Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 16 Jul 2007 11:08:00 +0000
Subject: r23888: move elements belonging to the current ldap connection to a
 substructure.

metze
(This used to be commit 00909194a6c1ed193dfdb296f50f58a53450583c)
---
 source3/include/ads.h | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'source3/include/ads.h')

diff --git a/source3/include/ads.h b/source3/include/ads.h
index 85c87bfeee..179aa742f2 100644
--- a/source3/include/ads.h
+++ b/source3/include/ads.h
@@ -15,16 +15,7 @@ enum wb_posix_mapping {
 	WB_POSIX_MAP_UNIXINFO	= 4
 };
 
-typedef struct {
-#ifdef HAVE_LDAP
-	LDAP *ld;
-#else
-	void *ld; /* the active ldap structure */
-#endif
-	struct in_addr ldap_ip; /* the ip of the active connection, if any */
-	time_t last_attempt; /* last attempt to reconnect */
-	int ldap_port;
-	
+typedef struct {	
 	int is_mine;	/* do I own this structure's memory? */
 	
 	/* info needed to find the server */
@@ -61,6 +52,18 @@ typedef struct {
 		char *schema_path;
 		char *config_path;
 	} config;
+
+	/* info about the current LDAP connection */
+	struct {
+#ifdef HAVE_LDAP
+		LDAP *ld;
+#else
+		void *ld; /* the active ldap structure */
+#endif
+		struct in_addr ip; /* the ip of the active connection, if any */
+		time_t last_attempt; /* last attempt to reconnect */
+		int port;
+	} ldap;
 } ADS_STRUCT;
 
 /* used to remember the names of the posix attributes in AD */
-- 
cgit