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

* sec_auth.cc (str2lsa): Remove. 

(str2buf2lsa): Remove.
	(lsaauth): Call RtlInitAnsiString instead of str2lsa and str2buf2lsa.
This commit is contained in:
Corinna Vinschen 2014-12-02 10:04:53 +00:00
parent f5dc13757f
commit adc07b999f
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2014-12-02 Corinna Vinschen <corinna@vinschen.de>
* sec_auth.cc (str2lsa): Remove.
(str2buf2lsa): Remove.
(lsaauth): Call RtlInitAnsiString instead of str2lsa and str2buf2lsa.
2014-12-02 Corinna Vinschen <corinna@vinschen.de> 2014-12-02 Corinna Vinschen <corinna@vinschen.de>
* cygheap.cc (init_cygheap::init_installation_root): Fix typo in * cygheap.cc (init_cygheap::init_installation_root): Fix typo in

24
winsup/cygwin/sec_auth.cc
View File

@ -172,23 +172,6 @@ cygwin_logon_user (const struct passwd *pw, const char *password)
return hToken; return hToken;
} }
static void
str2lsa (LSA_STRING &tgt, const char *srcstr)
{
tgt.Length = strlen (srcstr);
tgt.MaximumLength = tgt.Length + 1;
tgt.Buffer = (PCHAR) srcstr;
}
static void
str2buf2lsa (LSA_STRING &tgt, char *buf, const char *srcstr)
{
tgt.Length = strlen (srcstr);
tgt.MaximumLength = tgt.Length + 1;
tgt.Buffer = (PCHAR) buf;
memcpy (buf, srcstr, tgt.MaximumLength);
}
HANDLE HANDLE
lsa_open_policy (PWCHAR server, ACCESS_MASK access) lsa_open_policy (PWCHAR server, ACCESS_MASK access)
{ {
@ -971,7 +954,7 @@ lsaauth (cygsid &usersid, user_groups &new_groups, struct passwd *pw)
push_self_privilege (SE_TCB_PRIVILEGE, true); push_self_privilege (SE_TCB_PRIVILEGE, true);
/* Register as logon process. */ /* Register as logon process. */
str2lsa (name, "Cygwin"); RtlInitAnsiString (&name, "Cygwin");
SetLastError (0); SetLastError (0);
status = LsaRegisterLogonProcess (&name, &lsa_hdl, &sec_mode); status = LsaRegisterLogonProcess (&name, &lsa_hdl, &sec_mode);
if (status != STATUS_SUCCESS) if (status != STATUS_SUCCESS)
@ -986,7 +969,7 @@ lsaauth (cygsid &usersid, user_groups &new_groups, struct passwd *pw)
goto out; goto out;
} }
/* Get handle to our own LSA package. */ /* Get handle to our own LSA package. */
str2lsa (name, CYG_LSA_PKGNAME); RtlInitAnsiString (&name, CYG_LSA_PKGNAME);
status = LsaLookupAuthenticationPackage (lsa_hdl, &name, &package_id); status = LsaLookupAuthenticationPackage (lsa_hdl, &name, &package_id);
if (status != STATUS_SUCCESS) if (status != STATUS_SUCCESS)
{ {
@ -1000,7 +983,8 @@ lsaauth (cygsid &usersid, user_groups &new_groups, struct passwd *pw)
goto out; goto out;
/* Create origin. */ /* Create origin. */
str2buf2lsa (origin.str, origin.buf, "Cygwin"); stpcpy (origin.buf, "Cygwin");
RtlInitAnsiString (&origin.str, origin.buf);
/* Create token source. */ /* Create token source. */
memcpy (ts.SourceName, "Cygwin.1", 8); memcpy (ts.SourceName, "Cygwin.1", 8);
ts.SourceIdentifier.HighPart = 0; ts.SourceIdentifier.HighPart = 0;