diff options
| author | Gerald W. Carter <jerry@samba.org> | 2008-06-27 10:22:39 -0400 |
|---|---|---|
| committer | Gerald W. Carter <jerry@samba.org> | 2008-06-27 10:26:11 -0400 |
| commit | 9ff1ffcbee46257c3b2b13b84c2a539322493190 (patch) | |
| tree | 8cafc550e0378e56a44a89787fcfafa708d578e4 /source3/include | |
| parent | e08943f8d855b85765615b2a231fb65d5788a2a6 (diff) | |
| download | samba-9ff1ffcbee46257c3b2b13b84c2a539322493190.tar.gz samba-9ff1ffcbee46257c3b2b13b84c2a539322493190.tar.bz2 samba-9ff1ffcbee46257c3b2b13b84c2a539322493190.zip | |
libads: Add API call to connect to a global catalog server.
Extends ads_connect() to a new call ads_connect_gc() which connects on port
3268 rather than port 389. Also makes ads_try_connect() static and
only used internally to ldap.c
(This used to be commit f4c37dbe2c986fb7bfe510cdff3b4a9fbc06d079)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/ads.h | 4 | ||||
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/include/smb.h | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/source3/include/ads.h b/source3/include/ads.h index d4551765aa..0d464b2d81 100644 --- a/source3/include/ads.h +++ b/source3/include/ads.h @@ -53,7 +53,9 @@ typedef struct ads_struct { char *realm; char *workgroup; char *ldap_server; - int foreign; /* set to 1 if connecting to a foreign realm */ + int foreign; /* set to 1 if connecting to a foreign + * realm */ + bool gc; /* Is this a global catalog server? */ } server; /* info needed to authenticate */ diff --git a/source3/include/proto.h b/source3/include/proto.h index 6cef348893..81cf2dbf4f 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2063,7 +2063,6 @@ ADS_STATUS ads_set_machine_password(ADS_STRUCT *ads, bool ads_sitename_match(ADS_STRUCT *ads); bool ads_closest_dc(ADS_STRUCT *ads); -bool ads_try_connect(ADS_STRUCT *ads, const char *server ); ADS_STATUS ads_connect(ADS_STRUCT *ads); ADS_STATUS ads_connect_user_creds(ADS_STRUCT *ads); void ads_disconnect(ADS_STRUCT *ads); diff --git a/source3/include/smb.h b/source3/include/smb.h index 7ae66f1ced..7fcae51aa6 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1847,6 +1847,7 @@ typedef struct _smb_iconv_t { #ifndef LDAP_PORT #define LDAP_PORT 389 #endif +#define LDAP_GC_PORT 3268 /* used by the IP comparison function */ struct ip_service { |