diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-07-16 11:08:00 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:28:38 -0500 |
| commit | 809c9d4d3136cc46dc228107918ca19d5a008a0a (patch) | |
| tree | 78d6ec07fcadd9f7f04d8de970948e99bba7ea20 /source3/include/ads.h | |
| parent | 2fc53c947b6c18f5e9761a26792f806ff588e239 (diff) | |
| download | samba-809c9d4d3136cc46dc228107918ca19d5a008a0a.tar.gz samba-809c9d4d3136cc46dc228107918ca19d5a008a0a.tar.bz2 samba-809c9d4d3136cc46dc228107918ca19d5a008a0a.zip | |
r23888: move elements belonging to the current ldap connection to a
substructure.
metze
(This used to be commit 00909194a6c1ed193dfdb296f50f58a53450583c)
Diffstat (limited to 'source3/include/ads.h')
| -rw-r--r-- | source3/include/ads.h | 23 |
1 files changed, 13 insertions, 10 deletions
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 */ |