mirror of
https://github.com/samba-team/samba.git
synced 2024-12-25 23:21:54 +03:00
More acl -> the_acl, %d with uid_t issues.
Jeremy.
(This used to be commit 30edd7fdf1
)
This commit is contained in:
parent
c08fc869ce
commit
9b78339875
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user