Changeset 221 for branches/samba-3.3.x/source/libgpo

Timestamp:

May 24, 2009, 7:17:10 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.1

File:

• branches/samba-3.3.x/source/libgpo/gpo_reg.c (modified) (3 diffs)

branches/samba-3.3.x/source/libgpo/gpo_reg.c

@@ -692 +692 @@
         uint32_t mask;
 
-        SEC_ACL *acl = NULL;
+        SEC_ACL *theacl = NULL;
 
         uint8_t inherit_flags;
@@ -736 +736 @@
                      mask, inherit_flags);
 
-        acl = make_sec_acl(mem_ctx, NT4_ACL_REVISION, 6, ace);
-        W_ERROR_HAVE_NO_MEMORY(acl);
+        theacl = make_sec_acl(mem_ctx, NT4_ACL_REVISION, 6, ace);
+        W_ERROR_HAVE_NO_MEMORY(theacl);
 
         *sd = make_sec_desc(mem_ctx, SEC_DESC_REVISION,
@@ -744 +744 @@
                             SEC_DESC_DACL_AUTO_INHERIT_REQ, /* really ? */
                             NULL, NULL, NULL,
-                            acl, sd_size);
+                            theacl, sd_size);
         W_ERROR_HAVE_NO_MEMORY(*sd);