Changeset 751 for trunk/server/source3/rpc_server/srvsvc

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/rpc_server/srvsvc/srv_srvsvc_nt.c (modified) (1 diff)

trunk/server/source3/rpc_server/srvsvc/srv_srvsvc_nt.c

@@ -2319 +2319 @@
         security_info_sent = r->in.securityinformation;
 
-        if (psd->owner_sid==0) {
-                security_info_sent &= ~SECINFO_OWNER;
-        }
-        if (psd->group_sid==0) {
-                security_info_sent &= ~SECINFO_GROUP;
-        }
-        if (psd->sacl==0) {
-                security_info_sent &= ~SECINFO_SACL;
-        }
-        if (psd->dacl==0) {
-                security_info_sent &= ~SECINFO_DACL;
-        }
-
-        /* Convert all the generic bits. */
-        security_acl_map_generic(psd->dacl, &file_generic_mapping);
-        security_acl_map_generic(psd->sacl, &file_generic_mapping);
-
-        nt_status = SMB_VFS_FSET_NT_ACL(fsp,
-                                        security_info_sent,
-                                        psd);
+        nt_status = set_sd(fsp, psd, security_info_sent);
 
         if (!NT_STATUS_IS_OK(nt_status) ) {