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

* security.h (MAX_SUBAUTH_CNT): Drop. Use SID_MAX_SUB_AUTHORITIES

Browse Source 
instead throughout.
	(MAX_SID_LEN): Drop.  Use SECURITY_MAX_SID_SIZE instead throughout.
This commit is contained in:
Corinna Vinschen
2014-05-06 12:28:33 +00:00
parent 439b7db785
commit fc3a3524b2
6 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
winsup/cygwin/security.h
View File

@@ -44,12 +44,9 @@ void uinfo_init ();
#define gid16togid32(g16) ((g16)==ILLEGAL_GID16?ILLEGAL_GID:(gid_t)(g16))
#endif
#define MAX_SUBAUTH_CNT 11
#define MAX_SID_LEN (2 * sizeof (BYTE) \
+ sizeof (SID_IDENTIFIER_AUTHORITY) \
+ MAX_SUBAUTH_CNT * sizeof (DWORD))
#define MAX_DACL_LEN(n) (sizeof (ACL) \
+ (n) * (sizeof (ACCESS_ALLOWED_ACE) - sizeof (DWORD) + MAX_SID_LEN))
+ (n) * (sizeof (ACCESS_ALLOWED_ACE) - sizeof (DWORD) \
+ SECURITY_MAX_SID_SIZE))
#define SD_MIN_SIZE (sizeof (SECURITY_DESCRIPTOR) + MAX_DACL_LEN (1))
#define ACL_MAXIMUM_SIZE 65532 /* Yeah, right. 64K - sizeof (DWORD). */
#define SD_MAXIMUM_SIZE 65536
@@ -101,7 +98,7 @@ typedef struct {
BYTE Revision;
BYTE SubAuthorityCount;
SID_IDENTIFIER_AUTHORITY IdentifierAuthority;
DWORD SubAuthority[MAX_SUBAUTH_CNT];
DWORD SubAuthority[SID_MAX_SUB_AUTHORITIES];
} DBGSID, *PDBGSID;
/* Macro to define variable length SID structures */
@@ -179,7 +176,7 @@ public:
};
class cygsid : public cygpsid {
char sbuf[MAX_SID_LEN];
char sbuf[SECURITY_MAX_SID_SIZE];
bool well_known_sid;
const PSID getfromstr (PCWSTR nsidstr, bool well_known);
@@ -193,7 +190,7 @@ class cygsid : public cygpsid {
else
{
psid = (PSID) sbuf;
RtlCopySid (MAX_SID_LEN, psid, nsid);
RtlCopySid (SECURITY_MAX_SID_SIZE, psid, nsid);
well_known_sid = well_known;
}
return psid;