JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* security.cc (get_logon_server): Remove nret and use dret for everything to

Browse Source 
avoid a g++ warning.
This commit is contained in:
Christopher Faylor
2006-07-25 19:44:17 +00:00
parent 70e476d27b
commit 724c4ed146
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,8 @@
2006-07-25 Christopher Faylor <cgf@timesys.com>
* security.cc (get_logon_server): Remove nret and use dret for
everything to avoid a g++ warning.
2006-07-25 Corinna Vinschen <corinna@vinschen.de>
* include/cygwin/version.h: Bump DLL version to 1.7.0.

9
winsup/cygwin/security.cc
View File

@@ -220,7 +220,6 @@ get_logon_server (const char *domain, char *server, WCHAR *wserver,
{
DWORD dret;
PDOMAIN_CONTROLLER_INFOA pci;
NET_API_STATUS nret;
WCHAR *buf;
DWORD size = INTERNET_MAX_HOST_NAME_LENGTH + 1;
WCHAR wdomain[size];
@@ -251,10 +250,10 @@ get_logon_server (const char *domain, char *server, WCHAR *wserver,
/* NT4 w/o DSClient */
sys_mbstowcs (wdomain, domain, INTERNET_MAX_HOST_NAME_LENGTH + 1);
if (rediscovery)
nret = NetGetAnyDCName (NULL, wdomain, (LPBYTE *) &buf);
dret = NetGetAnyDCName (NULL, wdomain, (LPBYTE *) &buf);
else
nret = NetGetDCName (NULL, wdomain, (LPBYTE *) &buf);
if (nret == NERR_Success)
dret = NetGetDCName (NULL, wdomain, (LPBYTE *) &buf);
if (dret == NERR_Success)
{
sys_wcstombs (server, INTERNET_MAX_HOST_NAME_LENGTH + 1, buf);
if (wserver)
@@ -265,7 +264,7 @@ get_logon_server (const char *domain, char *server, WCHAR *wserver,
return true;
}
}
__seterrno_from_win_error (nret);
__seterrno_from_win_error (dret);
return false;
}