param/loadparm.c: Looks like someone ran indent on this !

passdb/smbpass.c: Insure uninitialized memory reference fix.
printing/nt_printing.c:
rpc_server/srv_spoolss_nt.c: Insure memory leak fixes.
smbd/unix_acls.c: Shadow ref fix.
Jeremy.
(This used to be commit d175d3ebefc053e9badd91ca5f2d8bd03eb6705d)

1 files changed, 4 insertions, 4 deletions

diff --git a/source3/smbd/unix_acls.c b/source3/smbd/unix_acls.c
index 08dfbc0006..40bb281c74 100644
--- a/source3/smbd/unix_acls.c
+++ b/source3/smbd/unix_acls.c
@@ -338,7 +338,7 @@ size_t get_nt_acl(files_struct *fsp, SEC_DESC **ppdesc)
   SEC_ACE ace_list[6];
   DOM_SID owner_sid;
   DOM_SID group_sid;
-  size_t sec_desc_size;
+  size_t sd_size;
   SEC_ACL *psa = NULL;
   SEC_ACCESS owner_access;
   int owner_acl_type;
@@ -429,16 +429,16 @@ size_t get_nt_acl(files_struct *fsp, SEC_DESC **ppdesc)
       }
   }
 
-  *ppdesc = make_standard_sec_desc( &owner_sid, &group_sid, psa, &sec_desc_size);
+  *ppdesc = make_standard_sec_desc( &owner_sid, &group_sid, psa, &sd_size);
 
   if(!*ppdesc) {
     DEBUG(0,("get_nt_acl: Unable to malloc space for security descriptor.\n"));
-    sec_desc_size = 0;
+    sd_size = 0;
   }
 
   free_sec_acl(&psa);
 
-  return sec_desc_size;
+  return sd_size;
 }
 
 /****************************************************************************