diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2014-06-18 17:41:52 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2014-06-18 17:41:52 +0000 |
| commit | b1c17593f84f0d0ca9c5939fb86616822c4c689a (patch) | |
| tree | 3b30be686ed6c91365eef519e7b64a00c1e40b3d /winsup/cygwin/ldap.cc | |
| parent | 59c45c44452f6f56e454bb4f022dba054ca58a3a (diff) | |
| download | cygnal-b1c17593f84f0d0ca9c5939fb86616822c4c689a.tar.gz cygnal-b1c17593f84f0d0ca9c5939fb86616822c4c689a.tar.bz2 cygnal-b1c17593f84f0d0ca9c5939fb86616822c4c689a.zip | |
* ldap.cc (CYG_LDAP_TIMEOUT): Define as timeout value. Set to 30 secs
for now. Use throughout.
* uinfo.cc (colon_to_semicolon): New local function.
(pwdgrp::fetch_account_from_windows): Convert all colons in AD gecos
entry to commas.
Diffstat (limited to 'winsup/cygwin/ldap.cc')
| -rw-r--r-- | winsup/cygwin/ldap.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/winsup/cygwin/ldap.cc b/winsup/cygwin/ldap.cc index cee07c333..4a1f25812 100644 --- a/winsup/cygwin/ldap.cc +++ b/winsup/cygwin/ldap.cc @@ -22,7 +22,9 @@ details. */ #include "dsgetdc.h" #include "tls_pbuf.h" -static LDAP_TIMEVAL tv = { 3, 0 }; +#define CYG_LDAP_TIMEOUT 30 /* seconds */ + +static LDAP_TIMEVAL tv = { CYG_LDAP_TIMEOUT, 0 }; static PWCHAR rootdse_attr[] = { @@ -75,7 +77,7 @@ PWCHAR rfc2307_gid_attr[] = bool cyg_ldap::connect_ssl (PCWSTR domain) { - ULONG ret, timelimit = 3; /* secs */ + ULONG ret, timelimit = CYG_LDAP_TIMEOUT; if (!(lh = ldap_sslinitW ((PWCHAR) domain, LDAP_SSL_PORT, 1))) { @@ -98,7 +100,7 @@ cyg_ldap::connect_ssl (PCWSTR domain) bool cyg_ldap::connect_non_ssl (PCWSTR domain) { - ULONG ret, timelimit = 3; /* secs */ + ULONG ret, timelimit = CYG_LDAP_TIMEOUT; if (!(lh = ldap_initW ((PWCHAR) domain, LDAP_PORT))) { @@ -291,7 +293,7 @@ cyg_ldap::enumerate_ad_accounts (PCWSTR domain, bool group) "(objectSid=*))"; srch_id = ldap_search_init_pageW (lh, rootdse, LDAP_SCOPE_SUBTREE, (PWCHAR) filter, sid_attr, 0, - NULL, NULL, 3, 100, NULL); + NULL, NULL, CYG_LDAP_TIMEOUT, 100, NULL); if (srch_id == NULL) { debug_printf ("ldap_search_init_pageW(%W,%W) error 0x%02x", |