Fixup a bunch of printf-style functions and debugs to use unsigned long when

displaying pid_t, uid_t and gid_t values.  This removes a whole lot of warnings
on some of the 64-bit build farm machines as well as help us out when 64-bit
uid/gid/pid values come along.
(This used to be commit f93528ba007c8800a850678f35f499fb7360fb9a)

diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index 3d2af5d0ba6a1dcff7e33614e6f9dd40a2400958..cd903fa28be1e38af839ed4eaeabba453a45db17 100644 (file)
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -509,7 +509,7 @@ BOOL get_domain_group_from_sid(DOM_SID sid, GROUP_MAP *map)
                return False;
        }
 
-       DEBUG(10, ("get_domain_group_from_sid: SID is mapped to gid:%d\n",map->gid));
+       DEBUG(10, ("get_domain_group_from_sid: SID is mapped to gid:%lu\n",(unsigned long)map->gid));
 
        if ( (grp=getgrgid(map->gid)) == NULL) {
                DEBUG(10, ("get_domain_group_from_sid: gid DOESN'T exist in UNIX security\n"));

diff --git a/source3/lib/username.c b/source3/lib/username.c
index 98b8f33aae30990e5b245febdec17903150b310d..3d37b42c51fe0e1e0a94714ed960512217ba27d5 100644 (file)
--- a/source3/lib/username.c
+++ b/source3/lib/username.c
@@ -386,7 +386,7 @@ static BOOL user_in_winbind_group_list(const char *user, const char *gname, BOOL
        if ( DEBUGLEVEL >= 10 ) {
                DEBUG(10,("user_in_winbind_group_list: using groups -- "));
                for ( i=0; i<num_groups; i++ )
-                       DEBUGADD(10,("%d ", groups[i]));
+                       DEBUGADD(10,("%lu ", (unsigned long)groups[i]));
                DEBUGADD(10,("\n"));    
        }
  

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 1a5757f8173f8dd120fdbb8c676b8c3edfc12b16..f4de83c3464ea3a24496995272dce21af4033ea4 100644 (file)
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -380,8 +380,8 @@ char *share_mode_str(int num, share_mode_entry *e)
        static pstring share_str;
 
        slprintf(share_str, sizeof(share_str)-1, "share_mode_entry[%d]: \
-pid = %u, share_mode = 0x%x, desired_access = 0x%x, port = 0x%x, type= 0x%x, file_id = %lu, dev = 0x%x, inode = %.0f",
-       num, e->pid, e->share_mode, (unsigned int)e->desired_access, e->op_port, e->op_type, e->share_file_id,
+pid = %lu, share_mode = 0x%x, desired_access = 0x%x, port = 0x%x, type= 0x%x, file_id = %lu, dev = 0x%x, inode = %.0f",
+       num, (unsigned long)e->pid, e->share_mode, (unsigned int)e->desired_access, e->op_port, e->op_type, e->share_file_id,
        (unsigned int)e->dev, (double)e->inode );
 
        return share_str;

diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index 2e718dca3df05105cf718b758ffbb02473ce8cd1..d8ff3c392e83b4d13be07e14860e31c4b9828584 100644 (file)
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -117,8 +117,8 @@ static void winbindd_status(void)
        if (DEBUGLEVEL >= 2 && winbindd_num_clients()) {
                DEBUG(2, ("\tclient list:\n"));
                for(tmp = winbindd_client_list(); tmp; tmp = tmp->next) {
-                       DEBUG(2, ("\t\tpid %d, sock %d, rbl %d, wbl %d\n",
-                                 tmp->pid, tmp->sock, tmp->read_buf_len, 
+                       DEBUG(2, ("\t\tpid %lu, sock %d, rbl %d, wbl %d\n",
+                                 (unsigned long)tmp->pid, tmp->sock, tmp->read_buf_len, 
                                  tmp->write_buf_len));
                }
        }
@@ -457,8 +457,8 @@ void winbind_client_read(struct winbindd_cli_state *state)
        /* Read failed, kill client */
        
        if (n == -1 || n == 0) {
-               DEBUG(5,("read failed on sock %d, pid %d: %s\n",
-                        state->sock, state->pid, 
+               DEBUG(5,("read failed on sock %d, pid %lu: %s\n",
+                        state->sock, (unsigned long)state->pid, 
                         (n == -1) ? strerror(errno) : "EOF"));
                
                state->finished = True;
@@ -505,8 +505,8 @@ static void client_write(struct winbindd_cli_state *state)
        
        if (num_written == -1 || num_written == 0) {
                
-               DEBUG(3,("write failed on sock %d, pid %d: %s\n",
-                        state->sock, state->pid, 
+               DEBUG(3,("write failed on sock %d, pid %lu: %s\n",
+                        state->sock, (unsigned long)state->pid, 
                         (num_written == -1) ? strerror(errno) : "EOF"));
                
                state->finished = True;
@@ -712,8 +712,8 @@ static void process_loop(void)
 
                                        if (state->read_buf_len >= sizeof(uint32)
                                            && *(uint32 *) &state->request != sizeof(state->request)) {
-                                               DEBUG(0,("process_loop: Invalid request size from pid %d: %d bytes sent, should be %d\n",
-                                                               state->request.pid, *(uint32 *) &state->request, sizeof(state->request)));
+                                               DEBUG(0,("process_loop: Invalid request size from pid %lu: %d bytes sent, should be %d\n",
+                                                               (unsigned long)state->request.pid, *(uint32 *) &state->request, sizeof(state->request)));
 
                                                remove_client(state);
                                                break;

diff --git a/source3/nsswitch/winbindd_acct.c b/source3/nsswitch/winbindd_acct.c
index a1cd1d5f19a0dfbc7afe327fedd11f520ac7f162..6bd89a36e694f2a08fe7b53a0f5dc64c72da6568 100644 (file)
--- a/source3/nsswitch/winbindd_acct.c
+++ b/source3/nsswitch/winbindd_acct.c
@@ -136,8 +136,8 @@ static WINBINDD_PW* string2passwd( char *string )
        /* last minute sanity checks */
        
        if ( pw.pw_uid==0 || pw.pw_gid==0 ) {
-               DEBUG(0,("string2passwd: Failure! uid==%d, gid==%d\n",
-                       pw.pw_uid, pw.pw_gid));
+               DEBUG(0,("string2passwd: Failure! uid==%lu, gid==%lu\n",
+                       (unsigned long)pw.pw_uid, (unsigned long)pw.pw_gid));
                return NULL;
        }
        
@@ -161,11 +161,11 @@ static char* passwd2string( const WINBINDD_PW *pw )
        DEBUG(10,("passwd2string: converting passwd struct for %s\n", 
                pw->pw_name));
 
-       ret = snprintf( string, sizeof(string), "%s:%s:%d:%d:%s:%s:%s",
+       ret = snprintf( string, sizeof(string), "%s:%s:%lu:%lu:%s:%s:%s",
                pw->pw_name, 
                pw->pw_passwd ? pw->pw_passwd : "x",
-               pw->pw_uid,
-               pw->pw_gid,
+               (unsigned long)pw->pw_uid,
+               (unsigned long)pw->pw_gid,
                pw->pw_gecos,
                pw->pw_dir,
                pw->pw_shell );
@@ -247,7 +247,7 @@ static WINBINDD_GR* string2group( char *string )
        /* last minute sanity checks */
        
        if ( grp.gr_gid == 0 ) {
-               DEBUG(0,("string2group: Failure! gid==%d\n", grp.gr_gid));
+               DEBUG(0,("string2group: Failure! gid==%lu\n", (unsigned long)grp.gr_gid));
                SAFE_FREE( gr_members );
                return NULL;
        }
@@ -303,10 +303,10 @@ static char* group2string( const WINBINDD_GR *grp )
                fstrcpy( gr_mem_str, "" );
        }
 
-       ret = snprintf( string, sizeof(string)-1, "%s:%s:%d:%s",
+       ret = snprintf( string, sizeof(string)-1, "%s:%s:%lu:%s",
                grp->gr_name, 
                grp->gr_passwd ? grp->gr_passwd : "*",
-               grp->gr_gid,
+               (unsigned long)grp->gr_gid,
                gr_mem_str );
                
        SAFE_FREE( gr_mem_str );
@@ -338,7 +338,7 @@ static char* acct_userkey_byuid( uid_t uid )
 {
        static fstring key;
        
-       snprintf( key, sizeof(key), "%s/UID/%d", WBKEY_PASSWD, uid );
+       snprintf( key, sizeof(key), "%s/UID/%lu", WBKEY_PASSWD, (unsigned long)uid );
        
        return key;             
 }
@@ -362,7 +362,7 @@ static char* acct_groupkey_bygid( gid_t gid )
 {
        static fstring key;
        
-       snprintf( key, sizeof(key), "%s/GID/%d", WBKEY_GROUP, gid );
+       snprintf( key, sizeof(key), "%s/GID/%lu", WBKEY_GROUP, (unsigned long)gid );
        
        return key;             
 }
@@ -415,7 +415,7 @@ WINBINDD_PW* wb_getpwuid( const uid_t uid )
        
        data = tdb_fetch_bystring( account_tdb, acct_userkey_byuid(uid) );
        if ( !data.dptr ) {
-               DEBUG(4,("wb_getpwuid: failed to locate uid == %d\n", uid));
+               DEBUG(4,("wb_getpwuid: failed to locate uid == %lu\n", (unsigned long)uid));
                return NULL;
        }
        keystr = acct_userkey_byname( data.dptr );
@@ -431,8 +431,8 @@ WINBINDD_PW* wb_getpwuid( const uid_t uid )
                SAFE_FREE( data.dptr );
        }
 
-       DEBUG(5,("wb_getpwuid: %s user (uid == %d)\n", 
-               (pw ? "Found" : "Did not find"), uid ));
+       DEBUG(5,("wb_getpwuid: %s user (uid == %lu)\n", 
+               (pw ? "Found" : "Did not find"), (unsigned long)uid ));
        
        return pw;
 }
@@ -544,7 +544,8 @@ WINBINDD_GR* wb_getgrgid( gid_t gid )
        
        data = tdb_fetch_bystring( account_tdb, acct_groupkey_bygid(gid) );
        if ( !data.dptr ) {
-               DEBUG(4,("wb_getgrgid: failed to locate gid == %d\n", gid));
+               DEBUG(4,("wb_getgrgid: failed to locate gid == %lu\n", 
+                        (unsigned long)gid));
                return NULL;
        }
        keystr = acct_groupkey_byname( data.dptr );
@@ -560,8 +561,8 @@ WINBINDD_GR* wb_getgrgid( gid_t gid )
                SAFE_FREE( data.dptr );
        }
 
-       DEBUG(5,("wb_getgrgid: %s group (gid == %d)\n", 
-               (grp ? "Found" : "Did not find"), gid ));
+       DEBUG(5,("wb_getgrgid: %s group (gid == %lu)\n", 
+               (grp ? "Found" : "Did not find"), (unsigned long)gid ));
        
        return grp;
 }
@@ -875,8 +876,8 @@ enum winbindd_result winbindd_create_user(struct winbindd_cli_state *state)
        user  = state->request.data.acct_mgt.username;
        group = state->request.data.acct_mgt.groupname;
        
-       DEBUG(3, ("[%5d]: create_user: user=>(%s), group=>(%s)\n", 
-               state->pid, user, group));
+       DEBUG(3, ("[%5lu]: create_user: user=>(%s), group=>(%s)\n", 
+               (unsigned long)state->pid, user, group));
                
        if ( !*group )
                group = lp_template_primary_group();
@@ -965,7 +966,7 @@ enum winbindd_result winbindd_create_group(struct winbindd_cli_state *state)
        state->request.data.acct_mgt.groupname[sizeof(state->request.data.acct_mgt.groupname)-1]='\0';  
        group = state->request.data.acct_mgt.groupname;
        
-       DEBUG(3, ("[%5d]: create_group: (%s)\n", state->pid, group));
+       DEBUG(3, ("[%5lu]: create_group: (%s)\n", (unsigned long)state->pid, group));
        
        /* get a new uid */
        
@@ -1025,7 +1026,7 @@ enum winbindd_result winbindd_add_user_to_group(struct winbindd_cli_state *state
        group = state->request.data.acct_mgt.groupname;
        user = state->request.data.acct_mgt.username;
        
-       DEBUG(3, ("[%5d]:  add_user_to_group: add %s to %s\n", state->pid, 
+       DEBUG(3, ("[%5lu]:  add_user_to_group: add %s to %s\n", (unsigned long)state->pid, 
                user, group));
        
        /* make sure it is a valid user */
@@ -1073,7 +1074,7 @@ enum winbindd_result winbindd_remove_user_from_group(struct winbindd_cli_state *
        group = state->request.data.acct_mgt.groupname;
        user = state->request.data.acct_mgt.username;
        
-       DEBUG(3, ("[%5d]:  remove_user_to_group: delete %s from %s\n", state->pid, 
+       DEBUG(3, ("[%5lu]:  remove_user_to_group: delete %s from %s\n", (unsigned long)state->pid, 
                user, group));
        
        /* don't worry about checking the username since we're removing it anyways */
@@ -1158,7 +1159,7 @@ enum winbindd_result winbindd_delete_user(struct winbindd_cli_state *state)
        state->request.data.acct_mgt.username[sizeof(state->request.data.acct_mgt.username)-1]='\0';    
        user = state->request.data.acct_mgt.username;
        
-       DEBUG(3, ("[%5d]:  delete_user: %s\n", state->pid, user));
+       DEBUG(3, ("[%5lu]:  delete_user: %s\n", (unsigned long)state->pid, user));
        
        /* make sure it is a valid user */
        
@@ -1189,7 +1190,7 @@ enum winbindd_result winbindd_delete_group(struct winbindd_cli_state *state)
        state->request.data.acct_mgt.username[sizeof(state->request.data.acct_mgt.groupname)-1]='\0';   
        group = state->request.data.acct_mgt.groupname;
        
-       DEBUG(3, ("[%5d]:  delete_group: %s\n", state->pid, group));
+       DEBUG(3, ("[%5lu]:  delete_group: %s\n", (unsigned long)state->pid, group));
        
        /* make sure it is a valid group */
        

diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c
index d67d48d506626cc59cbab01e8791ce41da563153..0a9ab182832e20c6114d97c6828b54f902d02592 100644 (file)
--- a/source3/nsswitch/winbindd_group.c
+++ b/source3/nsswitch/winbindd_group.c
@@ -334,8 +334,8 @@ enum winbindd_result winbindd_getgrgid(struct winbindd_cli_state *state)
        int gr_mem_len;
        char *gr_mem;
 
-       DEBUG(3, ("[%5d]: getgrgid %d\n", state->pid, 
-                 state->request.data.gid));
+       DEBUG(3, ("[%5lu]: getgrgid %lu\n", (unsigned long)state->pid, 
+                 (unsigned long)state->request.data.gid));
 
        /* Bug out if the gid isn't in the winbind range */
 
@@ -360,8 +360,8 @@ enum winbindd_result winbindd_getgrgid(struct winbindd_cli_state *state)
 
        /* Get rid from gid */
        if (!NT_STATUS_IS_OK(idmap_gid_to_sid(&group_sid, state->request.data.gid))) {
-               DEBUG(1, ("could not convert gid %d to rid\n", 
-                         state->request.data.gid));
+               DEBUG(1, ("could not convert gid %lu to rid\n", 
+                         (unsigned long)state->request.data.gid));
                return WINBINDD_ERROR;
        }
 
@@ -416,7 +416,7 @@ enum winbindd_result winbindd_setgrent(struct winbindd_cli_state *state)
 {
        struct winbindd_domain *domain;
 
-       DEBUG(3, ("[%5d]: setgrent\n", state->pid));
+       DEBUG(3, ("[%5lu]: setgrent\n", (unsigned long)state->pid));
 
        /* Check user has enabled this */
 
@@ -469,7 +469,7 @@ enum winbindd_result winbindd_setgrent(struct winbindd_cli_state *state)
 
 enum winbindd_result winbindd_endgrent(struct winbindd_cli_state *state)
 {
-       DEBUG(3, ("[%5d]: endgrent\n", state->pid));
+       DEBUG(3, ("[%5lu]: endgrent\n", (unsigned long)state->pid));
 
        free_getent_state(state->getgrent_state);
        state->getgrent_state = NULL;
@@ -605,7 +605,7 @@ enum winbindd_result winbindd_getgrent(struct winbindd_cli_state *state)
        int num_groups, group_list_ndx = 0, i, gr_mem_list_len = 0;
        char *new_extra_data, *gr_mem_list = NULL;
 
-       DEBUG(3, ("[%5d]: getgrent\n", state->pid));
+       DEBUG(3, ("[%5lu]: getgrent\n", (unsigned long)state->pid));
 
        /* Check user has enabled this */
 
@@ -691,7 +691,7 @@ enum winbindd_result winbindd_getgrent(struct winbindd_cli_state *state)
                        goto tryagain;
                }
 
-               DEBUG(10, ("got gid %d for group %x\n", group_gid,
+               DEBUG(10, ("got gid %lu for group %x\n", (unsigned long)group_gid,
                           name_list[ent->sam_entry_index].rid));
                
                /* Fill in group entry */
@@ -825,7 +825,7 @@ enum winbindd_result winbindd_list_groups(struct winbindd_cli_state *state)
        char *ted = NULL;
        unsigned int extra_data_len = 0, i;
 
-       DEBUG(3, ("[%5d]: list groups\n", state->pid));
+       DEBUG(3, ("[%5lu]: list groups\n", (unsigned long)state->pid));
 
        /* Enumerate over trusted domains */
 
@@ -915,7 +915,7 @@ enum winbindd_result winbindd_getgroups(struct winbindd_cli_state *state)
        /* Ensure null termination */
        state->request.data.username[sizeof(state->request.data.username)-1]='\0';
 
-       DEBUG(3, ("[%5d]: getgroups %s\n", state->pid,
+       DEBUG(3, ("[%5lu]: getgroups %s\n", (unsigned long)state->pid,
                  state->request.data.username));
 
        if (!(mem_ctx = talloc_init("winbindd_getgroups(%s)",
@@ -1009,9 +1009,9 @@ enum winbindd_result winbindd_getgroups(struct winbindd_cli_state *state)
                        /* We've jumped through a lot of hoops to get here */
 
                        DEBUG(10, ("winbindd_getgroups: mapped other sid %s to "
-                                  "gid %d\n", sid_string_static(
+                                  "gid %lu\n", sid_string_static(
                                           &info3->other_sids[i].sid),
-                                  gid_list[num_gids]));
+                                  (unsigned long)gid_list[num_gids]));
 
                        num_gids++;
                }

diff --git a/source3/nsswitch/winbindd_misc.c b/source3/nsswitch/winbindd_misc.c
index 8d7cdc4731721194a0e1a179d1940c7ac98fc651..740b760b930f827ea14ad5aea8200aff7e702e92 100644 (file)
--- a/source3/nsswitch/winbindd_misc.c
+++ b/source3/nsswitch/winbindd_misc.c
@@ -35,7 +35,7 @@ enum winbindd_result winbindd_check_machine_acct(struct winbindd_cli_state *stat
         int num_retries = 0;
         struct cli_state *cli;
        uint32 sec_channel_type;
-       DEBUG(3, ("[%5d]: check machine account\n", state->pid));
+       DEBUG(3, ("[%5lu]: check machine account\n", (unsigned long)state->pid));
 
        /* Get trust account password */
 
@@ -95,7 +95,7 @@ enum winbindd_result winbindd_list_trusted_domains(struct winbindd_cli_state
        int total_entries = 0, extra_data_len = 0;
        char *ted, *extra_data = NULL;
 
-       DEBUG(3, ("[%5d]: list trusted domains\n", state->pid));
+       DEBUG(3, ("[%5lu]: list trusted domains\n", (unsigned long)state->pid));
 
        /* We need to refresh the trusted domain list as the domains may
           have changed since we last looked.  There may be a sequence
@@ -149,7 +149,7 @@ enum winbindd_result winbindd_show_sequence(struct winbindd_cli_state *state)
        struct winbindd_domain *domain;
        char *extra_data = NULL;
 
-       DEBUG(3, ("[%5d]: show sequence\n", state->pid));
+       DEBUG(3, ("[%5lu]: show sequence\n", (unsigned long)state->pid));
 
        extra_data = strdup("");
 
@@ -181,7 +181,7 @@ enum winbindd_result winbindd_show_sequence(struct winbindd_cli_state *state)
 enum winbindd_result winbindd_ping(struct winbindd_cli_state
                                                   *state)
 {
-       DEBUG(3, ("[%5d]: ping\n", state->pid));
+       DEBUG(3, ("[%5lu]: ping\n", (unsigned long)state->pid));
 
        return WINBINDD_OK;
 }
@@ -191,7 +191,7 @@ enum winbindd_result winbindd_ping(struct winbindd_cli_state
 enum winbindd_result winbindd_info(struct winbindd_cli_state *state)
 {
 
-       DEBUG(3, ("[%5d]: request misc info\n", state->pid));
+       DEBUG(3, ("[%5lu]: request misc info\n", (unsigned long)state->pid));
 
        state->response.data.info.winbind_separator = *lp_winbind_separator();
        fstrcpy(state->response.data.info.samba_version, VERSION);
@@ -204,7 +204,7 @@ enum winbindd_result winbindd_info(struct winbindd_cli_state *state)
 enum winbindd_result winbindd_interface_version(struct winbindd_cli_state *state)
 {
 
-       DEBUG(3, ("[%5d]: request interface version\n", state->pid));
+       DEBUG(3, ("[%5lu]: request interface version\n", (unsigned long)state->pid));
        
        state->response.data.interface_version = WINBIND_INTERFACE_VERSION;
 
@@ -216,7 +216,7 @@ enum winbindd_result winbindd_interface_version(struct winbindd_cli_state *state
 enum winbindd_result winbindd_domain_name(struct winbindd_cli_state *state)
 {
 
-       DEBUG(3, ("[%5d]: request domain name\n", state->pid));
+       DEBUG(3, ("[%5lu]: request domain name\n", (unsigned long)state->pid));
        
        fstrcpy(state->response.data.domain_name, lp_workgroup());
 
@@ -228,7 +228,7 @@ enum winbindd_result winbindd_domain_name(struct winbindd_cli_state *state)
 enum winbindd_result winbindd_netbios_name(struct winbindd_cli_state *state)
 {
 
-       DEBUG(3, ("[%5d]: request netbios name\n", state->pid));
+       DEBUG(3, ("[%5lu]: request netbios name\n", (unsigned long)state->pid));
        
        fstrcpy(state->response.data.netbios_name, global_myname());
 
@@ -240,7 +240,7 @@ enum winbindd_result winbindd_netbios_name(struct winbindd_cli_state *state)
 enum winbindd_result winbindd_priv_pipe_dir(struct winbindd_cli_state *state)
 {
 
-       DEBUG(3, ("[%5d]: request location of privileged pipe\n", state->pid));
+       DEBUG(3, ("[%5lu]: request location of privileged pipe\n", (unsigned long)state->pid));
        
        state->response.extra_data = strdup(get_winbind_priv_pipe_dir());
        if (!state->response.extra_data)

diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c
index 409a333e34a2519fe1ea1f6cb41d6468c2c6323a..8edd00f806e1e41f9eddb4325e2e03726c26f8bd 100644 (file)
--- a/source3/nsswitch/winbindd_pam.c
+++ b/source3/nsswitch/winbindd_pam.c
@@ -131,7 +131,7 @@ enum winbindd_result winbindd_pam_auth(struct winbindd_cli_state *state)
        /* Ensure null termination */
        state->request.data.auth.pass[sizeof(state->request.data.auth.pass)-1]='\0';
 
-       DEBUG(3, ("[%5d]: pam auth %s\n", state->pid,
+       DEBUG(3, ("[%5lu]: pam auth %s\n", (unsigned long)state->pid,
                  state->request.data.auth.user));
 
        if (!(mem_ctx = talloc_init("winbind pam auth for %s", state->request.data.auth.user))) {
@@ -305,7 +305,7 @@ enum winbindd_result winbindd_pam_auth_crap(struct winbindd_cli_state *state)
                goto done;
        }
 
-       DEBUG(3, ("[%5d]: pam auth crap domain: %s user: %s\n", state->pid,
+       DEBUG(3, ("[%5lu]: pam auth crap domain: %s user: %s\n", (unsigned long)state->pid,
                  domain, user));
           
        if ( !get_trust_pw(domain, trust_passwd, &last_change_time, &sec_channel_type) ) {
@@ -436,7 +436,7 @@ enum winbindd_result winbindd_pam_chauthtok(struct winbindd_cli_state *state)
        fstring domain, user;
        CLI_POLICY_HND *hnd;
 
-       DEBUG(3, ("[%5d]: pam chauthtok %s\n", state->pid,
+       DEBUG(3, ("[%5lu]: pam chauthtok %s\n", (unsigned long)state->pid,
                state->request.data.chauthtok.user));
 
        /* Setup crap */

diff --git a/source3/nsswitch/winbindd_sid.c b/source3/nsswitch/winbindd_sid.c
index 676beae3aaf918f089891b10e1c5f43fec7cb5cd..0c944b2f1636e62ae16d00f3e355aaa922b111c0 100644 (file)
--- a/source3/nsswitch/winbindd_sid.c
+++ b/source3/nsswitch/winbindd_sid.c
@@ -39,7 +39,7 @@ enum winbindd_result winbindd_lookupsid(struct winbindd_cli_state *state)
        /* Ensure null termination */
        state->request.data.sid[sizeof(state->request.data.sid)-1]='\0';
 
-       DEBUG(3, ("[%5d]: lookupsid %s\n", state->pid, 
+       DEBUG(3, ("[%5lu]: lookupsid %s\n", (unsigned long)state->pid, 
                  state->request.data.sid));
 
        /* Lookup sid from PDC using lsa_lookup_sids() */
@@ -90,7 +90,7 @@ enum winbindd_result winbindd_lookupname(struct winbindd_cli_state *state)
        /* Ensure null termination */
        state->request.data.sid[sizeof(state->request.data.name.name)-1]='\0';
 
-       DEBUG(3, ("[%5d]: lookupname %s%s%s\n", state->pid,
+       DEBUG(3, ("[%5lu]: lookupname %s%s%s\n", (unsigned long)state->pid,
                  state->request.data.name.dom_name, 
                  lp_winbind_separator(),
                  state->request.data.name.name));
@@ -127,7 +127,7 @@ enum winbindd_result winbindd_sid_to_uid(struct winbindd_cli_state *state)
        /* Ensure null termination */
        state->request.data.sid[sizeof(state->request.data.sid)-1]='\0';
 
-       DEBUG(3, ("[%5d]: sid to uid %s\n", state->pid,
+       DEBUG(3, ("[%5lu]: sid to uid %s\n", (unsigned long)state->pid,
                  state->request.data.sid));
 
        /* Split sid into domain sid and user rid */
@@ -192,13 +192,13 @@ enum winbindd_result winbindd_uid_to_sid(struct winbindd_cli_state *state)
                return WINBINDD_ERROR;
        }
 
-       DEBUG(3, ("[%5d]: uid to sid %d\n", state->pid, 
+       DEBUG(3, ("[%5lu]: uid to sid %d\n", (unsigned long)state->pid, 
                  state->request.data.uid));
 
        /* Lookup rid for this uid */
        if (!NT_STATUS_IS_OK(idmap_uid_to_sid(&sid, state->request.data.uid))) {
-               DEBUG(1, ("Could not convert uid %d to rid\n",
-                         state->request.data.uid));
+               DEBUG(1, ("Could not convert uid %lu to rid\n",
+                         (unsigned long)state->request.data.uid));
                return WINBINDD_ERROR;
        }
 
@@ -221,13 +221,13 @@ enum winbindd_result winbindd_gid_to_sid(struct winbindd_cli_state *state)
                return WINBINDD_ERROR;
        }
 
-       DEBUG(3, ("[%5d]: gid to sid %d\n", state->pid,
-                 state->request.data.gid));
+       DEBUG(3, ("[%5lu]: gid to sid %lu\n", (unsigned long)state->pid,
+                 (unsigned long)state->request.data.gid));
 
        /* Lookup sid for this uid */
        if (!NT_STATUS_IS_OK(idmap_gid_to_sid(&sid, state->request.data.gid))) {
-               DEBUG(1, ("Could not convert gid %d to sid\n",
-                         state->request.data.gid));
+               DEBUG(1, ("Could not convert gid %lu to sid\n",
+                         (unsigned long)state->request.data.gid));
                return WINBINDD_ERROR;
        }
 

diff --git a/source3/nsswitch/winbindd_user.c b/source3/nsswitch/winbindd_user.c
index c49c41687b9e45cfb47f083eb222ccac1660d131..ecf7f5f0dcb358b322b8d26f2196fc9b8f1322f4 100644 (file)
--- a/source3/nsswitch/winbindd_user.c
+++ b/source3/nsswitch/winbindd_user.c
@@ -108,7 +108,7 @@ enum winbindd_result winbindd_getpwnam(struct winbindd_cli_state *state)
        /* Ensure null termination */
        state->request.data.username[sizeof(state->request.data.username)-1]='\0';
 
-       DEBUG(3, ("[%5d]: getpwnam %s\n", state->pid,
+       DEBUG(3, ("[%5lu]: getpwnam %s\n", (unsigned long)state->pid,
                  state->request.data.username));
        
        /* Parse domain and username */
@@ -209,7 +209,7 @@ enum winbindd_result winbindd_getpwuid(struct winbindd_cli_state *state)
            (state->request.data.uid > server_state.uid_high))
                return WINBINDD_ERROR;
 
-       DEBUG(3, ("[%5d]: getpwuid %d\n", state->pid, 
+       DEBUG(3, ("[%5lu]: getpwuid %d\n", (unsigned long)state->pid, 
                  state->request.data.uid));
 
        /* always try local tdb first */
@@ -222,8 +222,8 @@ enum winbindd_result winbindd_getpwuid(struct winbindd_cli_state *state)
        /* Get rid from uid */
 
        if (!NT_STATUS_IS_OK(idmap_uid_to_sid(&user_sid, state->request.data.uid))) {
-               DEBUG(1, ("could not convert uid %d to SID\n", 
-                         state->request.data.uid));
+               DEBUG(1, ("could not convert uid %lu to SID\n", 
+                         (unsigned long)state->request.data.uid));
                return WINBINDD_ERROR;
        }
        
@@ -246,8 +246,8 @@ enum winbindd_result winbindd_getpwuid(struct winbindd_cli_state *state)
 
        /* Get some user info */
        
-       if (!(mem_ctx = talloc_init("winbind_getpwuid(%d)",
-                                         state->request.data.uid))) {
+       if (!(mem_ctx = talloc_init("winbind_getpwuid(%lu)",
+                                   (unsigned long)state->request.data.uid))) {
 
                DEBUG(1, ("out of memory\n"));
                return WINBINDD_ERROR;
@@ -295,7 +295,7 @@ enum winbindd_result winbindd_setpwent(struct winbindd_cli_state *state)
 {
        struct winbindd_domain *domain;
         
-       DEBUG(3, ("[%5d]: setpwent\n", state->pid));
+       DEBUG(3, ("[%5lu]: setpwent\n", (unsigned long)state->pid));
         
        /* Check user has enabled this */
         
@@ -359,7 +359,7 @@ enum winbindd_result winbindd_setpwent(struct winbindd_cli_state *state)
 
 enum winbindd_result winbindd_endpwent(struct winbindd_cli_state *state)
 {
-       DEBUG(3, ("[%5d]: endpwent\n", state->pid));
+       DEBUG(3, ("[%5lu]: endpwent\n", (unsigned long)state->pid));
 
        free_getent_state(state->getpwent_state);    
        state->getpwent_state = NULL;
@@ -474,7 +474,7 @@ enum winbindd_result winbindd_getpwent(struct winbindd_cli_state *state)
        struct winbindd_pw *user_list;
        int num_users, user_list_ndx = 0, i;
 
-       DEBUG(3, ("[%5d]: getpwent\n", state->pid));
+       DEBUG(3, ("[%5lu]: getpwent\n", (unsigned long)state->pid));
 
        /* Check user has enabled this */
 
@@ -581,7 +581,7 @@ enum winbindd_result winbindd_list_users(struct winbindd_cli_state *state)
        TALLOC_CTX *mem_ctx;
        enum winbindd_result rv = WINBINDD_ERROR;
 
-       DEBUG(3, ("[%5d]: list users\n", state->pid));
+       DEBUG(3, ("[%5lu]: list users\n", (unsigned long)state->pid));
 
        if (!(mem_ctx = talloc_init("winbindd_list_users")))
                return WINBINDD_ERROR;

diff --git a/source3/nsswitch/winbindd_wins.c b/source3/nsswitch/winbindd_wins.c
index 66903e250dae83256905cf0e81ea2ab19311fe61..0485350b9fec4dd3006e24f7ae024b5303ec3acc 100644 (file)
--- a/source3/nsswitch/winbindd_wins.c
+++ b/source3/nsswitch/winbindd_wins.c
@@ -137,7 +137,7 @@ enum winbindd_result winbindd_wins_byip(struct winbindd_cli_state *state)
        /* Ensure null termination */
        state->request.data.winsreq[sizeof(state->request.data.winsreq)-1]='\0';
 
-       DEBUG(3, ("[%5d]: wins_byip %s\n", state->pid,
+       DEBUG(3, ("[%5lu]: wins_byip %s\n", (unsigned long)state->pid,
                state->request.data.winsreq));
 
        *response = '\0';

diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 9a99e07d8289c5ec1ab19866010b9c8053221647..966875785cd10a09e284ac2e2a4cf841aaed1afb 100644 (file)
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -1056,7 +1056,7 @@ DOM_SID *local_uid_to_sid(DOM_SID *psid, uid_t uid)
        unix_pw = sys_getpwuid( uid );
 
        if ( !unix_pw ) {
-               DEBUG(4,("local_uid_to_sid: host has know idea of uid %d\n", uid));
+               DEBUG(4,("local_uid_to_sid: host has know idea of uid %lu\n", (unsigned long)uid));
                return NULL;
        }
        
@@ -1072,8 +1072,8 @@ DOM_SID *local_uid_to_sid(DOM_SID *psid, uid_t uid)
        if ( ret )
                sid_copy( psid, pdb_get_user_sid(sampw) );
        else {
-               DEBUG(4,("local_uid_to_sid: User %s [uid == %d] has no samba account\n",
-                       unix_pw->pw_name, uid));
+               DEBUG(4,("local_uid_to_sid: User %s [uid == %lu] has no samba account\n",
+                       unix_pw->pw_name, (unsigned long)uid));
                        
                if ( !lp_enable_rid_algorithm() ) 
                        return NULL;

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 8f5efbbd648f5c33dbb2e27a2c253a3c777f2fc0..1770ef8b8a82a4accf22970ac1a2d97933a55713 100644 (file)
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -1701,7 +1701,7 @@ static BOOL init_group_from_ldap(struct ldapsam_privates *ldap_state,
                        get_attr_key2string( groupmap_attr_list, LDAP_ATTR_CN), temp)) 
                {
                        DEBUG(0, ("Attributes cn not found either "
-                                 "for gidNumber(%i)\n",map->gid));
+                                 "for gidNumber(%lu)\n",(unsigned long)map->gid));
                        return False;
                }
        }
@@ -1824,10 +1824,10 @@ static NTSTATUS ldapsam_getgrgid(struct pdb_methods *methods, GROUP_MAP *map,
 {
        pstring filter;
 
-       snprintf(filter, sizeof(filter)-1, "(&(objectClass=%s)(%s=%d))",
+       snprintf(filter, sizeof(filter)-1, "(&(objectClass=%s)(%s=%lu))",
                LDAP_OBJ_GROUPMAP,
                get_attr_key2string(groupmap_attr_list, LDAP_ATTR_GIDNUMBER),
-               gid);
+               (unsigned long)gid);
 
        return ldapsam_getgroup(methods, filter, map);
 }
@@ -1864,10 +1864,10 @@ static int ldapsam_search_one_group_by_gid(struct ldapsam_privates *ldap_state,
 {
        pstring filter;
 
-       snprintf(filter, sizeof(filter)-1, "(&(objectClass=%s)(%s=%i))", 
+       snprintf(filter, sizeof(filter)-1, "(&(objectClass=%s)(%s=%lu))", 
                LDAP_OBJ_POSIXGROUP,
                get_attr_key2string(groupmap_attr_list, LDAP_ATTR_GIDNUMBER),
-               gid);
+               (unsigned long)gid);
 
        return ldapsam_search_one_group(ldap_state, filter, result);
 }
@@ -1894,7 +1894,7 @@ static NTSTATUS ldapsam_add_group_mapping_entry(struct pdb_methods *methods,
 
        if (NT_STATUS_IS_OK(ldapsam_getgrgid(methods, &dummy,
                                             map->gid))) {
-               DEBUG(0, ("Group %i already exists in LDAP\n", map->gid));
+               DEBUG(0, ("Group %ld already exists in LDAP\n", (unsigned long)map->gid));
                return NT_STATUS_UNSUCCESSFUL;
        }
 
@@ -1912,8 +1912,8 @@ static NTSTATUS ldapsam_add_group_mapping_entry(struct pdb_methods *methods,
        }
 
        if (count > 1) {
-               DEBUG(2, ("Group %i must exist exactly once in LDAP\n",
-                         map->gid));
+               DEBUG(2, ("Group %lu must exist exactly once in LDAP\n",
+                         (unsigned long)map->gid));
                ldap_msgfree(result);
                return NT_STATUS_UNSUCCESSFUL;
        }
@@ -1947,13 +1947,13 @@ static NTSTATUS ldapsam_add_group_mapping_entry(struct pdb_methods *methods,
                char *ld_error = NULL;
                ldap_get_option(ldap_state->smbldap_state->ldap_struct, LDAP_OPT_ERROR_STRING,
                                &ld_error);
-               DEBUG(0, ("failed to add group %i error: %s (%s)\n", map->gid, 
+               DEBUG(0, ("failed to add group %lu error: %s (%s)\n", (unsigned long)map->gid, 
                          ld_error ? ld_error : "(unknown)", ldap_err2string(rc)));
                SAFE_FREE(ld_error);
                return NT_STATUS_UNSUCCESSFUL;
        }
 
-       DEBUG(2, ("successfully modified group %i in LDAP\n", map->gid));
+       DEBUG(2, ("successfully modified group %lu in LDAP\n", (unsigned long)map->gid));
        return NT_STATUS_OK;
 }
 
@@ -2008,12 +2008,12 @@ static NTSTATUS ldapsam_update_group_mapping_entry(struct pdb_methods *methods,
                char *ld_error = NULL;
                ldap_get_option(ldap_state->smbldap_state->ldap_struct, LDAP_OPT_ERROR_STRING,
                                &ld_error);
-               DEBUG(0, ("failed to modify group %i error: %s (%s)\n", map->gid, 
+               DEBUG(0, ("failed to modify group %lu error: %s (%s)\n", (unsigned long)map->gid, 
                          ld_error ? ld_error : "(unknown)", ldap_err2string(rc)));
                SAFE_FREE(ld_error);
        }
 
-       DEBUG(2, ("successfully modified group %i in LDAP\n", map->gid));
+       DEBUG(2, ("successfully modified group %lu in LDAP\n", (unsigned long)map->gid));
        return NT_STATUS_OK;
 }
 

diff --git a/source3/sam/idmap.c b/source3/sam/idmap.c
index 7a8f270e15a08efac5bb8dec30b5dc97d15f2546..9b23c53d10aadcbb6a5711cc0b9f505f6a219298 100644 (file)
--- a/source3/sam/idmap.c
+++ b/source3/sam/idmap.c
@@ -153,10 +153,11 @@ NTSTATUS idmap_set_mapping(const DOM_SID *sid, unid_t id, int id_type)
        struct idmap_methods *map = remote_map;
        DOM_SID tmp_sid;
 
-       DEBUG(10, ("idmap_set_mapping: Set %s to %s %d\n",
+       DEBUG(10, ("idmap_set_mapping: Set %s to %s %lu\n",
                   sid_string_static(sid),
                   ((id_type & ID_TYPEMASK) == ID_USERID) ? "UID" : "GID",
-                  ((id_type & ID_TYPEMASK) == ID_USERID) ? id.uid : id.gid));
+                  ((id_type & ID_TYPEMASK) == ID_USERID) ? (unsigned long)id.uid : 
+                  (unsigned long)id.gid));
 
        if ( (NT_STATUS_IS_OK(cache_map->
                              get_sid_from_id(&tmp_sid, id,

diff --git a/source3/sam/idmap_ldap.c b/source3/sam/idmap_ldap.c
index 9a1ee039d0c8f876551992483f6c82b3325d07b8..6a9461d292bf1ae9e7b0250cee2f0ccfd6c55d5b 100644 (file)
--- a/source3/sam/idmap_ldap.c
+++ b/source3/sam/idmap_ldap.c
@@ -400,20 +400,23 @@ static NTSTATUS ldap_allocate_id(unid_t *id, int id_type)
        if (id_type & ID_USERID) {
                id->uid = strtoul(id_str, NULL, 10);
                if (id->uid > huid ) {
-                       DEBUG(0,("ldap_allocate_id: Cannot allocate uid above %d!\n", huid));
+                       DEBUG(0,("ldap_allocate_id: Cannot allocate uid above %lu!\n", 
+                                (unsigned long)huid));
                        goto out;
                }
        }
        else { 
                id->gid = strtoul(id_str, NULL, 10);
                if (id->gid > hgid ) {
-                       DEBUG(0,("ldap_allocate_id: Cannot allocate gid above %d!\n", hgid));
+                       DEBUG(0,("ldap_allocate_id: Cannot allocate gid above %lu!\n", 
+                                (unsigned long)hgid));
                        goto out;
                }
        }
        
-       snprintf(new_id_str, sizeof(new_id_str), "%u", 
-                ((id_type & ID_USERID) ? id->uid : id->gid) + 1);
+       snprintf(new_id_str, sizeof(new_id_str), "%lu", 
+                ((id_type & ID_USERID) ? (unsigned long)id->uid : 
+                 (unsigned long)id->gid) + 1);
                 
        smbldap_set_mod( &mods, LDAP_MOD_DELETE, type, id_str );                 
        smbldap_set_mod( &mods, LDAP_MOD_ADD, type, new_id_str );
@@ -458,13 +461,13 @@ static NTSTATUS ldap_get_sid_from_id(DOM_SID *sid, unid_t id, int id_type)
        if ( id_type & ID_USERID ) {
                type = get_attr_key2string( idpool_attr_list, LDAP_ATTR_UIDNUMBER );
                obj_class = LDAP_OBJ_SAMBASAMACCOUNT;
-               snprintf(id_str, sizeof(id_str), "%u", id.uid );        
+               snprintf(id_str, sizeof(id_str), "%lu", (unsigned long)id.uid );        
                pstrcpy( suffix, lp_ldap_suffix());
        }
        else {
                type = get_attr_key2string( idpool_attr_list, LDAP_ATTR_GIDNUMBER );
                obj_class = LDAP_OBJ_GROUPMAP;
-               snprintf(id_str, sizeof(id_str), "%u", id.gid );        
+               snprintf(id_str, sizeof(id_str), "%lu", (unsigned long)id.gid );        
                pstrcpy( suffix, lp_ldap_group_suffix() );
        }
                 
@@ -487,8 +490,10 @@ static NTSTATUS ldap_get_sid_from_id(DOM_SID *sid, unid_t id, int id_type)
                ldap_msgfree(result);
                result = NULL;
                
-               snprintf(filter, sizeof(filter), "(&(objectClass=%s)(%s=%u))",
-                       LDAP_OBJ_IDMAP_ENTRY, type,  ((id_type & ID_USERID) ? id.uid : id.gid));
+               snprintf(filter, sizeof(filter), "(&(objectClass=%s)(%s=%lu))",
+                       LDAP_OBJ_IDMAP_ENTRY, type,  
+                        ((id_type & ID_USERID) ? (unsigned long)id.uid : 
+                         (unsigned long)id.gid));
 
                pstrcpy( suffix, lp_ldap_idmap_suffix() );
 
@@ -502,8 +507,9 @@ static NTSTATUS ldap_get_sid_from_id(DOM_SID *sid, unid_t id, int id_type)
        }
        
        if (count != 1) {
-               DEBUG(0,("ldap_get_sid_from_id: mapping not found for %s: %u\n", 
-                       type, ((id_type & ID_USERID) ? id.uid : id.gid)));
+               DEBUG(0,("ldap_get_sid_from_id: mapping not found for %s: %lu\n", 
+                       type, ((id_type & ID_USERID) ? (unsigned long)id.uid : 
+                              (unsigned long)id.gid)));
                goto out;
        }
        
@@ -702,7 +708,8 @@ static NTSTATUS ldap_set_mapping_internals(const DOM_SID *sid, unid_t id,
        else
                fstrcpy( type, get_attr_key2string( sidmap_attr_list, LDAP_ATTR_GIDNUMBER ) );
 
-       snprintf(id_str, sizeof(id_str), "%u", ((id_type & ID_USERID) ? id.uid : id.gid));      
+       snprintf(id_str, sizeof(id_str), "%lu", ((id_type & ID_USERID) ? (unsigned long)id.uid : 
+                                                (unsigned long)id.gid));       
        
        if (entry) 
                values = ldap_get_values(ldap_state.smbldap_state->ldap_struct, entry, "objectClass");
@@ -754,15 +761,16 @@ static NTSTATUS ldap_set_mapping_internals(const DOM_SID *sid, unid_t id,
                char *ld_error = NULL;
                ldap_get_option(ldap_state.smbldap_state->ldap_struct, LDAP_OPT_ERROR_STRING,
                                &ld_error);
-               DEBUG(0,("ldap_set_mapping_internals: Failed to %s mapping from %s to %u [%s]\n",
+               DEBUG(0,("ldap_set_mapping_internals: Failed to %s mapping from %s to %lu [%s]\n",
                         (ldap_op == LDAP_MOD_ADD) ? "add" : "replace",
-                        sid_string, (unsigned int)((id_type & ID_USERID) ? id.uid : id.gid), type));
+                        sid_string, (unsigned long)((id_type & ID_USERID) ? id.uid : id.gid), type));
                DEBUG(0, ("ldap_set_mapping_internals: Error was: %s (%s)\n", ld_error ? ld_error : "(NULL)", ldap_err2string (rc)));
                return NT_STATUS_UNSUCCESSFUL;
        }
                
-       DEBUG(10,("ldap_set_mapping: Successfully created mapping from %s to %d [%s]\n",
-               sid_string, ((id_type & ID_USERID) ? id.uid : id.gid), type));
+       DEBUG(10,("ldap_set_mapping: Successfully created mapping from %s to %lu [%s]\n",
+               sid_string, ((id_type & ID_USERID) ? (unsigned long)id.uid : 
+                            (unsigned long)id.gid), type));
 
        return NT_STATUS_OK;
 }

diff --git a/source3/sam/idmap_tdb.c b/source3/sam/idmap_tdb.c
index 7f8dce1f1a1d85c0086617f937877f2ab97855f4..635a5f9603caa78a8377a8d9eeca6cfa54b3f732 100644 (file)
--- a/source3/sam/idmap_tdb.c
+++ b/source3/sam/idmap_tdb.c
@@ -116,7 +116,8 @@ static NTSTATUS db_allocate_id(unid_t *id, int id_type)
 
                        /* check it is in the range */
                        if (hwm > idmap_state.uid_high) {
-                               DEBUG(0, ("idmap Fatal Error: UID range full!! (max: %u)\n", idmap_state.uid_high));
+                               DEBUG(0, ("idmap Fatal Error: UID range full!! (max: %lu)\n", 
+                                         (unsigned long)idmap_state.uid_high));
                                return NT_STATUS_UNSUCCESSFUL;
                        }
 
@@ -129,7 +130,8 @@ static NTSTATUS db_allocate_id(unid_t *id, int id_type)
 
                        /* recheck it is in the range */
                        if (hwm > idmap_state.uid_high) {
-                               DEBUG(0, ("idmap Fatal Error: UID range full!! (max: %u)\n", idmap_state.uid_high));
+                               DEBUG(0, ("idmap Fatal Error: UID range full!! (max: %lu)\n", 
+                                         (unsigned long)idmap_state.uid_high));
                                return NT_STATUS_UNSUCCESSFUL;
                        }
                        
@@ -144,7 +146,8 @@ static NTSTATUS db_allocate_id(unid_t *id, int id_type)
 
                        /* check it is in the range */
                        if (hwm > idmap_state.gid_high) {
-                               DEBUG(0, ("idmap Fatal Error: GID range full!! (max: %u)\n", idmap_state.gid_high));
+                               DEBUG(0, ("idmap Fatal Error: GID range full!! (max: %lu)\n", 
+                                         (unsigned long)idmap_state.gid_high));
                                return NT_STATUS_UNSUCCESSFUL;
                        }
 
@@ -158,7 +161,8 @@ static NTSTATUS db_allocate_id(unid_t *id, int id_type)
 
                        /* recheck it is in the range */
                        if (hwm > idmap_state.gid_high) {
-                               DEBUG(0, ("idmap Fatal Error: GID range full!! (max: %u)\n", idmap_state.gid_high));
+                               DEBUG(0, ("idmap Fatal Error: GID range full!! (max: %lu)\n", 
+                                         (unsigned long)idmap_state.gid_high));
                                return NT_STATUS_UNSUCCESSFUL;
                        }
                        
@@ -185,10 +189,10 @@ static NTSTATUS internal_get_sid_from_id(DOM_SID *sid, unid_t id, int id_type)
 
        switch (id_type & ID_TYPEMASK) {
                case ID_USERID:
-                       slprintf(keystr, sizeof(keystr), "UID %d", id.uid);
+                       slprintf(keystr, sizeof(keystr), "UID %lu", (unsigned long)id.uid);
                        break;
                case ID_GROUPID:
-                       slprintf(keystr, sizeof(keystr), "GID %d", id.gid);
+                       slprintf(keystr, sizeof(keystr), "GID %lu", (unsigned long)id.gid);
                        break;
                default:
                        return NT_STATUS_UNSUCCESSFUL;
@@ -374,9 +378,11 @@ static NTSTATUS db_get_id_from_sid(unid_t *id, int *id_type, const DOM_SID *sid)
                        /* Store the UID side */
                        /* Store new id */
                        if (*id_type & ID_USERID) {
-                               slprintf(ugid_str, sizeof(ugid_str), "UID %d", (*id).uid);
+                               slprintf(ugid_str, sizeof(ugid_str), "UID %lu", 
+                                        (unsigned long)((*id).uid));
                        } else {
-                               slprintf(ugid_str, sizeof(ugid_str), "GID %d", (*id).gid);
+                               slprintf(ugid_str, sizeof(ugid_str), "GID %lu", 
+                                        (unsigned long)((*id).gid));
                        }
                        
                        ugid_data.dptr = ugid_str;
@@ -430,9 +436,9 @@ static NTSTATUS db_set_mapping(const DOM_SID *sid, unid_t id, int id_type)
        ksid.dsize = strlen(ksidstr) + 1;
 
        if (id_type & ID_USERID) {
-               slprintf(kidstr, sizeof(kidstr), "UID %d", id.uid);
+               slprintf(kidstr, sizeof(kidstr), "UID %lu", (unsigned long)id.uid);
        } else if (id_type & ID_GROUPID) {
-               slprintf(kidstr, sizeof(kidstr), "GID %d", id.gid);
+               slprintf(kidstr, sizeof(kidstr), "GID %lu", (unsigned long)id.gid);
        } else {
                return NT_STATUS_INVALID_PARAMETER;
        }

diff --git a/source3/sam/idmap_util.c b/source3/sam/idmap_util.c
index f767cc898c7619ec3097187b5bc2afb8097a5b1c..f794ea5173d9e464a44c8196700593d78051978a 100644 (file)
--- a/source3/sam/idmap_util.c
+++ b/source3/sam/idmap_util.c
@@ -146,7 +146,7 @@ NTSTATUS idmap_uid_to_sid(DOM_SID *sid, uid_t uid)
        unid_t id;
        int flags;
 
-       DEBUG(10,("idmap_uid_to_sid: uid = [%d]\n", uid));
+       DEBUG(10,("idmap_uid_to_sid: uid = [%lu]\n", (unsigned long)uid));
 
        flags = ID_USERID;
        id.uid = uid;
@@ -164,7 +164,7 @@ NTSTATUS idmap_gid_to_sid(DOM_SID *sid, gid_t gid)
        unid_t id;
        int flags;
 
-       DEBUG(10,("idmap_gid_to_sid: gid = [%d]\n", gid));
+       DEBUG(10,("idmap_gid_to_sid: gid = [%lu]\n", (unsigned long)gid));
 
        flags = ID_GROUPID;
 #if 0  /* JERRY */
@@ -195,7 +195,7 @@ NTSTATUS idmap_sid_to_uid(const DOM_SID *sid, uid_t *uid, uint32 flags)
        ret = idmap_get_id_from_sid(&id, &flags, sid);
        
        if ( NT_STATUS_IS_OK(ret) ) {
-               DEBUG(10,("idmap_sid_to_uid: uid = [%d]\n", id.uid));
+               DEBUG(10,("idmap_sid_to_uid: uid = [%lu]\n", (unsigned long)id.uid));
                *uid = id.uid;
        } 
 
@@ -225,7 +225,7 @@ NTSTATUS idmap_sid_to_gid(const DOM_SID *sid, gid_t *gid, uint32 flags)
        
        if ( NT_STATUS_IS_OK(ret) ) 
        {
-               DEBUG(10,("idmap_sid_to_gid: gid = [%d]\n", id.gid));
+               DEBUG(10,("idmap_sid_to_gid: gid = [%lu]\n", (unsigned long)id.gid));
                *gid = id.gid;
        }
 

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 6d03eaa29ac6350a7064b510573242444493746a..5f6ed74f09ee4179d5b3b61de1518b5a48092039 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -675,8 +675,8 @@ dev = %x, inode = %.0f\n", old_shares[i].op_type, fname, (unsigned int)dev, (dou
 dev = %x, inode = %.0f. Deleting it to continue...\n", (int)broken_entry.pid, fname, (unsigned int)dev, (double)inode));
                                        
                                        if (process_exists(broken_entry.pid)) {
-                                               DEBUG(0,("open_mode_check: Existent process %d left active oplock.\n",
-                                                        broken_entry.pid ));
+                                               DEBUG(0,("open_mode_check: Existent process %lu left active oplock.\n",
+                                                        (unsigned long)broken_entry.pid ));
                                        }
                                        
                                        if (del_share_entry(dev, inode, &broken_entry, NULL) == -1) {
@@ -874,7 +874,7 @@ files_struct *open_file_shared1(connection_struct *conn,char *fname, SMB_STRUCT_
        if (file_existed && (GET_FILE_OPEN_DISPOSITION(ofun) == FILE_EXISTS_TRUNCATE)) {
                if (!open_match_attributes(conn, fname, psbuf->st_mode, mode, &new_mode)) {
                        DEBUG(5,("open_file_shared: attributes missmatch for file %s (0%o, 0%o)\n",
-                                               fname, psbuf->st_mode, mode ));
+                                               fname, (int)psbuf->st_mode, (int)mode ));
                        file_free(fsp);
                        errno = EACCES;
                        return NULL;

diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c
index f74fcedcf49f3a6065cd10319b25cc847c6b205c..d91dbf50e022d6462a729debda9dd59ae47c1e4a 100644 (file)
--- a/source3/torture/cmd_vfs.c
+++ b/source3/torture/cmd_vfs.c
@@ -528,7 +528,8 @@ static NTSTATUS cmd_stat(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, c
        printf(" Inode: %10u", (unsigned int)st.st_ino);
        printf(" Links: %10u\n", (unsigned int)st.st_nlink);
        printf("  Access: %05o", (st.st_mode) & 007777);
-       printf(" Uid: %5d/%.16s Gid: %5d/%.16s\n", st.st_uid, user, st.st_gid, group);
+       printf(" Uid: %5lu/%.16s Gid: %5lu/%.16s\n", (unsigned long)st.st_uid, user, 
+              (unsigned long)st.st_gid, group);
        printf("  Access: %s", ctime(&(st.st_atime)));
        printf("  Modify: %s", ctime(&(st.st_mtime)));
        printf("  Change: %s", ctime(&(st.st_ctime)));
@@ -590,7 +591,8 @@ static NTSTATUS cmd_fstat(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc,
        printf(" Inode: %10u", (unsigned int)st.st_ino);
        printf(" Links: %10u\n", (unsigned int)st.st_nlink);
        printf("  Access: %05o", (st.st_mode) & 007777);
-       printf(" Uid: %5d/%.16s Gid: %5d/%.16s\n", st.st_uid, user, st.st_gid, group);
+       printf(" Uid: %5lu/%.16s Gid: %5lu/%.16s\n", (unsigned long)st.st_uid, user, 
+              (unsigned long)st.st_gid, group);
        printf("  Access: %s", ctime(&(st.st_atime)));
        printf("  Modify: %s", ctime(&(st.st_mtime)));
        printf("  Change: %s", ctime(&(st.st_ctime)));
@@ -640,7 +642,8 @@ static NTSTATUS cmd_lstat(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc,
        printf(" Inode: %10u", (unsigned int)st.st_ino);
        printf(" Links: %10u\n", (unsigned int)st.st_nlink);
        printf("  Access: %05o", (st.st_mode) & 007777);
-       printf(" Uid: %5d/%.16s Gid: %5d/%.16s\n", st.st_uid, user, st.st_gid, group);
+       printf(" Uid: %5lu/%.16s Gid: %5lu/%.16s\n", (unsigned long)st.st_uid, user, 
+              (unsigned long)st.st_gid, group);
        printf("  Access: %s", ctime(&(st.st_atime)));
        printf("  Modify: %s", ctime(&(st.st_mtime)));
        printf("  Change: %s", ctime(&(st.st_ctime)));

diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c
index 63b9590dd61639605633ff0714623d50b89b347b..86379bf3b6dd1c64fac9903487978d6278a2bf08 100644 (file)
--- a/source3/torture/locktest.c
+++ b/source3/torture/locktest.c
@@ -157,7 +157,7 @@ static struct cli_state *connect_one(char *share, int snum)
        
         zero_ip(&ip);
 
-       slprintf(myname,sizeof(myname), "lock-%u-%u", getpid(), count++);
+       slprintf(myname,sizeof(myname), "lock-%lu-%u", (unsigned long)getpid(), count++);
 
        make_nmb_name(&calling, myname, 0x0);
        make_nmb_name(&called , server, 0x20);

diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c
index 97844b5609ecfbea1ad374ab0862d453079592f4..29b3c7c4b2f156fb75a29f616afb83a9046bb354 100644 (file)
--- a/source3/torture/locktest2.c
+++ b/source3/torture/locktest2.c
@@ -173,7 +173,7 @@ static struct cli_state *connect_one(char *share)
                }
        }
 
-       slprintf(myname,sizeof(myname), "lock-%u-%u", getpid(), count++);
+       slprintf(myname,sizeof(myname), "lock-%lu-%u", (unsigned long)getpid(), count++);
 
        nt_status = cli_full_connection(&c, myname, server_n, NULL, 0, share, "?????", 
                                        username, lp_workgroup(), password, 0,

diff --git a/source3/torture/nsstest.c b/source3/torture/nsstest.c
index 0a08cb6e8f28ab48320147464f74f8da90ed98ef..b5cd59d50bc93555226deb763a088195cf20a825 100644 (file)
--- a/source3/torture/nsstest.c
+++ b/source3/torture/nsstest.c
@@ -296,11 +296,11 @@ static int nss_initgroups(char *user, gid_t group, gid_t **groups, long int *sta
 
 static void print_passwd(struct passwd *pwd)
 {
-       printf("%s:%s:%d:%d:%s:%s:%s\n", 
+       printf("%s:%s:%lu:%lu:%s:%s:%s\n", 
               pwd->pw_name,
               pwd->pw_passwd,
-              pwd->pw_uid,
-              pwd->pw_gid,
+              (unsigned long)pwd->pw_uid,
+              (unsigned long)pwd->pw_gid,
               pwd->pw_gecos,
               pwd->pw_dir,
               pwd->pw_shell);
@@ -309,10 +309,10 @@ static void print_passwd(struct passwd *pwd)
 static void print_group(struct group *grp)
 {
        int i;
-       printf("%s:%s:%d: ", 
+       printf("%s:%s:%lu: ", 
               grp->gr_name,
               grp->gr_passwd,
-              grp->gr_gid);
+              (unsigned long)grp->gr_gid);
        
        if (!grp->gr_mem[0]) {
                printf("\n");
@@ -343,9 +343,9 @@ static void nss_test_initgroups(char *name, gid_t gid)
        }
 
        for (i=0; i<start-1; i++) {
-               printf("%d, ", groups[i]);
+               printf("%lu, ", (unsigned long)groups[i]);
        }
-       printf("%d\n", groups[i]);
+       printf("%lu\n", (unsigned long)groups[i]);
 }
 
 

diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c
index 689d4ff8137ec9c6961b1ebab4b3fff42c4d45db..b7eb8e4c496a51a6ed10dec1a54f712e75950d5c 100644 (file)
--- a/source3/utils/net_idmap.c
+++ b/source3/utils/net_idmap.c
@@ -95,10 +95,14 @@ static int net_idmap_restore(int argc, const char **argv)
                if ( (len > 0) && (line[len-1] == '\n') )
                        line[len-1] = '\0';
 
+               /* Yuck - this is broken for sizeof(gid_t) != sizeof(int) */
+
                if (sscanf(line, "GID %d %s", &id.gid, sid_string) == 2) {
                        type = ID_GROUPID;
                }
 
+               /* Yuck - this is broken for sizeof(uid_t) != sizeof(int) */
+
                if (sscanf(line, "UID %d %s", &id.uid, sid_string) == 2) {
                        type = ID_USERID;
                }

diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c
index e5e9a68b2eceece3e1752c17a7c913e129d95625..dbaec007c039dd4df9d74c050a34e85ece545003 100644 (file)
--- a/source3/utils/net_rpc_samsync.c
+++ b/source3/utils/net_rpc_samsync.c
@@ -487,8 +487,8 @@ fetch_account_info(uint32 rid, SAM_ACCOUNT_INFO *delta)
        } else {
                if (map.gid != passwd->pw_gid) {
                        if (!(grp = getgrgid(map.gid))) {
-                               DEBUG(0, ("Could not find unix group %d for user %s (group SID=%s)\n", 
-                                         map.gid, pdb_get_username(sam_account), sid_string_static(&group_sid)));
+                               DEBUG(0, ("Could not find unix group %lu for user %s (group SID=%s)\n", 
+                                         (unsigned long)map.gid, pdb_get_username(sam_account), sid_string_static(&group_sid)));
                        } else {
                                smb_set_primary_group(grp->gr_name, pdb_get_username(sam_account));
                        }
@@ -585,7 +585,7 @@ fetch_group_mem_info(uint32 rid, SAM_GROUP_MEM_INFO *delta)
        }
 
        if (!(grp = getgrgid(map.gid))) {
-               DEBUG(0, ("Could not find unix group %d\n", map.gid));
+               DEBUG(0, ("Could not find unix group %lu\n", (unsigned long)map.gid));
                return NT_STATUS_NO_SUCH_GROUP;
        }
 

diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index c3e063eff01f5c08b53601ea186bcd159e8e785d..0f1f6edf08626797f385c12799b23f75c3a19445 100644 (file)
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -161,16 +161,17 @@ static int print_sam_info (SAM_ACCOUNT *sam_pwent, BOOL verbosity, BOOL smbpwdst
                pdb_sethexpwd(lm_passwd, pdb_get_lanman_passwd(sam_pwent), pdb_get_acct_ctrl(sam_pwent));
                pdb_sethexpwd(nt_passwd, pdb_get_nt_passwd(sam_pwent), pdb_get_acct_ctrl(sam_pwent));
                        
-               printf("%s:%d:%s:%s:%s:LCT-%08X:\n",
+               printf("%s:%lu:%s:%s:%s:LCT-%08X:\n",
                       pdb_get_username(sam_pwent),
-                      uid,
+                      (unsigned long)uid,
                       lm_passwd,
                       nt_passwd,
                       pdb_encode_acct_ctrl(pdb_get_acct_ctrl(sam_pwent),NEW_PW_FORMAT_SPACE_PADDED_LEN),
                       (uint32)pdb_get_pass_last_set_time(sam_pwent));
        } else {
                uid = nametouid(pdb_get_username(sam_pwent));
-               printf ("%s:%d:%s\n", pdb_get_username(sam_pwent), uid, pdb_get_fullname(sam_pwent));
+               printf ("%s:%lu:%s\n", pdb_get_username(sam_pwent), (unsigned long)uid, 
+                       pdb_get_fullname(sam_pwent));
        }
 
        return 0;       

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 44461232b816a0dfce1b20f0bc35d9b7f8827fe0..c579e8f1123e1eca13c2b4519b72290574090eb6 100644 (file)
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -93,7 +93,7 @@ static char *mapPid2Machine (pid_t pid)
        }
 
        /* PID not in list or machine name NULL? return pid as string */
-       snprintf (pidbuf, sizeof (pidbuf) - 1, "%d", pid);
+       snprintf (pidbuf, sizeof (pidbuf) - 1, "%lu", (unsigned long)pid);
        return pidbuf;
 }