r25554: Convert last instances of BOOL, True and False to the standard types.
[amitay/samba.git] / source4 / nsswitch / wbinfo.c
index 7e674fde1f72b91d6eb50a011164da09482f1cba..4538911f97ba37d4a9ee65ef3c1155158e9051ed 100644 (file)
 
 #include "includes.h"
 #include "pstring.h"
-#include "winbind_nss_config.h"
-#include "winbindd_nss.h"
 #include "winbind_client.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "libcli/auth/libcli_auth.h"
 #include "libcli/security/security.h"
 #include "lib/cmdline/popt_common.h"
 #include "dynconfig.h"
+#include "param/param.h"
 
 extern int winbindd_fd;
 
-static char winbind_separator_int(BOOL strict)
+static char winbind_separator_int(bool strict)
 {
        struct winbindd_response response;
-       static BOOL got_sep;
+       static bool got_sep;
        static char sep;
 
        if (got_sep)
@@ -46,18 +45,18 @@ static char winbind_separator_int(BOOL strict)
 
        /* Send off request */
 
-       if (winbindd_request(WINBINDD_INFO, NULL, &response) !=
+       if (winbindd_request_response(WINBINDD_INFO, NULL, &response) !=
            NSS_STATUS_SUCCESS) {
                d_fprintf(stderr, "could not obtain winbind separator!\n");
                if (strict) {
                        return 0;
                }
                /* HACK: (this module should not call lp_ funtions) */
-               return *lp_winbind_separator();
+               return *lp_winbind_separator(global_loadparm);
        }
 
        sep = response.data.info.winbind_separator;
-       got_sep = True;
+       got_sep = true;
 
        if (!sep) {
                d_fprintf(stderr, "winbind separator was NULL!\n");
@@ -65,7 +64,7 @@ static char winbind_separator_int(BOOL strict)
                        return 0;
                }
                /* HACK: (this module should not call lp_ funtions) */
-               sep = *lp_winbind_separator();
+               sep = *lp_winbind_separator(global_loadparm);
        }
        
        return sep;
@@ -73,7 +72,7 @@ static char winbind_separator_int(BOOL strict)
 
 static char winbind_separator(void)
 {
-       return winbind_separator_int(False);
+       return winbind_separator_int(false);
 }
 
 static const char *get_winbind_domain(void)
@@ -85,12 +84,12 @@ static const char *get_winbind_domain(void)
 
        /* Send off request */
 
-       if (winbindd_request(WINBINDD_DOMAIN_NAME, NULL, &response) !=
+       if (winbindd_request_response(WINBINDD_DOMAIN_NAME, NULL, &response) !=
            NSS_STATUS_SUCCESS) {
                d_fprintf(stderr, "could not obtain winbind domain name!\n");
                
                /* HACK: (this module should not call lp_ funtions) */
-               return lp_workgroup();
+               return lp_workgroup(global_loadparm);
        }
 
        fstrcpy(winbind_domain, response.data.domain_name);
@@ -102,7 +101,7 @@ static const char *get_winbind_domain(void)
 /* Copy of parse_domain_user from winbindd_util.c.  Parse a string of the
    form DOMAIN/user into a domain and a user */
 
-static BOOL parse_wbinfo_domain_user(const char *domuser, fstring domain, 
+static bool parse_wbinfo_domain_user(const char *domuser, fstring domain, 
                                     fstring user)
 {
 
@@ -111,7 +110,7 @@ static BOOL parse_wbinfo_domain_user(const char *domuser, fstring domain,
        if (!p) {
                fstrcpy(user, domuser);
                fstrcpy(domain, get_winbind_domain());
-               return True;
+               return true;
        }
         
        fstrcpy(user, p+1);
@@ -119,12 +118,12 @@ static BOOL parse_wbinfo_domain_user(const char *domuser, fstring domain,
        domain[PTR_DIFF(p, domuser)] = 0;
        strupper_m(domain);
 
-       return True;
+       return true;
 }
 
 /* pull pwent info for a given user */
 
-static BOOL wbinfo_get_userinfo(char *user)
+static bool wbinfo_get_userinfo(char *user)
 {
        struct winbindd_request request;
        struct winbindd_response response;
@@ -137,10 +136,10 @@ static BOOL wbinfo_get_userinfo(char *user)
        
        fstrcpy(request.data.username, user);
 
-       result = winbindd_request(WINBINDD_GETPWNAM, &request, &response);
+       result = winbindd_request_response(WINBINDD_GETPWNAM, &request, &response);
        
        if (result != NSS_STATUS_SUCCESS)
-               return False;
+               return false;
        
        d_printf( "%s:%s:%d:%d:%s:%s:%s\n",
                          response.data.pw.pw_name,
@@ -151,11 +150,11 @@ static BOOL wbinfo_get_userinfo(char *user)
                          response.data.pw.pw_dir,
                          response.data.pw.pw_shell );
        
-       return True;
+       return true;
 }
 
 /* pull pwent info for a given uid */
-static BOOL wbinfo_get_uidinfo(int uid)
+static bool wbinfo_get_uidinfo(int uid)
 {
        struct winbindd_request request;
        struct winbindd_response response;
@@ -166,10 +165,10 @@ static BOOL wbinfo_get_uidinfo(int uid)
 
        request.data.uid = uid;
 
-       result = winbindd_request(WINBINDD_GETPWUID, &request, &response);
+       result = winbindd_request_response(WINBINDD_GETPWUID, &request, &response);
 
        if (result != NSS_STATUS_SUCCESS)
-               return False;
+               return false;
 
        d_printf( "%s:%s:%d:%d:%s:%s:%s\n",
                response.data.pw.pw_name,
@@ -180,11 +179,11 @@ static BOOL wbinfo_get_uidinfo(int uid)
                response.data.pw.pw_dir,
                response.data.pw.pw_shell );
 
-       return True;
+       return true;
 }
 
 /* pull grent for a given group */
-static BOOL wbinfo_get_groupinfo(char *group)
+static bool wbinfo_get_groupinfo(char *group)
 {
        struct winbindd_request request;
        struct winbindd_response response;
@@ -197,23 +196,23 @@ static BOOL wbinfo_get_groupinfo(char *group)
 
        fstrcpy(request.data.groupname, group);
 
-       result = winbindd_request(WINBINDD_GETGRNAM, &request,
+       result = winbindd_request_response(WINBINDD_GETGRNAM, &request,
                                  &response);
 
        if ( result != NSS_STATUS_SUCCESS)
-               return False;
+               return false;
 
        d_printf( "%s:%s:%d\n",
                  response.data.gr.gr_name,
                  response.data.gr.gr_passwd,
                  response.data.gr.gr_gid );
        
-       return True;
+       return true;
 }
 
 /* List groups a user is a member of */
 
-static BOOL wbinfo_get_usergroups(char *user)
+static bool wbinfo_get_usergroups(char *user)
 {
        struct winbindd_request request;
        struct winbindd_response response;
@@ -227,22 +226,22 @@ static BOOL wbinfo_get_usergroups(char *user)
 
        fstrcpy(request.data.username, user);
 
-       result = winbindd_request(WINBINDD_GETGROUPS, &request, &response);
+       result = winbindd_request_response(WINBINDD_GETGROUPS, &request, &response);
 
        if (result != NSS_STATUS_SUCCESS)
-               return False;
+               return false;
 
        for (i = 0; i < response.data.num_entries; i++)
                d_printf("%d\n", (int)((gid_t *)response.extra_data.data)[i]);
 
        SAFE_FREE(response.extra_data.data);
 
-       return True;
+       return true;
 }
 
 
 /* List group SIDs a user SID is a member of */
-static BOOL wbinfo_get_usersids(char *user_sid)
+static bool wbinfo_get_usersids(char *user_sid)
 {
        struct winbindd_request request;
        struct winbindd_response response;
@@ -256,10 +255,10 @@ static BOOL wbinfo_get_usersids(char *user_sid)
        /* Send request */
        fstrcpy(request.data.sid, user_sid);
 
-       result = winbindd_request(WINBINDD_GETUSERSIDS, &request, &response);
+       result = winbindd_request_response(WINBINDD_GETUSERSIDS, &request, &response);
 
        if (result != NSS_STATUS_SUCCESS)
-               return False;
+               return false;
 
        s = (const char *)response.extra_data.data;
        for (i = 0; i < response.data.num_entries; i++) {
@@ -269,10 +268,10 @@ static BOOL wbinfo_get_usersids(char *user_sid)
 
        SAFE_FREE(response.extra_data.data);
 
-       return True;
+       return true;
 }
 
-static BOOL wbinfo_get_userdomgroups(const char *user_sid)
+static bool wbinfo_get_userdomgroups(const char *user_sid)
 {
        struct winbindd_request request;
        struct winbindd_response response;
@@ -284,23 +283,23 @@ static BOOL wbinfo_get_userdomgroups(const char *user_sid)
        /* Send request */
        fstrcpy(request.data.sid, user_sid);
 
-       result = winbindd_request(WINBINDD_GETUSERDOMGROUPS, &request,
+       result = winbindd_request_response(WINBINDD_GETUSERDOMGROUPS, &request,
                                  &response);
 
        if (result != NSS_STATUS_SUCCESS)
-               return False;
+               return false;
 
        if (response.data.num_entries != 0)
                printf("%s", (char *)response.extra_data.data);
        
        SAFE_FREE(response.extra_data.data);
 
-       return True;
+       return true;
 }
 
 /* Convert NetBIOS name to IP */
 
-static BOOL wbinfo_wins_byname(char *name)
+static bool wbinfo_wins_byname(char *name)
 {
        struct winbindd_request request;
        struct winbindd_response response;
@@ -312,21 +311,21 @@ static BOOL wbinfo_wins_byname(char *name)
 
        fstrcpy(request.data.winsreq, name);
 
-       if (winbindd_request(WINBINDD_WINS_BYNAME, &request, &response) !=
+       if (winbindd_request_response(WINBINDD_WINS_BYNAME, &request, &response) !=
            NSS_STATUS_SUCCESS) {
-               return False;
+               return false;
        }
 
        /* Display response */
 
        d_printf("%s\n", response.data.winsresp);
 
-       return True;
+       return true;
 }
 
 /* Convert IP to NetBIOS name */
 
-static BOOL wbinfo_wins_byip(char *ip)
+static bool wbinfo_wins_byip(char *ip)
 {
        struct winbindd_request request;
        struct winbindd_response response;
@@ -338,21 +337,21 @@ static BOOL wbinfo_wins_byip(char *ip)
 
        fstrcpy(request.data.winsreq, ip);
 
-       if (winbindd_request(WINBINDD_WINS_BYIP, &request, &response) !=
+       if (winbindd_request_response(WINBINDD_WINS_BYIP, &request, &response) !=
            NSS_STATUS_SUCCESS) {
-               return False;
+               return false;
        }
 
        /* Display response */
 
        d_printf("%s\n", response.data.winsresp);
 
-       return True;
+       return true;
 }
 
 /* List trusted domains */
 
-static BOOL wbinfo_list_domains(BOOL list_all_domains)
+static bool wbinfo_list_domains(bool list_all_domains)
 {
        struct winbindd_request request;
        struct winbindd_response response;
@@ -364,9 +363,9 @@ static BOOL wbinfo_list_domains(BOOL list_all_domains)
 
        request.data.list_all_domains = list_all_domains;
 
-       if (winbindd_request(WINBINDD_LIST_TRUSTDOM, &request, &response) !=
+       if (winbindd_request_response(WINBINDD_LIST_TRUSTDOM, &request, &response) !=
            NSS_STATUS_SUCCESS)
-               return False;
+               return false;
 
        /* Display response */
 
@@ -380,7 +379,7 @@ static BOOL wbinfo_list_domains(BOOL list_all_domains)
                        if (p == 0) {
                                d_fprintf(stderr, "Got invalid response: %s\n",
                                         extra_data);
-                               return False;
+                               return false;
                        }
                        *p = 0;
                        d_printf("%s\n", name);
@@ -389,20 +388,20 @@ static BOOL wbinfo_list_domains(BOOL list_all_domains)
                SAFE_FREE(response.extra_data.data);
        }
 
-       return True;
+       return true;
 }
 
 /* List own domain */
 
-static BOOL wbinfo_list_own_domain(void)
+static bool wbinfo_list_own_domain(void)
 {
        d_printf("%s\n", get_winbind_domain());
 
-       return True;
+       return true;
 }
 
 /* show sequence numbers */
-static BOOL wbinfo_show_sequence(const char *domain)
+static bool wbinfo_show_sequence(const char *domain)
 {
        struct winbindd_request  request;
        struct winbindd_response response;
@@ -415,9 +414,9 @@ static BOOL wbinfo_show_sequence(const char *domain)
 
        /* Send request */
 
-       if (winbindd_request(WINBINDD_SHOW_SEQUENCE, &request, &response) !=
+       if (winbindd_request_response(WINBINDD_SHOW_SEQUENCE, &request, &response) !=
            NSS_STATUS_SUCCESS)
-               return False;
+               return false;
 
        /* Display response */
 
@@ -427,12 +426,12 @@ static BOOL wbinfo_show_sequence(const char *domain)
                SAFE_FREE(response.extra_data.data);
        }
 
-       return True;
+       return true;
 }
 
 /* Show domain info */
 
-static BOOL wbinfo_domain_info(const char *domain_name)
+static bool wbinfo_domain_info(const char *domain_name)
 {
        struct winbindd_request request;
        struct winbindd_response response;
@@ -447,9 +446,9 @@ static BOOL wbinfo_domain_info(const char *domain_name)
 
        /* Send request */
 
-       if (winbindd_request(WINBINDD_DOMAIN_INFO, &request, &response) !=
+       if (winbindd_request_response(WINBINDD_DOMAIN_INFO, &request, &response) !=
            NSS_STATUS_SUCCESS)
-               return False;
+               return false;
 
        /* Display response */
 
@@ -466,13 +465,11 @@ static BOOL wbinfo_domain_info(const char *domain_name)
        d_printf("Primary           : %s\n",
                 response.data.domain_info.primary ? "Yes" : "No");
 
-       d_printf("Sequence          : %d\n", response.data.domain_info.sequence_number);
-
-       return True;
+       return true;
 }
 
 /* Get a foreign DC's name */
-static BOOL wbinfo_getdcname(const char *domain_name)
+static bool wbinfo_getdcname(const char *domain_name)
 {
        struct winbindd_request request;
        struct winbindd_response response;
@@ -484,29 +481,29 @@ static BOOL wbinfo_getdcname(const char *domain_name)
 
        /* Send request */
 
-       if (winbindd_request(WINBINDD_GETDCNAME, &request, &response) !=
+       if (winbindd_request_response(WINBINDD_GETDCNAME, &request, &response) !=
            NSS_STATUS_SUCCESS) {
                d_fprintf(stderr, "Could not get dc name for %s\n", domain_name);
-               return False;
+               return false;
        }
 
        /* Display response */
 
        d_printf("%s\n", response.data.dc_name);
 
-       return True;
+       return true;
 }
 
 /* Check trust account password */
 
-static BOOL wbinfo_check_secret(void)
+static bool wbinfo_check_secret(void)
 {
         struct winbindd_response response;
         NSS_STATUS result;
 
         ZERO_STRUCT(response);
 
-        result = winbindd_request(WINBINDD_CHECK_MACHACC, NULL, &response);
+        result = winbindd_request_response(WINBINDD_CHECK_MACHACC, NULL, &response);
                
        d_printf("checking the trust secret via RPC calls %s\n", 
                 (result == NSS_STATUS_SUCCESS) ? "succeeded" : "failed");
@@ -521,7 +518,7 @@ static BOOL wbinfo_check_secret(void)
 
 /* Convert uid to sid */
 
-static BOOL wbinfo_uid_to_sid(uid_t uid)
+static bool wbinfo_uid_to_sid(uid_t uid)
 {
        struct winbindd_request request;
        struct winbindd_response response;
@@ -533,20 +530,20 @@ static BOOL wbinfo_uid_to_sid(uid_t uid)
 
        request.data.uid = uid;
 
-       if (winbindd_request(WINBINDD_UID_TO_SID, &request, &response) !=
+       if (winbindd_request_response(WINBINDD_UID_TO_SID, &request, &response) !=
            NSS_STATUS_SUCCESS)
-               return False;
+               return false;
 
        /* Display response */
 
        d_printf("%s\n", response.data.sid.sid);
 
-       return True;
+       return true;
 }
 
 /* Convert gid to sid */
 
-static BOOL wbinfo_gid_to_sid(gid_t gid)
+static bool wbinfo_gid_to_sid(gid_t gid)
 {
        struct winbindd_request request;
        struct winbindd_response response;
@@ -558,20 +555,20 @@ static BOOL wbinfo_gid_to_sid(gid_t gid)
 
        request.data.gid = gid;
 
-       if (winbindd_request(WINBINDD_GID_TO_SID, &request, &response) !=
+       if (winbindd_request_response(WINBINDD_GID_TO_SID, &request, &response) !=
            NSS_STATUS_SUCCESS)
-               return False;
+               return false;
 
        /* Display response */
 
        d_printf("%s\n", response.data.sid.sid);
 
-       return True;
+       return true;
 }
 
 /* Convert sid to uid */
 
-static BOOL wbinfo_sid_to_uid(char *sid)
+static bool wbinfo_sid_to_uid(char *sid)
 {
        struct winbindd_request request;
        struct winbindd_response response;
@@ -583,18 +580,18 @@ static BOOL wbinfo_sid_to_uid(char *sid)
 
        fstrcpy(request.data.sid, sid);
 
-       if (winbindd_request(WINBINDD_SID_TO_UID, &request, &response) !=
+       if (winbindd_request_response(WINBINDD_SID_TO_UID, &request, &response) !=
            NSS_STATUS_SUCCESS)
-               return False;
+               return false;
 
        /* Display response */
 
        d_printf("%d\n", (int)response.data.uid);
 
-       return True;
+       return true;
 }
 
-static BOOL wbinfo_sid_to_gid(char *sid)
+static bool wbinfo_sid_to_gid(char *sid)
 {
        struct winbindd_request request;
        struct winbindd_response response;
@@ -606,20 +603,20 @@ static BOOL wbinfo_sid_to_gid(char *sid)
 
        fstrcpy(request.data.sid, sid);
 
-       if (winbindd_request(WINBINDD_SID_TO_GID, &request, &response) !=
+       if (winbindd_request_response(WINBINDD_SID_TO_GID, &request, &response) !=
            NSS_STATUS_SUCCESS)
-               return False;
+               return false;
 
        /* Display response */
 
        d_printf("%d\n", (int)response.data.gid);
 
-       return True;
+       return true;
 }
 
 /* Convert sid to string */
 
-static BOOL wbinfo_lookupsid(char *sid)
+static bool wbinfo_lookupsid(char *sid)
 {
        struct winbindd_request request;
        struct winbindd_response response;
@@ -631,9 +628,9 @@ static BOOL wbinfo_lookupsid(char *sid)
 
        fstrcpy(request.data.sid, sid);
 
-       if (winbindd_request(WINBINDD_LOOKUPSID, &request, &response) !=
+       if (winbindd_request_response(WINBINDD_LOOKUPSID, &request, &response) !=
            NSS_STATUS_SUCCESS)
-               return False;
+               return false;
 
        /* Display response */
 
@@ -641,7 +638,7 @@ static BOOL wbinfo_lookupsid(char *sid)
                 winbind_separator(), response.data.name.name, 
                 response.data.name.type);
 
-       return True;
+       return true;
 }
 
 static const char *sid_type_lookup(enum lsa_SidType r)
@@ -662,7 +659,7 @@ static const char *sid_type_lookup(enum lsa_SidType r)
 
 /* Convert string to sid */
 
-static BOOL wbinfo_lookupname(char *name)
+static bool wbinfo_lookupname(char *name)
 {
        struct winbindd_request request;
        struct winbindd_response response;
@@ -675,20 +672,20 @@ static BOOL wbinfo_lookupname(char *name)
        parse_wbinfo_domain_user(name, request.data.name.dom_name, 
                                 request.data.name.name);
 
-       if (winbindd_request(WINBINDD_LOOKUPNAME, &request, &response) !=
+       if (winbindd_request_response(WINBINDD_LOOKUPNAME, &request, &response) !=
            NSS_STATUS_SUCCESS)
-               return False;
+               return false;
 
        /* Display response */
 
        d_printf("%s %s (%d)\n", response.data.sid.sid, sid_type_lookup(response.data.sid.type), response.data.sid.type);
 
-       return True;
+       return true;
 }
 
 /* Authenticate a user with a plaintext password */
 
-static BOOL wbinfo_auth_krb5(char *username, const char *cctype, uint32 flags)
+static bool wbinfo_auth_krb5(char *username, const char *cctype, uint32_t flags)
 {
        struct winbindd_request request;
        struct winbindd_response response;
@@ -716,7 +713,7 @@ static BOOL wbinfo_auth_krb5(char *username, const char *cctype, uint32 flags)
 
        request.data.auth.uid = geteuid();
 
-       result = winbindd_request(WINBINDD_PAM_AUTH, &request, &response);
+       result = winbindd_request_response(WINBINDD_PAM_AUTH, &request, &response);
 
        /* Display response */
 
@@ -749,7 +746,7 @@ static BOOL wbinfo_auth_krb5(char *username, const char *cctype, uint32 flags)
 
 /* Authenticate a user with a plaintext password */
 
-static BOOL wbinfo_auth(char *username)
+static bool wbinfo_auth(char *username)
 {
        struct winbindd_request request;
        struct winbindd_response response;
@@ -771,7 +768,7 @@ static BOOL wbinfo_auth(char *username)
         } else
                 fstrcpy(request.data.auth.user, username);
 
-       result = winbindd_request(WINBINDD_PAM_AUTH, &request, &response);
+       result = winbindd_request_response(WINBINDD_PAM_AUTH, &request, &response);
 
        /* Display response */
 
@@ -789,7 +786,7 @@ static BOOL wbinfo_auth(char *username)
 
 /* Authenticate a user with a challenge/response */
 
-static BOOL wbinfo_auth_crap(char *username)
+static bool wbinfo_auth_crap(char *username)
 {
        struct winbindd_request request;
        struct winbindd_response response;
@@ -822,7 +819,7 @@ static BOOL wbinfo_auth_crap(char *username)
 
        generate_random_buffer(request.data.auth_crap.chal, 8);
         
-       if (lp_client_ntlmv2_auth()) {
+       if (lp_client_ntlmv2_auth(global_loadparm)) {
                DATA_BLOB server_chal;
                DATA_BLOB names_blob;   
 
@@ -833,20 +830,20 @@ static BOOL wbinfo_auth_crap(char *username)
                mem_ctx = talloc_new(NULL);
                if (mem_ctx == NULL) {
                        d_printf("talloc_new failed\n");
-                       return False;
+                       return false;
                }
 
                server_chal = data_blob(request.data.auth_crap.chal, 8); 
                
                /* Pretend this is a login to 'us', for blob purposes */
-               names_blob = NTLMv2_generate_names_blob(mem_ctx, lp_netbios_name(), lp_workgroup());
+               names_blob = NTLMv2_generate_names_blob(mem_ctx, lp_netbios_name(global_loadparm), lp_workgroup(global_loadparm));
                
                if (!SMBNTLMv2encrypt(mem_ctx, name_user, name_domain, pass, &server_chal, 
                                      &names_blob,
                                      &lm_response, &nt_response, NULL, NULL)) {
                        data_blob_free(&names_blob);
                        data_blob_free(&server_chal);
-                       return False;
+                       return false;
                }
                data_blob_free(&names_blob);
                data_blob_free(&server_chal);
@@ -865,7 +862,7 @@ static BOOL wbinfo_auth_crap(char *username)
                data_blob_free(&lm_response);
 
        } else {
-               if (lp_client_lanman_auth() 
+               if (lp_client_lanman_auth(global_loadparm
                    && SMBencrypt(pass, request.data.auth_crap.chal, 
                               (unsigned char *)request.data.auth_crap.lm_resp)) {
                        request.data.auth_crap.lm_resp_len = 24;
@@ -878,7 +875,7 @@ static BOOL wbinfo_auth_crap(char *username)
                request.data.auth_crap.nt_resp_len = 24;
        }
 
-       result = winbindd_request(WINBINDD_PAM_AUTH_CRAP, &request, &response);
+       result = winbindd_request_response(WINBINDD_PAM_AUTH_CRAP, &request, &response);
 
        /* Display response */
 
@@ -896,7 +893,7 @@ static BOOL wbinfo_auth_crap(char *username)
 
 /* Print domain users */
 
-static BOOL print_domain_users(const char *domain)
+static bool print_domain_users(const char *domain)
 {
        struct winbindd_request request;
        struct winbindd_response response;
@@ -916,14 +913,14 @@ static BOOL print_domain_users(const char *domain)
                        fstrcpy( request.domain_name, domain );
        }
 
-       if (winbindd_request(WINBINDD_LIST_USERS, &request, &response) !=
+       if (winbindd_request_response(WINBINDD_LIST_USERS, &request, &response) !=
            NSS_STATUS_SUCCESS)
-               return False;
+               return false;
 
        /* Look through extra data */
 
        if (!response.extra_data.data)
-               return False;
+               return false;
 
        extra_data = (const char *)response.extra_data.data;
 
@@ -932,12 +929,12 @@ static BOOL print_domain_users(const char *domain)
        
        SAFE_FREE(response.extra_data.data);
 
-       return True;
+       return true;
 }
 
 /* Print domain groups */
 
-static BOOL print_domain_groups(const char *domain)
+static bool print_domain_groups(const char *domain)
 {
        struct winbindd_request  request;
        struct winbindd_response response;
@@ -954,14 +951,14 @@ static BOOL print_domain_groups(const char *domain)
                        fstrcpy( request.domain_name, domain );
        }
 
-       if (winbindd_request(WINBINDD_LIST_GROUPS, &request, &response) !=
+       if (winbindd_request_response(WINBINDD_LIST_GROUPS, &request, &response) !=
            NSS_STATUS_SUCCESS)
-               return False;
+               return false;
 
        /* Look through extra data */
 
        if (!response.extra_data.data)
-               return False;
+               return false;
 
        extra_data = (const char *)response.extra_data.data;
 
@@ -970,14 +967,14 @@ static BOOL print_domain_groups(const char *domain)
 
        SAFE_FREE(response.extra_data.data);
        
-       return True;
+       return true;
 }
 
-static BOOL wbinfo_ping(void)
+static bool wbinfo_ping(void)
 {
         NSS_STATUS result;
 
-       result = winbindd_request(WINBINDD_PING, NULL, NULL);
+       result = winbindd_request_response(WINBINDD_PING, NULL, NULL);
 
        /* Display response */
 
@@ -1153,7 +1150,7 @@ int main(int argc, char **argv, char **envp)
                        }
                        break;
                case 'm':
-                       if (!wbinfo_list_domains(False)) {
+                       if (!wbinfo_list_domains(false)) {
                                d_fprintf(stderr, "Could not list trusted domains\n");
                                goto done;
                        }
@@ -1213,18 +1210,18 @@ int main(int argc, char **argv, char **envp)
                        }
                        break;
                case 'a': {
-                               BOOL got_error = False;
+                               bool got_error = false;
 
                                if (!wbinfo_auth(string_arg)) {
                                        d_fprintf(stderr, "Could not authenticate user %s with "
                                                "plaintext password\n", string_arg);
-                                       got_error = True;
+                                       got_error = true;
                                }
 
                                if (!wbinfo_auth_crap(string_arg)) {
                                        d_fprintf(stderr, "Could not authenticate user %s with "
                                                "challenge/response\n", string_arg);
-                                       got_error = True;
+                                       got_error = true;
                                }
 
                                if (got_error)
@@ -1232,7 +1229,7 @@ int main(int argc, char **argv, char **envp)
                                break;
                        }
                case 'K': {
-                               uint32 flags =  WBFLAG_PAM_KRB5 |
+                               uint32_t flags =  WBFLAG_PAM_KRB5 |
                                                WBFLAG_PAM_CACHED_LOGIN |
                                                WBFLAG_PAM_FALLBACK_AFTER_KRB5 |
                                                WBFLAG_PAM_INFO3_TEXT;
@@ -1256,7 +1253,7 @@ int main(int argc, char **argv, char **envp)
                        }
                        break;
                case OPT_SEPARATOR: {
-                       const char sep = winbind_separator_int(True);
+                       const char sep = winbind_separator_int(true);
                        if ( !sep ) {
                                goto done;
                        }
@@ -1264,7 +1261,7 @@ int main(int argc, char **argv, char **envp)
                        break;
                }
                case OPT_LIST_ALL_DOMAINS:
-                       if (!wbinfo_list_domains(True)) {
+                       if (!wbinfo_list_domains(true)) {
                                goto done;
                        }
                        break;