More acl -> the_acl, %d with uid_t issues.

Jeremy.

diff --git a/source/rpc_server/srv_spoolss_nt.c b/source/rpc_server/srv_spoolss_nt.c
index 6dbf90ba8a528d056f8d6f4e84e199d24c3804c4..d714972179eebaa5d96cc4ed20a2526d7e40ba79 100644 (file)
--- a/source/rpc_server/srv_spoolss_nt.c
+++ b/source/rpc_server/srv_spoolss_nt.c
@@ -4034,35 +4034,35 @@ static uint32 update_printer_sec(POLICY_HND *handle, uint32 level,
        nt_printing_getsec(p->mem_ctx, Printer->dev.handlename, &old_secdesc_ctr);
 
        if (DEBUGLEVEL >= 10) {
-               SEC_ACL *acl;
+               SEC_ACL *the_acl;
                int i;
 
-               acl = old_secdesc_ctr->sec->dacl;
+               the_acl = old_secdesc_ctr->sec->dacl;
                DEBUG(10, ("old_secdesc_ctr for %s has %d aces:\n", 
-                          PRINTERNAME(snum), acl->num_aces));
+                          PRINTERNAME(snum), the_acl->num_aces));
 
-               for (i = 0; i < acl->num_aces; i++) {
+               for (i = 0; i < the_acl->num_aces; i++) {
                        fstring sid_str;
 
-                       sid_to_string(sid_str, &acl->ace[i].sid);
+                       sid_to_string(sid_str, &the_acl->ace[i].sid);
 
                        DEBUG(10, ("%s 0x%08x\n", sid_str, 
-                                 acl->ace[i].info.mask));
+                                 the_acl->ace[i].info.mask));
                }
 
-               acl = secdesc_ctr->sec->dacl;
+               the_acl = secdesc_ctr->sec->dacl;
 
-               if (acl) {
+               if (the_acl) {
                        DEBUG(10, ("secdesc_ctr for %s has %d aces:\n", 
-                                  PRINTERNAME(snum), acl->num_aces));
+                                  PRINTERNAME(snum), the_acl->num_aces));
 
-                       for (i = 0; i < acl->num_aces; i++) {
+                       for (i = 0; i < the_acl->num_aces; i++) {
                                fstring sid_str;
                                
-                               sid_to_string(sid_str, &acl->ace[i].sid);
+                               sid_to_string(sid_str, &the_acl->ace[i].sid);
                                
                                DEBUG(10, ("%s 0x%08x\n", sid_str, 
-                                          acl->ace[i].info.mask));
+                                          the_acl->ace[i].info.mask));
                        }
                } else {
                        DEBUG(10, ("dacl for secdesc_ctr is NULL\n"));
@@ -5515,7 +5515,7 @@ static uint32 enumports_level_2(NEW_BUFFER *buffer, uint32 offered, uint32 *need
                else
                        path = lp_lockdir();
 
-               slprintf(tmp_file, sizeof(tmp_file)-1, "%s/smbcmd.%d.", path, sys_getpid());
+               slprintf(tmp_file, sizeof(tmp_file)-1, "%s/smbcmd.%u.", path, (unsigned int)sys_getpid());
                slprintf(command, sizeof(command)-1, "%s \"%d\"", cmd, 2);
 
                unlink(tmp_file);