* sec_helper.cc (cygsid::getfrompw): Change parameter to `const'.
(cygsid::getfromgr): Ditto. * security.cc: Use `sys_mbstowcs' and `sys_wcstombs' throughout. (extract_nt_dom_user): Try to get user and domain from SID in pw->pw_gecos first. * security.h (class cygsid): Change parameter of getfrompw() and getfromgr() to `const'. * uinfo.cc (internal_getlogin): Change order for evaluating user information in winNT case. Drop usage of NetWkstaUserGetInfo().
This commit is contained in:
@@ -121,14 +121,14 @@ cygsid::getfromstr (const char *nsidstr)
|
||||
}
|
||||
|
||||
BOOL
|
||||
cygsid::getfrompw (struct passwd *pw)
|
||||
cygsid::getfrompw (const struct passwd *pw)
|
||||
{
|
||||
char *sp = (pw && pw->pw_gecos) ? strrchr (pw->pw_gecos, ',') : NULL;
|
||||
return (*this = sp ? sp + 1 : "") != NULL;
|
||||
}
|
||||
|
||||
BOOL
|
||||
cygsid::getfromgr (struct group *gr)
|
||||
cygsid::getfromgr (const struct group *gr)
|
||||
{
|
||||
char *sp = (gr && gr->gr_passwd) ? gr->gr_passwd : NULL;
|
||||
return (*this = sp ?: "") != NULL;
|
||||
|
Reference in New Issue
Block a user