diff options
Diffstat (limited to 'winsup/cygwin')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/uinfo.cc | 10 |
2 files changed, 14 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index f916d8b..d1372ee 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2015-01-14 Corinna Vinschen <corinna@vinschen.de> + * uinfo.cc (fetch_windows_home): Disable fetching from homeDrive or + usri3_home_dir_drive. Add comment. + +2015-01-14 Corinna Vinschen <corinna@vinschen.de> + * environ.cc (renv_arr): Drop variables not usually in a Windows environment and all variables being uppercase anyway. But keep TMP and TEMP for paranoia. diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc index 89ed5c2..ebc2991 100644 --- a/winsup/cygwin/uinfo.cc +++ b/winsup/cygwin/uinfo.cc @@ -822,15 +822,23 @@ fetch_windows_home (cyg_ldap *pldap, PUSER_INFO_3 ui, cygpsid &sid) if (pldap) { +#if 0 + /* Disable preferring homeDrive for now. The drive letter may not + be available when it's needed. */ home_from_db = pldap->get_string_attribute (L"homeDrive"); if (!home_from_db || !*home_from_db) +#endif home_from_db = pldap->get_string_attribute (L"homeDirectory"); } else if (ui) { +#if 0 + /* Ditto. */ if (ui->usri3_home_dir_drive && *ui->usri3_home_dir_drive) home_from_db = ui->usri3_home_dir_drive; - else if (ui->usri3_home_dir && *ui->usri3_home_dir) + else +#endif + if (ui->usri3_home_dir && *ui->usri3_home_dir) home_from_db = ui->usri3_home_dir; } if (home_from_db && *home_from_db) |