The big character set handling changeover!

[samba.git] / source / nsswitch / wbinfo.c

diff --git a/source/nsswitch/wbinfo.c b/source/nsswitch/wbinfo.c
index 1a51a5b6106bf2019e2851ad79f269c8ddb0c3e1..9d3568417f44e7c1c3e89ef6971083e0ff33d0ba 100644 (file)
--- a/source/nsswitch/wbinfo.c
+++ b/source/nsswitch/wbinfo.c
@@ -22,15 +22,13 @@
 */
 
 #include "includes.h"
-#include "winbind_nss_config.h"
 #include "winbindd.h"
 #include "debug.h"
 
-/* Prototypes from common.h - only needed #if TNG */
+/* Prototypes from common.h */
 
-enum nss_status winbindd_request(int req_type, 
-                                struct winbindd_request *request,
-                                struct winbindd_response *response);
+int winbindd_request(int req_type, struct winbindd_request *request,
+                    struct winbindd_response *response);
 
 /* List groups a user is a member of */
 
@@ -53,7 +51,7 @@ static BOOL wbinfo_get_usergroups(char *user)
        }
 
        for (i = 0; i < response.data.num_entries; i++) {
-               printf("%d\n", ((gid_t *)response.extra_data)[i]);
+               printf("%d\n", (int)((gid_t *)response.extra_data)[i]);
        }
 
        return True;
@@ -184,7 +182,7 @@ static BOOL wbinfo_sid_to_uid(char *sid)
 
        /* Display response */
 
-       printf("%d\n", response.data.uid);
+       printf("%d\n", (int)response.data.uid);
 
        return True;
 }
@@ -207,7 +205,7 @@ static BOOL wbinfo_sid_to_gid(char *sid)
 
        /* Display response */
 
-       printf("%d\n", response.data.gid);
+       printf("%d\n", (int)response.data.gid);
 
        return True;
 }
@@ -358,14 +356,12 @@ int main(int argc, char **argv)
        }
 
        TimeInit();
-       charset_initialise();
 
        if (!lp_load(CONFIGFILE, True, False, False)) {
                DEBUG(0, ("error opening config file\n"));
                exit(1);
        }
        
-       codepage_initialise(lp_client_code_page());
        load_interfaces();
 
        /* Parse command line options */