Tidy up args to DEBUG Statements - found by gcc on Solaris.

Jeremy.
(This used to be commit a60ecb4e53a6c8a3a6a37a89042ae943202263fe)

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index c23ee00bd855225425c17e66d59134fca77c17e6..0c613e8835205c3b746e0c59bf61bec24375ff93 100644 (file)
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -1598,7 +1598,7 @@ static BOOL set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, BOOL defau
 
                if (map_acl_perms_to_permset(p_ace->perms, &the_permset) == -1) {
                        DEBUG(0,("set_canon_ace_list: Failed to create permset for mode (%u) on entry %d. (%s)\n",
-                               p_ace->perms, i, strerror(errno) ));
+                               (unsigned int)p_ace->perms, i, strerror(errno) ));
                        goto done;
                }
 

diff --git a/source3/smbd/sec_ctx.c b/source3/smbd/sec_ctx.c
index f604f6cce71eabcf2744c2b023d395ad79ffc8c8..f6563ffe96ea277601100c8f44dc023a4edd3972 100644 (file)
--- a/source3/smbd/sec_ctx.c
+++ b/source3/smbd/sec_ctx.c
@@ -275,8 +275,8 @@ BOOL push_sec_ctx(void)
        ctx_p->uid = geteuid();
        ctx_p->gid = getegid();
 
-       DEBUG(3, ("push_sec_ctx(%d, %d) : sec_ctx_stack_ndx = %d\n", 
-                 ctx_p->uid, ctx_p->gid, sec_ctx_stack_ndx ));
+       DEBUG(3, ("push_sec_ctx(%u, %u) : sec_ctx_stack_ndx = %d\n", 
+                 (unsigned int)ctx_p->uid, (unsigned int)ctx_p->gid, sec_ctx_stack_ndx ));
 
        ctx_p->token = dup_nt_token(sec_ctx_stack[sec_ctx_stack_ndx-1].token);
 
@@ -307,14 +307,15 @@ void set_sec_ctx(uid_t uid, gid_t gid, int ngroups, gid_t *groups, NT_USER_TOKEN
        
        /* Set the security context */
 
-       DEBUG(3, ("setting sec ctx (%d, %d) - sec_ctx_stack_ndx = %d\n", uid, gid, sec_ctx_stack_ndx));
+       DEBUG(3, ("setting sec ctx (%u, %u) - sec_ctx_stack_ndx = %d\n", 
+               (unsigned int)uid, (unsigned int)gid, sec_ctx_stack_ndx));
 
        if (ngroups) {
                int i;
 
                DEBUG(3, ("%d user groups: \n", ngroups));
                for (i = 0; i < ngroups; i++) {
-                       DEBUGADD(3, ("%d ", groups[i]));
+                       DEBUGADD(3, ("%u ", (unsigned int)groups[i]));
                }
 
                DEBUG(3, ("\n"));
@@ -413,7 +414,8 @@ BOOL pop_sec_ctx(void)
        current_user.groups = prev_ctx_p->groups;
        current_user.nt_user_token = prev_ctx_p->token;
 
-       DEBUG(3, ("pop_sec_ctx (%d, %d) - sec_ctx_stack_ndx = %d\n", geteuid(), getegid(), sec_ctx_stack_ndx));
+       DEBUG(3, ("pop_sec_ctx (%u, %u) - sec_ctx_stack_ndx = %d\n", 
+               (unsigned int)geteuid(), (unsigned int)getegid(), sec_ctx_stack_ndx));
 
        return True;
 }