diff options
| author | Günther Deschner <gd@samba.org> | 2009-04-15 01:19:30 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-04-28 09:11:12 +0200 |
| commit | 799716eacaaf96eb71f4bf3628d2c1c983ae7f1e (patch) | |
| tree | 713282843fd27ec763e4b8a31e532765697ca880 | |
| parent | e92e7afaf765257ce9fb26940d6df1102439873a (diff) | |
| download | samba-799716eacaaf96eb71f4bf3628d2c1c983ae7f1e.tar.gz | |
s3-secdesc: use SEC_FLAG_SYSTEM_SECURITY instead of SEC_RIGHT_SYSTEM_SECURITY.
Guenther
(cherry picked from commit da92e54236293460e307edd52ca7f1e20c6f23ef)
(cherry picked from commit 3e9ee3fa54b514987f40a477b3049b18e87390e9)
| -rw-r--r-- | source3/smbd/open.c | 8 | ||||
| -rw-r--r-- | source3/utils/net_registry.c | 4 | ||||
| -rw-r--r-- | source3/utils/net_rpc_registry.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index eae6e18c4e5..3578f2ac60d 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -2409,9 +2409,9 @@ static NTSTATUS open_directory(connection_struct *conn, } /* We need to support SeSecurityPrivilege for this. */ - if (access_mask & SEC_RIGHT_SYSTEM_SECURITY) { + if (access_mask & SEC_FLAG_SYSTEM_SECURITY) { DEBUG(10, ("open_directory: open on %s " - "failed - SEC_RIGHT_SYSTEM_SECURITY denied.\n", + "failed - SEC_FLAG_SYSTEM_SECURITY denied.\n", fname)); return NT_STATUS_PRIVILEGE_NOT_HELD; } @@ -2955,7 +2955,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn, #if 0 /* We need to support SeSecurityPrivilege for this. */ - if ((access_mask & SEC_RIGHT_SYSTEM_SECURITY) && + if ((access_mask & SEC_FLAG_SYSTEM_SECURITY) && !user_has_privileges(current_user.nt_user_token, &se_security)) { status = NT_STATUS_PRIVILEGE_NOT_HELD; @@ -2963,7 +2963,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn, } #else /* We need to support SeSecurityPrivilege for this. */ - if (access_mask & SEC_RIGHT_SYSTEM_SECURITY) { + if (access_mask & SEC_FLAG_SYSTEM_SECURITY) { status = NT_STATUS_PRIVILEGE_NOT_HELD; goto fail; } diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c index a504bcfd0b6..d6cdd982c3d 100644 --- a/source3/utils/net_registry.c +++ b/source3/utils/net_registry.c @@ -412,10 +412,10 @@ static int net_registry_getsd(struct net_context *c, int argc, TALLOC_CTX *ctx = talloc_stackframe(); uint32_t access_mask = REG_KEY_READ | SEC_FLAG_MAXIMUM_ALLOWED | - SEC_RIGHT_SYSTEM_SECURITY; + SEC_FLAG_SYSTEM_SECURITY; /* - * net_rpc_regsitry uses SEC_RIGHT_SYSTEM_SECURITY, but access + * net_rpc_regsitry uses SEC_FLAG_SYSTEM_SECURITY, but access * is denied with these perms right now... */ access_mask = REG_KEY_READ; diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c index 3076866a3a9..cad605fdde4 100644 --- a/source3/utils/net_rpc_registry.c +++ b/source3/utils/net_rpc_registry.c @@ -1148,7 +1148,7 @@ static NTSTATUS rpc_registry_getsd_internal(struct net_context *c, struct security_descriptor sec_desc; uint32_t access_mask = REG_KEY_READ | SEC_FLAG_MAXIMUM_ALLOWED | - SEC_RIGHT_SYSTEM_SECURITY; + SEC_FLAG_SYSTEM_SECURITY; if (argc <1 || argc > 2 || c->display_usage) { d_printf("Usage: net rpc registry getsd <path> <secinfo>\n"); |