diff options
| author | David Holder <david.holder@erion.co.uk> | 2015-05-12 16:09:54 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2015-05-12 20:46:16 +0200 |
| commit | c324d7901c991a6700abdc3ee701920fea5e5819 (patch) | |
| tree | dbca8a09aa600e02a49fa1b01419a1a3fbe30c05 /source3/libads | |
| parent | bc62dfa493df8a554829900d6bd9686f0ca028b5 (diff) | |
| download | samba-c324d7901c991a6700abdc3ee701920fea5e5819.tar.gz | |
Add IPv6 support to ADS client side LDAP connects. Corrected format for IPv6 LDAP URI. Signed-off-by: David Holder <david.holder@erion.co.uk>
Signed-off-by: David Holder <david.holder@erion.co.uk>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Böhme <rb@sernet.de>
Diffstat (limited to 'source3/libads')
| -rw-r--r-- | source3/libads/ldap.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index 3f5302f0054..2ad9bfdee1e 100644 --- a/source3/libads/ldap.c +++ b/source3/libads/ldap.c @@ -79,7 +79,13 @@ static void gotalarm_sig(int signum) /* End setup timeout. */ } - uri = talloc_asprintf(talloc_tos(), "ldap://%s:%u", server, port); + if ( strchr_m(server, ':') ) { + /* IPv6 URI */ + uri = talloc_asprintf(talloc_tos(), "ldap://[%s]:%u", server, port); + } else { + /* IPv4 URI */ + uri = talloc_asprintf(talloc_tos(), "ldap://%s:%u", server, port); + } if (uri == NULL) { return NULL; } |