diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/security.cc | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index b74c6627e..de3ac037f 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +Wed Apr 17 11:27:04 2002 Jason Tishler <jason@tishler.net> + + * security.cc (get_lsa_srv_inf): Prevent extraneous backslashes for + the NT Domain case. + 2002-04-12 Corinna Vinschen <corinna@vinschen.de> * net.cc (cygwin_accept): Set socket type for accepted socket. diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc index 83c8f2080..358756488 100644 --- a/winsup/cygwin/security.cc +++ b/winsup/cygwin/security.cc @@ -230,19 +230,20 @@ get_lsa_srv_inf (LSA_HANDLE lsa, char *logonserver, char *domain) (ret = NetGetDCName(NULL, primary, (LPBYTE *) &buf)) == STATUS_SUCCESS) { sys_wcstombs (name, buf, INTERNET_MAX_HOST_NAME_LENGTH + 1); + strcpy (logonserver, name); if (domain) sys_wcstombs (domain, primary, INTERNET_MAX_HOST_NAME_LENGTH + 1); } else { sys_wcstombs (name, account, INTERNET_MAX_HOST_NAME_LENGTH + 1); + strcpy (logonserver, "\\\\"); + strcat (logonserver, name); if (domain) sys_wcstombs (domain, account, INTERNET_MAX_HOST_NAME_LENGTH + 1); } if (ret == STATUS_SUCCESS) NetApiBufferFree (buf); - strcpy (logonserver, "\\\\"); - strcat (logonserver, name); return TRUE; } |