diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2015-02-12 16:55:38 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-02-12 16:55:38 +0000 |
| commit | b49934db7f440e099f628d7ccc3376902bb8800d (patch) | |
| tree | b6fe97f73e4bdfdac1b01b60a86b1806ba847286 /winsup/cygwin/cygheap.h | |
| parent | 54ade28dfa707bdd9bd0b37c7865d57be82a4263 (diff) | |
| download | cygnal-b49934db7f440e099f628d7ccc3376902bb8800d.tar.gz cygnal-b49934db7f440e099f628d7ccc3376902bb8800d.tar.bz2 cygnal-b49934db7f440e099f628d7ccc3376902bb8800d.zip | |
* cygheap.h (cygheap_pwdgrp::get_home): Add dnsdomain parameter to
declaration in ldap-related method.
(cygheap_pwdgrp::get_shell): Ditto.
(cygheap_pwdgrp::get_gecos): Ditto.
* ldap.cc (cyg_ldap::open): Use NO_ERROR instead of 0.
(cyg_ldap::close): Reset last_fetched_sid.
(cyg_ldap::fetch_ad_account): Return immediately if sid is the same as
last_fetched_sid. Open LDAP connection from here. Move initialization
of rdse after open call. Set last_fetched_sid if LDAP call was
successful.
* ldap.h (class cyg_ldap): Add member last_fetched_sid.
(cyg_ldap::cyg_ldap): Initialize last_fetched_sid.
(cyg_ldap::is_open): New inline method.
* uinfo.cc (cygheap_pwdgrp::init): Drop initialization of db_home,
db_shell and db_gecos with "cygwin desc", thus only using the fallback
by default.
(fetch_windows_home): Add parameter dnsdomain. Call
cyg_ldap::fetch_ad_account if required.
(fetch_from_path): Add parameter dnsdomain. Call fetch_windows_home
accordingly.
(cygheap_pwdgrp::get_home): Accomodate call to fetch_windows_home.
Add dnsdomain parameter in ldap-related method. Call
cyg_ldap::fetch_ad_account if required.
(cygheap_pwdgrp::get_shell): Ditto.
(cygheap_pwdgrp::get_gecos): Ditto.
(pwdgrp::fetch_account_from_windows): Drop cyg_ldap::open call prior to
cyg_ldap::fetch_ad_account call. Set is_current_user to true if we're
handling the current user account. Make sure to perform the LDAP calls
only for users, and only if required.
Diffstat (limited to 'winsup/cygwin/cygheap.h')
| -rw-r--r-- | winsup/cygwin/cygheap.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/winsup/cygwin/cygheap.h b/winsup/cygwin/cygheap.h index 4b7f66896..6fb7a063b 100644 --- a/winsup/cygwin/cygheap.h +++ b/winsup/cygwin/cygheap.h @@ -470,18 +470,18 @@ public: inline bool nss_cygserver_caching () const { return caching; } inline void nss_disable_cygserver_caching () { caching = false; } - char *get_home (cyg_ldap *pldap, cygpsid &sid, PCWSTR dom, PCWSTR name, - bool fq); + char *get_home (cyg_ldap *pldap, cygpsid &sid, PCWSTR dom, PCWSTR dnsdomain, + PCWSTR name, bool fq); char *get_home (struct _USER_INFO_3 *ui, cygpsid &sid, PCWSTR dom, PCWSTR name, bool fq); - char *get_shell (cyg_ldap *pldap, cygpsid &sid, PCWSTR dom, PCWSTR name, - bool fq); + char *get_shell (cyg_ldap *pldap, cygpsid &sid, PCWSTR dom, PCWSTR dnsdomain, + PCWSTR name, bool fq); char *get_shell (struct _USER_INFO_3 *ui, cygpsid &sid, PCWSTR dom, PCWSTR name, bool fq); - char *get_gecos (cyg_ldap *pldap, cygpsid &sid, PCWSTR dom, PCWSTR name, - bool fq); + char *get_gecos (cyg_ldap *pldap, cygpsid &sid, PCWSTR dom, PCWSTR dnsdomain, + PCWSTR name, bool fq); char *get_gecos (struct _USER_INFO_3 *ui, cygpsid &sid, PCWSTR dom, PCWSTR name, bool fq); |