summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-04-27 21:49:22 +0000
committerJeremy Allison <jra@samba.org>2001-04-27 21:49:22 +0000
commit9b783398750cbf6e8b6b6bbb76dd393b432403c7 (patch)
treed0e7ff6532f6f236c13bf31a6afc1fb2beebccd6
parentc08fc869ce12c61241bc47f808821727c7c5dcf4 (diff)
downloadsamba-9b783398750cbf6e8b6b6bbb76dd393b432403c7.tar.gz
samba-9b783398750cbf6e8b6b6bbb76dd393b432403c7.tar.bz2
samba-9b783398750cbf6e8b6b6bbb76dd393b432403c7.zip
More acl -> the_acl, %d with uid_t issues.
Jeremy. (This used to be commit 30edd7fdf1d791d76351a7cc23a83f97386c3087)
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 6dbf90ba8a..d714972179 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/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);