diff options
Diffstat (limited to 'winsup/cygwin/security.h')
| -rw-r--r-- | winsup/cygwin/security.h | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/winsup/cygwin/security.h b/winsup/cygwin/security.h index e478d91ac..9550e98d7 100644 --- a/winsup/cygwin/security.h +++ b/winsup/cygwin/security.h @@ -53,12 +53,10 @@ details. */ #define SE_SYSTEM_ENVIRONMENT_PRIVILEGE 22UL #define SE_CHANGE_NOTIFY_PRIVILEGE 23UL #define SE_REMOTE_SHUTDOWN_PRIVILEGE 24UL -/* Starting with Windows 2000 */ #define SE_UNDOCK_PRIVILEGE 25UL #define SE_SYNC_AGENT_PRIVILEGE 26UL #define SE_ENABLE_DELEGATION_PRIVILEGE 27UL #define SE_MANAGE_VOLUME_PRIVILEGE 28UL -/* Starting with Windows 2000 SP4, XP SP2, 2003 Server */ #define SE_IMPERSONATE_PRIVILEGE 29UL #define SE_CREATE_GLOBAL_PRIVILEGE 30UL /* Starting with Vista */ @@ -114,7 +112,7 @@ public: cygpsid (PSID nsid) { psid = nsid; } operator PSID () const { return psid; } const PSID operator= (PSID nsid) { return psid = nsid;} - __uid32_t get_id (BOOL search_grp, int *type = NULL); + uid_t get_id (BOOL search_grp, int *type = NULL); int get_uid () { return get_id (FALSE); } int get_gid () { return get_id (TRUE); } @@ -187,7 +185,7 @@ public: inline PSID set () { return psid = (PSID) sbuf; } BOOL getfrompw (const struct passwd *pw); - BOOL getfromgr (const struct __group32 *gr); + BOOL getfromgr (const struct group *gr); void debug_print (const char *prefix = NULL) const { @@ -217,7 +215,7 @@ public: } ~cygsidlist () { if (type == cygsidlist_auto) delete [] sids; } - BOOL addfromgr (struct __group32 *gr) /* Only with alloc */ + BOOL addfromgr (struct group *gr) /* Only with alloc */ { return sids[cnt].getfromgr (gr) && ++cnt; } /* += adds a "normal" SID, *= adds a well-known SID. See comment in class @@ -346,7 +344,6 @@ extern cygpsid well_known_system_sid; extern cygpsid well_known_builtin_sid; extern cygpsid well_known_admins_sid; extern cygpsid well_known_users_sid; -extern cygpsid fake_logon_sid; extern cygpsid mandatory_medium_integrity_sid; extern cygpsid mandatory_high_integrity_sid; extern cygpsid mandatory_system_integrity_sid; @@ -370,17 +367,17 @@ legal_sid_type (SID_NAME_USE type) class path_conv; /* File manipulation */ int __reg3 get_file_attribute (HANDLE, path_conv &, mode_t *, - __uid32_t *, __gid32_t *); + uid_t *, gid_t *); int __reg3 set_file_attribute (HANDLE, path_conv &, - __uid32_t, __gid32_t, mode_t); + uid_t, gid_t, mode_t); int __reg2 get_object_sd (HANDLE, security_descriptor &); -int __reg3 get_object_attribute (HANDLE, __uid32_t *, __gid32_t *, mode_t *); -int __reg3 set_object_attribute (HANDLE, __uid32_t, __gid32_t, mode_t); -int __reg3 create_object_sd_from_attribute (HANDLE, __uid32_t, __gid32_t, +int __reg3 get_object_attribute (HANDLE, uid_t *, gid_t *, mode_t *); +int __reg3 set_object_attribute (HANDLE, uid_t, gid_t, mode_t); +int __reg3 create_object_sd_from_attribute (HANDLE, uid_t, gid_t, mode_t, security_descriptor &); int __reg3 set_object_sd (HANDLE, security_descriptor &, bool); -int __reg3 get_reg_attribute (HKEY hkey, mode_t *, __uid32_t *, __gid32_t *); +int __reg3 get_reg_attribute (HKEY hkey, mode_t *, uid_t *, gid_t *); LONG __reg3 get_file_sd (HANDLE fh, path_conv &, security_descriptor &, bool); LONG __reg3 set_file_sd (HANDLE fh, path_conv &, security_descriptor &, bool); bool __reg3 add_access_allowed_ace (PACL, int, DWORD, PSID, size_t &, DWORD); @@ -392,14 +389,14 @@ void set_security_attribute (path_conv &pc, int attribute, PSECURITY_ATTRIBUTES psa, security_descriptor &sd_buf); -bool get_sids_info (cygpsid, cygpsid, __uid32_t * , __gid32_t *); +bool get_sids_info (cygpsid, cygpsid, uid_t * , gid_t *); /* sec_acl.cc */ -struct __acl32; -extern "C" int aclsort32 (int, int, __acl32 *); -extern "C" int acl32 (const char *, int, int, __acl32 *); -int getacl (HANDLE, path_conv &, int, __acl32 *); -int setacl (HANDLE, path_conv &, int, __acl32 *, bool &); +struct acl; +extern "C" int aclsort32 (int, int, struct acl *); +extern "C" int acl32 (const char *, int, int, struct acl *); +int getacl (HANDLE, path_conv &, int, struct acl *); +int setacl (HANDLE, path_conv &, int, struct acl *, bool &); /* Set impersonation or restricted token. */ void set_imp_token (HANDLE token, int type); |