Changeset 735 for branches/samba-3.5.x/source3

Timestamp:

Nov 12, 2012, 5:25:07 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.15

Location:

branches/samba-3.5.x/source3

Files:

• VERSION (modified) (1 diff)
• rpc_server/srv_lsa_nt.c (modified) (6 diffs)

branches/samba-3.5.x/source3/VERSION

@@ -26 +26 @@
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=5
-SAMBA_VERSION_RELEASE=14
+SAMBA_VERSION_RELEASE=15
 
 ########################################################

branches/samba-3.5.x/source3/rpc_server/srv_lsa_nt.c

@@ -1692 +1692 @@
         struct lsa_info *info;
         uint32_t acc_granted;
+        uint32_t owner_access = (LSA_ACCOUNT_ALL_ACCESS &
+                        ~(LSA_ACCOUNT_ADJUST_PRIVILEGES|
+                        LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS|
+                        STD_RIGHT_DELETE_ACCESS));
         struct security_descriptor *psd;
         size_t sd_size;
@@ -1719 +1723 @@
         status = make_lsa_object_sd(p->mem_ctx, &psd, &sd_size,
                                     &lsa_account_mapping,
-                                    r->in.sid, LSA_POLICY_ALL_ACCESS);
+                                    r->in.sid, owner_access);
         if (!NT_STATUS_IS_OK(status)) {
                 return status;
@@ -1765 +1769 @@
         uint32_t des_access = r->in.access_mask;
         uint32_t acc_granted;
+        uint32_t owner_access = (LSA_ACCOUNT_ALL_ACCESS &
+                        ~(LSA_ACCOUNT_ADJUST_PRIVILEGES|
+                        LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS|
+                        STD_RIGHT_DELETE_ACCESS));
         NTSTATUS status;
 
@@ -1789 +1797 @@
         status = make_lsa_object_sd(p->mem_ctx, &psd, &sd_size,
                                 &lsa_account_mapping,
-                                r->in.sid, LSA_ACCOUNT_ALL_ACCESS);
+                                r->in.sid, owner_access);
         if (!NT_STATUS_IS_OK(status)) {
                 return status;
@@ -2175 +2183 @@
         }
 
-        /* get the generic lsa account SD for this SID until we store it */
+        /* get the generic lsa account SD until we store it */
         status = make_lsa_object_sd(p->mem_ctx, &psd, &sd_size,
                                 &lsa_account_mapping,
-                                r->in.sid, LSA_ACCOUNT_ALL_ACCESS);
+                                NULL, 0);
         if (!NT_STATUS_IS_OK(status)) {
                 return status;
@@ -2246 +2254 @@
         }
 
-        /* get the generic lsa account SD for this SID until we store it */
+        /* get the generic lsa account SD until we store it */
         status = make_lsa_object_sd(p->mem_ctx, &psd, &sd_size,
                                 &lsa_account_mapping,
-                                r->in.sid, LSA_ACCOUNT_ALL_ACCESS);
+                                NULL, 0);
         if (!NT_STATUS_IS_OK(status)) {
                 return status;