From e655e9f6765f951447a36cc3890437f21a13ca0d Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 26 Aug 2010 15:56:21 +1000 Subject: s4-privs Remove link between enum sec_privilege and the privilege bitmap This allows us to set the enum sec_privilege constants to the LUID values that are seen from windows, which we need to match, in order to preserve the support for the NT Print Migrator tool after a merge with the source3/ privileges code. Andrew Bartlett Signed-off-by: Andrew Tridgell --- source4/libcli/security/privilege.c | 86 +++++++++++++++++++++++++++++-------- 1 file changed, 69 insertions(+), 17 deletions(-) (limited to 'source4/libcli/security') diff --git a/source4/libcli/security/privilege.c b/source4/libcli/security/privilege.c index 8263830654..374dc4a449 100644 --- a/source4/libcli/security/privilege.c +++ b/source4/libcli/security/privilege.c @@ -26,108 +26,150 @@ static const struct { enum sec_privilege privilege; + uint64_t privilege_mask; const char *name; const char *display_name; } privilege_names[] = { {SEC_PRIV_SECURITY, + SE_SECURITY, "SeSecurityPrivilege", "System security"}, {SEC_PRIV_BACKUP, + SE_BACKUP, "SeBackupPrivilege", "Backup files and directories"}, {SEC_PRIV_RESTORE, + SE_RESTORE, "SeRestorePrivilege", "Restore files and directories"}, {SEC_PRIV_SYSTEMTIME, + SE_SYSTEMTIME, "SeSystemtimePrivilege", "Set the system clock"}, {SEC_PRIV_SHUTDOWN, + SE_SHUTDOWN, "SeShutdownPrivilege", "Shutdown the system"}, {SEC_PRIV_REMOTE_SHUTDOWN, + SE_REMOTE_SHUTDOWN, "SeRemoteShutdownPrivilege", "Shutdown the system remotely"}, {SEC_PRIV_TAKE_OWNERSHIP, + SE_TAKE_OWNERSHIP, "SeTakeOwnershipPrivilege", "Take ownership of files and directories"}, {SEC_PRIV_DEBUG, + SE_DEBUG, "SeDebugPrivilege", "Debug processes"}, {SEC_PRIV_SYSTEM_ENVIRONMENT, + SE_SYSTEM_ENVIRONMENT, "SeSystemEnvironmentPrivilege", "Modify system environment"}, {SEC_PRIV_SYSTEM_PROFILE, + SE_SYSTEM_PROFILE, "SeSystemProfilePrivilege", "Profile the system"}, {SEC_PRIV_PROFILE_SINGLE_PROCESS, + SE_PROFILE_SINGLE_PROCESS, "SeProfileSingleProcessPrivilege", "Profile one process"}, {SEC_PRIV_INCREASE_BASE_PRIORITY, + SE_INCREASE_BASE_PRIORITY, "SeIncreaseBasePriorityPrivilege", "Increase base priority"}, {SEC_PRIV_LOAD_DRIVER, + SE_LOAD_DRIVER, "SeLoadDriverPrivilege", "Load drivers"}, {SEC_PRIV_CREATE_PAGEFILE, + SE_CREATE_PAGEFILE, "SeCreatePagefilePrivilege", "Create page files"}, {SEC_PRIV_INCREASE_QUOTA, + SE_INCREASE_QUOTA, "SeIncreaseQuotaPrivilege", "Increase quota"}, {SEC_PRIV_CHANGE_NOTIFY, + SE_CHANGE_NOTIFY, "SeChangeNotifyPrivilege", "Register for change notify"}, {SEC_PRIV_UNDOCK, + SE_UNDOCK, "SeUndockPrivilege", "Undock devices"}, {SEC_PRIV_MANAGE_VOLUME, + SE_MANAGE_VOLUME, "SeManageVolumePrivilege", "Manage system volumes"}, {SEC_PRIV_IMPERSONATE, + SE_IMPERSONATE, "SeImpersonatePrivilege", "Impersonate users"}, {SEC_PRIV_CREATE_GLOBAL, + SE_CREATE_GLOBAL, "SeCreateGlobalPrivilege", "Create global"}, {SEC_PRIV_ENABLE_DELEGATION, + SE_ENABLE_DELEGATION, "SeEnableDelegationPrivilege", "Enable Delegation"}, {SEC_PRIV_INTERACTIVE_LOGON, + SE_INTERACTIVE_LOGON, "SeInteractiveLogonRight", "Interactive logon"}, {SEC_PRIV_NETWORK_LOGON, + SE_NETWORK_LOGON, "SeNetworkLogonRight", "Network logon"}, {SEC_PRIV_REMOTE_INTERACTIVE_LOGON, + SE_REMOTE_INTERACTIVE_LOGON, "SeRemoteInteractiveLogonRight", "Remote Interactive logon"}, {SEC_PRIV_MACHINE_ACCOUNT, + SE_MACHINE_ACCOUNT, "SeMachineAccountPrivilege", - "Add workstations to domain"} + "Add workstations to domain"}, + + /* These last 3 are Samba only */ + {SEC_PRIV_PRINT_OPERATOR, + SE_PRINT_OPERATOR, + "SePrintOperatorPrivilege", + "Manage printers"}, + + {SEC_PRIV_ADD_USERS, + SE_ADD_USERS, + "SeAddUsersPrivilege", + "Add users and groups to the domain"}, + + {SEC_PRIV_DISK_OPERATOR, + SE_DISK_OPERATOR, + "SeDiskOperatorPrivilege", + "Manage disk shares"}, }; @@ -178,20 +220,34 @@ enum sec_privilege sec_privilege_id(const char *name) return -1; } +/* + map a privilege name to a privilege id. Return -1 if not found +*/ +enum sec_privilege sec_privilege_from_mask(uint64_t mask) +{ + int i; + for (i=0;i 64) { - return 0; + int i; + for (i=0;i 64) { + mask = sec_privilege_mask(privilege); + if (mask == 0) { return false; } - mask = sec_privilege_mask(privilege); if (token->privilege_mask & mask) { return true; } @@ -218,9 +274,7 @@ bool security_token_has_privilege(const struct security_token *token, enum sec_p */ void security_token_set_privilege(struct security_token *token, enum sec_privilege privilege) { - if (privilege < 1 || privilege > 64) { - return; - } + /* Relies on the fact that an invalid privilage will return 0, so won't change this */ token->privilege_mask |= sec_privilege_mask(privilege); } @@ -231,12 +285,10 @@ void security_token_debug_privileges(int dbg_lev, const struct security_token *t if (token->privilege_mask) { int i = 0; - unsigned int privilege; - - for (privilege = 1; privilege <= 64; privilege++) { - uint64_t mask = sec_privilege_mask(privilege); - + uint64_t mask; + for (mask = 1; mask != 0; mask = mask << 1) { if (token->privilege_mask & mask) { + enum sec_privilege privilege = sec_privilege_from_mask(mask); DEBUGADD(dbg_lev, (" Privilege[%3lu]: %s\n", (unsigned long)i++, sec_privilege_name(privilege))); } -- cgit