summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/sec_helper.cc
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2011-04-28 08:34:49 +0000
committerCorinna Vinschen <corinna@vinschen.de>2011-04-28 08:34:49 +0000
commit158e516b9dcb2993e5f062f2feeee5dbd4ee787a (patch)
treec65b8b19992852ded9f5df8d5108156e29969bce /winsup/cygwin/sec_helper.cc
parent41e9c14558ea32ce550e285d2b2b8d195b288b3d (diff)
downloadcygnal-158e516b9dcb2993e5f062f2feeee5dbd4ee787a.tar.gz
cygnal-158e516b9dcb2993e5f062f2feeee5dbd4ee787a.tar.bz2
cygnal-158e516b9dcb2993e5f062f2feeee5dbd4ee787a.zip
* advapi32.cc (InitializeSid): Remove.
(EqualPrefixSid): Remove. (GetLengthSid): Remove. (GetSidSubAuthority): Remove. (GetSidSubAuthorityCount): Remove. (GetSidIdentifierAuthority): Remove. * fhandler_disk_file.cc: Remove above functions throughout with their ntdll.dll equivalent. * sec_auth.cc: Ditto. * sec_helper.cc: Ditto. * security.cc: Ditto.
Diffstat (limited to 'winsup/cygwin/sec_helper.cc')
-rw-r--r--winsup/cygwin/sec_helper.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/winsup/cygwin/sec_helper.cc b/winsup/cygwin/sec_helper.cc
index 069eaa544..71fbd742c 100644
--- a/winsup/cygwin/sec_helper.cc
+++ b/winsup/cygwin/sec_helper.cc
@@ -140,9 +140,9 @@ cygpsid::string (char *nsidstr) const
return NULL;
strcpy (nsidstr, "S-1-");
t = nsidstr + sizeof ("S-1-") - 1;
- t += __small_sprintf (t, "%u", GetSidIdentifierAuthority (psid)->Value[5]);
- for (i = 0; i < *GetSidSubAuthorityCount (psid); ++i)
- t += __small_sprintf (t, "-%lu", *GetSidSubAuthority (psid, i));
+ t += __small_sprintf (t, "%u", RtlIdentifierAuthoritySid (psid)->Value[5]);
+ for (i = 0; i < *RtlSubAuthorityCountSid (psid); ++i)
+ t += __small_sprintf (t, "-%lu", *RtlSubAuthoritySid (psid, i));
return nsidstr;
}
@@ -160,7 +160,7 @@ cygsid::get_sid (DWORD s, DWORD cnt, DWORD *r, bool well_known)
}
sid_auth.Value[5] = s;
set ();
- InitializeSid (psid, &sid_auth, cnt);
+ RtlInitializeSid (psid, &sid_auth, cnt);
for (i = 0; i < cnt; ++i)
memcpy ((char *) psid + 8 + sizeof (DWORD) * i, &r[i], sizeof (DWORD));
/* If the well_known flag isn't set explicitely, we check the SID