diff options
| author | Günther Deschner <gd@samba.org> | 2010-06-02 23:35:44 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-06-03 11:00:12 +0200 |
| commit | a75436e3ee11fa1491bfa574523269be716fc892 (patch) | |
| tree | 16b926c2956bfb9bbf2e4814c86bca985cd8d85a /source3/rpc_server | |
| parent | e24a59f932897888cadae31469366663aca1a414 (diff) | |
| download | samba-a75436e3ee11fa1491bfa574523269be716fc892.tar.gz samba-a75436e3ee11fa1491bfa574523269be716fc892.tar.bz2 samba-a75436e3ee11fa1491bfa574523269be716fc892.zip | |
s3-security: use shared SECINFO_DACL define.
Guenther
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/srv_srvsvc_nt.c | 4 | ||||
| -rw-r--r-- | source3/rpc_server/srv_svcctl_nt.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c index bdf7018147..14461df355 100644 --- a/source3/rpc_server/srv_srvsvc_nt.c +++ b/source3/rpc_server/srv_srvsvc_nt.c @@ -2148,7 +2148,7 @@ WERROR _srvsvc_NetGetFileSecurity(pipes_struct *p, nt_status = SMB_VFS_FGET_NT_ACL(fsp, (SECINFO_OWNER |SECINFO_GROUP - |DACL_SECURITY_INFORMATION), &psd); + |SECINFO_DACL), &psd); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(3,("_srvsvc_NetGetFileSecurity: Unable to get NT ACL " @@ -2289,7 +2289,7 @@ WERROR _srvsvc_NetSetFileSecurity(pipes_struct *p, security_info_sent &= ~SECINFO_SACL; } if (psd->dacl==0) { - security_info_sent &= ~DACL_SECURITY_INFORMATION; + security_info_sent &= ~SECINFO_DACL; } /* Convert all the generic bits. */ diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c index b8dcfbe1c6..02b3c8d833 100644 --- a/source3/rpc_server/srv_svcctl_nt.c +++ b/source3/rpc_server/srv_svcctl_nt.c @@ -872,9 +872,9 @@ WERROR _svcctl_QueryServiceObjectSecurity(pipes_struct *p, if ( !(info->access_granted & STD_RIGHT_READ_CONTROL_ACCESS) ) return WERR_ACCESS_DENIED; - /* TODO: handle something besides DACL_SECURITY_INFORMATION */ + /* TODO: handle something besides SECINFO_DACL */ - if ( (r->in.security_flags & DACL_SECURITY_INFORMATION) != DACL_SECURITY_INFORMATION ) + if ( (r->in.security_flags & SECINFO_DACL) != SECINFO_DACL ) return WERR_INVALID_PARAM; /* lookup the security descriptor and marshall it up for a reply */ @@ -922,7 +922,7 @@ WERROR _svcctl_SetServiceObjectSecurity(pipes_struct *p, /* check the access on the open handle */ switch ( r->in.security_flags ) { - case DACL_SECURITY_INFORMATION: + case SECINFO_DACL: required_access = STD_RIGHT_WRITE_DAC_ACCESS; break; |