r21399: need to zero the request and response structures
[samba.git] / source3 / nsswitch / wbinfo.c
index aae76e442387d78e3d191809fb9d3d6c0775a020..3ae97cfea0a4c15ad4bc57f3298347740bfa4f13 100644 (file)
@@ -45,9 +45,9 @@ static char winbind_separator_int(BOOL strict)
 
        if (winbindd_request_response(WINBINDD_INFO, NULL, &response) !=
            NSS_STATUS_SUCCESS) {
-               d_printf("could not obtain winbind separator!\n");
+               d_fprintf(stderr, "could not obtain winbind separator!\n");
                if (strict) {
-                       return -1;
+                       return 0;
                }
                /* HACK: (this module should not call lp_ funtions) */
                return *lp_winbind_separator();
@@ -57,9 +57,9 @@ static char winbind_separator_int(BOOL strict)
        got_sep = True;
 
        if (!sep) {
-               d_printf("winbind separator was NULL!\n");
+               d_fprintf(stderr, "winbind separator was NULL!\n");
                if (strict) {
-                       return -1;
+                       return 0;
                }
                /* HACK: (this module should not call lp_ funtions) */
                sep = *lp_winbind_separator();
@@ -84,7 +84,7 @@ static const char *get_winbind_domain(void)
 
        if (winbindd_request_response(WINBINDD_DOMAIN_NAME, NULL, &response) !=
            NSS_STATUS_SUCCESS) {
-               d_printf("could not obtain winbind domain name!\n");
+               d_fprintf(stderr, "could not obtain winbind domain name!\n");
                
                /* HACK: (this module should not call lp_ funtions) */
                return lp_workgroup();
@@ -119,6 +119,66 @@ static BOOL parse_wbinfo_domain_user(const char *domuser, fstring domain,
        return True;
 }
 
+/* pull pwent info for a given user */
+
+static BOOL wbinfo_get_userinfo(char *user)
+{
+       struct winbindd_request request;
+       struct winbindd_response response;
+       NSS_STATUS result;
+       
+       ZERO_STRUCT(request);
+       ZERO_STRUCT(response);
+
+       /* Send request */
+       
+       fstrcpy(request.data.username, user);
+
+       result = winbindd_request_response(WINBINDD_GETPWNAM, &request, &response);
+       
+       if (result != NSS_STATUS_SUCCESS)
+               return False;
+       
+       d_printf( "%s:%s:%d:%d:%s:%s:%s\n",
+                         response.data.pw.pw_name,
+                         response.data.pw.pw_passwd,
+                         response.data.pw.pw_uid,
+                         response.data.pw.pw_gid,
+                         response.data.pw.pw_gecos,
+                         response.data.pw.pw_dir,
+                         response.data.pw.pw_shell );
+       
+       return True;
+}
+
+/* pull grent for a given group */
+static BOOL wbinfo_get_groupinfo(char *group)
+{
+       struct winbindd_request request;
+       struct winbindd_response response;
+       NSS_STATUS result;
+
+       ZERO_STRUCT(request);
+       ZERO_STRUCT(response);
+
+       /* Send request */
+
+       fstrcpy(request.data.groupname, group);
+
+       result = winbindd_request_response(WINBINDD_GETGRNAM, &request,
+                                          &response);
+
+       if ( result != NSS_STATUS_SUCCESS)
+               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;
+}
+
 /* List groups a user is a member of */
 
 static BOOL wbinfo_get_usergroups(char *user)
@@ -141,9 +201,9 @@ static BOOL wbinfo_get_usergroups(char *user)
                return False;
 
        for (i = 0; i < response.data.num_entries; i++)
-               d_printf("%d\n", (int)((gid_t *)response.extra_data)[i]);
+               d_printf("%d\n", (int)((gid_t *)response.extra_data.data)[i]);
 
-       SAFE_FREE(response.extra_data);
+       SAFE_FREE(response.extra_data.data);
 
        return True;
 }
@@ -169,13 +229,13 @@ static BOOL wbinfo_get_usersids(char *user_sid)
        if (result != NSS_STATUS_SUCCESS)
                return False;
 
-       s = response.extra_data;
+       s = (const char *)response.extra_data.data;
        for (i = 0; i < response.data.num_entries; i++) {
                d_printf("%s\n", s);
                s += strlen(s) + 1;
        }
 
-       SAFE_FREE(response.extra_data);
+       SAFE_FREE(response.extra_data.data);
 
        return True;
 }
@@ -199,9 +259,9 @@ static BOOL wbinfo_get_userdomgroups(const char *user_sid)
                return False;
 
        if (response.data.num_entries != 0)
-               printf("%s", (char *)response.extra_data);
+               printf("%s", (char *)response.extra_data.data);
        
-       SAFE_FREE(response.extra_data);
+       SAFE_FREE(response.extra_data.data);
 
        return True;
 }
@@ -227,7 +287,7 @@ static BOOL wbinfo_wins_byname(char *name)
 
        /* Display response */
 
-       printf("%s\n", response.data.winsresp);
+       d_printf("%s\n", response.data.winsresp);
 
        return True;
 }
@@ -253,36 +313,40 @@ static BOOL wbinfo_wins_byip(char *ip)
 
        /* Display response */
 
-       printf("%s\n", response.data.winsresp);
+       d_printf("%s\n", response.data.winsresp);
 
        return True;
 }
 
 /* List trusted domains */
 
-static BOOL wbinfo_list_domains(void)
+static BOOL wbinfo_list_domains(BOOL list_all_domains)
 {
+       struct winbindd_request request;
        struct winbindd_response response;
 
+       ZERO_STRUCT(request);
        ZERO_STRUCT(response);
 
        /* Send request */
 
-       if (winbindd_request_response(WINBINDD_LIST_TRUSTDOM, NULL, &response) !=
+       request.data.list_all_domains = list_all_domains;
+
+       if (winbindd_request_response(WINBINDD_LIST_TRUSTDOM, &request, &response) !=
            NSS_STATUS_SUCCESS)
                return False;
 
        /* Display response */
 
-       if (response.extra_data) {
-               const char *extra_data = (char *)response.extra_data;
+       if (response.extra_data.data) {
+               const char *extra_data = (char *)response.extra_data.data;
                fstring name;
                char *p;
 
                while(next_token(&extra_data, name, "\n", sizeof(fstring))) {
                        p = strchr(name, '\\');
                        if (p == 0) {
-                               d_printf("Got invalid response: %s\n",
+                               d_fprintf(stderr, "Got invalid response: %s\n",
                                         extra_data);
                                return False;
                        }
@@ -290,12 +354,20 @@ static BOOL wbinfo_list_domains(void)
                        d_printf("%s\n", name);
                }
 
-               SAFE_FREE(response.extra_data);
+               SAFE_FREE(response.extra_data.data);
        }
 
        return True;
 }
 
+/* List own domain */
+
+static BOOL wbinfo_list_own_domain(void)
+{
+       d_printf("%s\n", get_winbind_domain());
+
+       return True;
+}
 
 /* show sequence numbers */
 static BOOL wbinfo_show_sequence(const char *domain)
@@ -317,10 +389,10 @@ static BOOL wbinfo_show_sequence(const char *domain)
 
        /* Display response */
 
-       if (response.extra_data) {
-               char *extra_data = (char *)response.extra_data;
+       if (response.extra_data.data) {
+               char *extra_data = (char *)response.extra_data.data;
                d_printf("%s", extra_data);
-               SAFE_FREE(response.extra_data);
+               SAFE_FREE(response.extra_data.data);
        }
 
        return True;
@@ -336,7 +408,10 @@ static BOOL wbinfo_domain_info(const char *domain_name)
        ZERO_STRUCT(request);
        ZERO_STRUCT(response);
 
-       fstrcpy(request.domain_name, domain_name);
+       if ((strequal(domain_name, ".")) || (domain_name[0] == '\0'))
+               fstrcpy(request.domain_name, get_winbind_domain());
+       else
+               fstrcpy(request.domain_name, domain_name);
 
        /* Send request */
 
@@ -379,7 +454,7 @@ static BOOL wbinfo_getdcname(const char *domain_name)
 
        if (winbindd_request_response(WINBINDD_GETDCNAME, &request, &response) !=
            NSS_STATUS_SUCCESS) {
-               d_printf("Could not get dc name for %s\n", domain_name);
+               d_fprintf(stderr, "Could not get dc name for %s\n", domain_name);
                return False;
        }
 
@@ -405,7 +480,7 @@ static BOOL wbinfo_check_secret(void)
                 (result == NSS_STATUS_SUCCESS) ? "succeeded" : "failed");
 
        if (result != NSS_STATUS_SUCCESS)       
-               d_printf("error code was %s (0x%x)\n", 
+               d_fprintf(stderr, "error code was %s (0x%x)\n", 
                         response.data.auth.nt_status_string, 
                         response.data.auth.nt_status);
        
@@ -510,14 +585,26 @@ static BOOL wbinfo_sid_to_gid(char *sid)
        return True;
 }
 
-static BOOL wbinfo_allocate_rid(void)
+static BOOL wbinfo_allocate_uid(void)
 {
-       uint32 rid;
+       uid_t uid;
 
-       if (!winbind_allocate_rid(&rid))
+       if (!winbind_allocate_uid(&uid))
                return False;
 
-       d_printf("New rid: %d\n", rid);
+       d_printf("New uid: %d\n", uid);
+
+       return True;
+}
+
+static BOOL wbinfo_allocate_gid(void)
+{
+       gid_t gid;
+
+       if (!winbind_allocate_gid(&gid))
+               return False;
+
+       d_printf("New gid: %d\n", gid);
 
        return True;
 }
@@ -549,6 +636,82 @@ static BOOL wbinfo_lookupsid(char *sid)
        return True;
 }
 
+/* Lookup a list of RIDs */
+
+static BOOL wbinfo_lookuprids(char *domain, char *arg)
+{
+       size_t i;
+       DOM_SID sid;
+       int num_rids;
+       uint32 *rids;
+       const char *p;
+       char ridstr[32];
+       const char **names;
+       enum lsa_SidType *types;
+       const char *domain_name;
+       TALLOC_CTX *mem_ctx;
+       struct winbindd_request request;
+       struct winbindd_response response;
+
+       ZERO_STRUCT(request);
+       ZERO_STRUCT(response);
+
+       if ((domain == NULL) || (strequal(domain, ".")) || (domain[0] == '\0'))
+               fstrcpy(request.domain_name, get_winbind_domain());
+       else
+               fstrcpy(request.domain_name, domain);
+
+       /* Send request */
+
+       if (winbindd_request_response(WINBINDD_DOMAIN_INFO, &request, &response) !=
+           NSS_STATUS_SUCCESS) {
+               d_printf("Could not get domain sid for %s\n", request.domain_name);
+               return False;
+       }
+
+       if (!string_to_sid(&sid, response.data.domain_info.sid)) {
+               d_printf("Could not convert %s to sid\n", response.data.domain_info.sid);
+               return False;
+       }
+
+       mem_ctx = talloc_new(NULL);
+       if (mem_ctx == NULL) {
+               d_printf("talloc_new failed\n");
+               return False;
+       }
+
+       num_rids = 0;
+       rids = NULL;
+       p = arg;
+
+       while (next_token(&p, ridstr, " ,\n", sizeof(ridstr))) {
+               uint32 rid = strtoul(ridstr, NULL, 10);
+               ADD_TO_ARRAY(mem_ctx, uint32, rid, &rids, &num_rids);
+       }
+
+       if (rids == NULL) {
+               TALLOC_FREE(mem_ctx);
+               return False;
+       }
+
+       if (!winbind_lookup_rids(mem_ctx, &sid, num_rids, rids,
+                                &domain_name, &names, &types)) {
+               d_printf("winbind_lookup_rids failed\n");
+               TALLOC_FREE(mem_ctx);
+               return False;
+       }
+
+       d_printf("Domain: %s\n", domain_name);
+
+       for (i=0; i<num_rids; i++) {
+               d_printf("%8d: %s (%s)\n", rids[i], names[i],
+                        sid_type_lookup(types[i]));
+       }
+
+       TALLOC_FREE(mem_ctx);
+       return True;
+}
+
 /* Convert string to sid */
 
 static BOOL wbinfo_lookupname(char *name)
@@ -577,6 +740,67 @@ static BOOL wbinfo_lookupname(char *name)
 
 /* Authenticate a user with a plaintext password */
 
+static BOOL wbinfo_auth_krb5(char *username, const char *cctype, uint32 flags)
+{
+       struct winbindd_request request;
+       struct winbindd_response response;
+       NSS_STATUS result;
+       char *p;
+
+       /* Send off request */
+
+       ZERO_STRUCT(request);
+       ZERO_STRUCT(response);
+
+       p = strchr(username, '%');
+
+       if (p) {
+               *p = 0;
+               fstrcpy(request.data.auth.user, username);
+               fstrcpy(request.data.auth.pass, p + 1);
+               *p = '%';
+       } else
+               fstrcpy(request.data.auth.user, username);
+
+       request.flags = flags;
+
+       fstrcpy(request.data.auth.krb5_cc_type, cctype);
+
+       request.data.auth.uid = geteuid();
+
+       result = winbindd_request_response(WINBINDD_PAM_AUTH, &request, &response);
+
+       /* Display response */
+
+       d_printf("plaintext kerberos password authentication for [%s] %s (requesting cctype: %s)\n", 
+               username, (result == NSS_STATUS_SUCCESS) ? "succeeded" : "failed", cctype);
+
+       if (response.data.auth.nt_status)
+               d_fprintf(stderr, "error code was %s (0x%x)\nerror messsage was: %s\n", 
+                        response.data.auth.nt_status_string, 
+                        response.data.auth.nt_status,
+                        response.data.auth.error_string);
+
+       if (result == NSS_STATUS_SUCCESS) {
+
+               if (request.flags & WBFLAG_PAM_INFO3_TEXT) {
+                       if (response.data.auth.info3.user_flgs & LOGON_CACHED_ACCOUNT) {
+                               d_printf("user_flgs: LOGON_CACHED_ACCOUNT\n");
+                       }
+               }
+
+               if (response.data.auth.krb5ccname[0] != '\0') {
+                       d_printf("credentials were put in: %s\n", response.data.auth.krb5ccname);
+               } else {
+                       d_printf("no credentials cached\n");
+               }
+       }
+
+       return result == NSS_STATUS_SUCCESS;
+}
+
+/* Authenticate a user with a plaintext password */
+
 static BOOL wbinfo_auth(char *username)
 {
        struct winbindd_request request;
@@ -607,7 +831,7 @@ static BOOL wbinfo_auth(char *username)
                (result == NSS_STATUS_SUCCESS) ? "succeeded" : "failed");
 
        if (response.data.auth.nt_status)
-               d_printf("error code was %s (0x%x)\nerror messsage was: %s\n", 
+               d_fprintf(stderr, "error code was %s (0x%x)\nerror messsage was: %s\n", 
                         response.data.auth.nt_status_string, 
                         response.data.auth.nt_status,
                         response.data.auth.error_string);
@@ -707,7 +931,7 @@ static BOOL wbinfo_auth_crap(char *username)
                (result == NSS_STATUS_SUCCESS) ? "succeeded" : "failed");
 
        if (response.data.auth.nt_status)
-               d_printf("error code was %s (0x%x)\nerror messsage was: %s\n", 
+               d_fprintf(stderr, "error code was %s (0x%x)\nerror messsage was: %s\n", 
                         response.data.auth.nt_status_string, 
                         response.data.auth.nt_status,
                         response.data.auth.error_string);
@@ -751,7 +975,7 @@ static BOOL wbinfo_klog(char *username)
                (result == NSS_STATUS_SUCCESS) ? "succeeded" : "failed");
 
        if (response.data.auth.nt_status)
-               d_printf("error code was %s (0x%x)\nerror messsage was: %s\n", 
+               d_fprintf(stderr, "error code was %s (0x%x)\nerror messsage was: %s\n", 
                         response.data.auth.nt_status_string, 
                         response.data.auth.nt_status,
                         response.data.auth.error_string);
@@ -759,13 +983,13 @@ static BOOL wbinfo_klog(char *username)
        if (result != NSS_STATUS_SUCCESS)
                return False;
 
-       if (response.extra_data == NULL) {
-               d_printf("Did not get token data\n");
+       if (response.extra_data.data == NULL) {
+               d_fprintf(stderr, "Did not get token data\n");
                return False;
        }
 
-       if (!afs_settoken_str((char *)response.extra_data)) {
-               d_printf("Could not set token\n");
+       if (!afs_settoken_str((char *)response.extra_data.data)) {
+               d_fprintf(stderr, "Could not set token\n");
                return False;
        }
 
@@ -788,9 +1012,9 @@ static BOOL print_domain_users(const char *domain)
        ZERO_STRUCT(response);
        
        if (domain) {
-               /* '.' is the special sign for our own domwin */
+               /* '.' is the special sign for our own domain */
                if ( strequal(domain, ".") )
-                       fstrcpy( request.domain_name, lp_workgroup() );
+                       fstrcpy( request.domain_name, get_winbind_domain() );
                else
                        fstrcpy( request.domain_name, domain );
        }
@@ -801,15 +1025,15 @@ static BOOL print_domain_users(const char *domain)
 
        /* Look through extra data */
 
-       if (!response.extra_data)
+       if (!response.extra_data.data)
                return False;
 
-       extra_data = (const char *)response.extra_data;
+       extra_data = (const char *)response.extra_data.data;
 
        while(next_token(&extra_data, name, ",", sizeof(fstring)))
                d_printf("%s\n", name);
        
-       SAFE_FREE(response.extra_data);
+       SAFE_FREE(response.extra_data.data);
 
        return True;
 }
@@ -828,7 +1052,7 @@ static BOOL print_domain_groups(const char *domain)
 
        if (domain) {
                if ( strequal(domain, ".") )
-                       fstrcpy( request.domain_name, lp_workgroup() );
+                       fstrcpy( request.domain_name, get_winbind_domain() );
                else
                        fstrcpy( request.domain_name, domain );
        }
@@ -839,15 +1063,15 @@ static BOOL print_domain_groups(const char *domain)
 
        /* Look through extra data */
 
-       if (!response.extra_data)
+       if (!response.extra_data.data)
                return False;
 
-       extra_data = (const char *)response.extra_data;
+       extra_data = (const char *)response.extra_data.data;
 
        while(next_token(&extra_data, name, ",", sizeof(fstring)))
                d_printf("%s\n", name);
 
-       SAFE_FREE(response.extra_data);
+       SAFE_FREE(response.extra_data.data);
        
        return True;
 }
@@ -968,10 +1192,15 @@ enum {
        OPT_GETDCNAME,
        OPT_USERDOMGROUPS,
        OPT_USERSIDS,
-       OPT_SEPARATOR
+       OPT_ALLOCATE_UID,
+       OPT_ALLOCATE_GID,
+       OPT_SEPARATOR,
+       OPT_LIST_ALL_DOMAINS,
+       OPT_LIST_OWN_DOMAIN,
+       OPT_GROUP_INFO,
 };
 
-int main(int argc, char **argv)
+int main(int argc, char **argv, char **envp)
 {
        int opt;
 
@@ -993,15 +1222,23 @@ int main(int argc, char **argv)
                { "WINS-by-ip", 'I', POPT_ARG_STRING, &string_arg, 'I', "Converts IP address to NetBIOS name", "IP" },
                { "name-to-sid", 'n', POPT_ARG_STRING, &string_arg, 'n', "Converts name to sid", "NAME" },
                { "sid-to-name", 's', POPT_ARG_STRING, &string_arg, 's', "Converts sid to name", "SID" },
+               { "lookup-rids", 'R', POPT_ARG_STRING, &string_arg, 'R', "Converts RIDs to names", "RIDs" },
                { "uid-to-sid", 'U', POPT_ARG_INT, &int_arg, 'U', "Converts uid to sid" , "UID" },
                { "gid-to-sid", 'G', POPT_ARG_INT, &int_arg, 'G', "Converts gid to sid", "GID" },
                { "sid-to-uid", 'S', POPT_ARG_STRING, &string_arg, 'S', "Converts sid to uid", "SID" },
                { "sid-to-gid", 'Y', POPT_ARG_STRING, &string_arg, 'Y', "Converts sid to gid", "SID" },
-               { "allocate-rid", 'A', POPT_ARG_NONE, 0, 'A', "Get a new RID out of idmap" },
+               { "allocate-uid", 0, POPT_ARG_NONE, 0, OPT_ALLOCATE_UID,
+                 "Get a new UID out of idmap" },
+               { "allocate-gid", 0, POPT_ARG_NONE, 0, OPT_ALLOCATE_GID,
+                 "Get a new GID out of idmap" },
                { "check-secret", 't', POPT_ARG_NONE, 0, 't', "Check shared secret" },
                { "trusted-domains", 'm', POPT_ARG_NONE, 0, 'm', "List trusted domains" },
+               { "all-domains", 0, POPT_ARG_NONE, 0, OPT_LIST_ALL_DOMAINS, "List all domains (trusted and own domain)" },
+               { "own-domain", 0, POPT_ARG_NONE, 0, OPT_LIST_OWN_DOMAIN, "List own domain" },
                { "sequence", 0, POPT_ARG_NONE, 0, OPT_SEQUENCE, "Show sequence numbers of all domains" },
                { "domain-info", 'D', POPT_ARG_STRING, &string_arg, 'D', "Show most of the info we have about the domain" },
+               { "user-info", 'i', POPT_ARG_STRING, &string_arg, 'i', "Get user info", "USER" },
+               { "group-info", 0, POPT_ARG_STRING, &string_arg, OPT_GROUP_INFO, "Get group info", "GROUP" },
                { "user-groups", 'r', POPT_ARG_STRING, &string_arg, 'r', "Get user groups", "USER" },
                { "user-domgroups", 0, POPT_ARG_STRING, &string_arg,
                  OPT_USERDOMGROUPS, "Get user domain groups", "SID" },
@@ -1015,6 +1252,11 @@ int main(int argc, char **argv)
                { "domain", 0, POPT_ARG_STRING, &opt_domain_name, OPT_DOMAIN_NAME, "Define to the domain to restrict operation", "domain" },
 #ifdef WITH_FAKE_KASERVER
                { "klog", 'k', POPT_ARG_STRING, &string_arg, 'k', "set an AFS token from winbind", "user%password" },
+#endif
+#ifdef HAVE_KRB5
+               { "krb5auth", 'K', POPT_ARG_STRING, &string_arg, 'K', "authenticate user using Kerberos", "user%password" },
+                       /* destroys wbinfo --help output */
+                       /* "user%password,DOM\\user%password,user@EXAMPLE.COM,EXAMPLE.COM\\user%password" }, */
 #endif
                { "separator", 0, POPT_ARG_NONE, 0, OPT_SEPARATOR, "Get the active winbind separator", NULL },
                POPT_COMMON_VERSION
@@ -1022,8 +1264,9 @@ int main(int argc, char **argv)
        };
 
        /* Samba client initialisation */
+       load_case_tables();
 
-       if (!lp_load(dyn_CONFIGFILE, True, False, False)) {
+       if (!lp_load(dyn_CONFIGFILE, True, False, False, True)) {
                d_fprintf(stderr, "wbinfo: error opening config file %s. Error was %s\n",
                        dyn_CONFIGFILE, strerror(errno));
                exit(1);
@@ -1058,114 +1301,140 @@ int main(int argc, char **argv)
                switch (opt) {
                case 'u':
                        if (!print_domain_users(opt_domain_name)) {
-                               d_printf("Error looking up domain users\n");
+                               d_fprintf(stderr, "Error looking up domain users\n");
                                goto done;
                        }
                        break;
                case 'g':
                        if (!print_domain_groups(opt_domain_name)) {
-                               d_printf("Error looking up domain groups\n");
+                               d_fprintf(stderr, "Error looking up domain groups\n");
                                goto done;
                        }
                        break;
                case 's':
                        if (!wbinfo_lookupsid(string_arg)) {
-                               d_printf("Could not lookup sid %s\n", string_arg);
+                               d_fprintf(stderr, "Could not lookup sid %s\n", string_arg);
+                               goto done;
+                       }
+                       break;
+               case 'R':
+                       if (!wbinfo_lookuprids(opt_domain_name, string_arg)) {
+                               d_fprintf(stderr, "Could not lookup RIDs %s\n", string_arg);
                                goto done;
                        }
                        break;
                case 'n':
                        if (!wbinfo_lookupname(string_arg)) {
-                               d_printf("Could not lookup name %s\n", string_arg);
+                               d_fprintf(stderr, "Could not lookup name %s\n", string_arg);
                                goto done;
                        }
                        break;
                case 'N':
                        if (!wbinfo_wins_byname(string_arg)) {
-                               d_printf("Could not lookup WINS by name %s\n", string_arg);
+                               d_fprintf(stderr, "Could not lookup WINS by name %s\n", string_arg);
                                goto done;
                        }
                        break;
                case 'I':
                        if (!wbinfo_wins_byip(string_arg)) {
-                               d_printf("Could not lookup WINS by IP %s\n", string_arg);
+                               d_fprintf(stderr, "Could not lookup WINS by IP %s\n", string_arg);
                                goto done;
                        }
                        break;
                case 'U':
                        if (!wbinfo_uid_to_sid(int_arg)) {
-                               d_printf("Could not convert uid %d to sid\n", int_arg);
+                               d_fprintf(stderr, "Could not convert uid %d to sid\n", int_arg);
                                goto done;
                        }
                        break;
                case 'G':
                        if (!wbinfo_gid_to_sid(int_arg)) {
-                               d_printf("Could not convert gid %d to sid\n",
+                               d_fprintf(stderr, "Could not convert gid %d to sid\n",
                                       int_arg);
                                goto done;
                        }
                        break;
                case 'S':
                        if (!wbinfo_sid_to_uid(string_arg)) {
-                               d_printf("Could not convert sid %s to uid\n",
+                               d_fprintf(stderr, "Could not convert sid %s to uid\n",
                                       string_arg);
                                goto done;
                        }
                        break;
                case 'Y':
                        if (!wbinfo_sid_to_gid(string_arg)) {
-                               d_printf("Could not convert sid %s to gid\n",
+                               d_fprintf(stderr, "Could not convert sid %s to gid\n",
                                       string_arg);
                                goto done;
                        }
                        break;
-               case 'A':
-                       if (!wbinfo_allocate_rid()) {
-                               d_printf("Could not allocate a RID\n");
+               case OPT_ALLOCATE_UID:
+                       if (!wbinfo_allocate_uid()) {
+                               d_fprintf(stderr, "Could not allocate a uid\n");
+                               goto done;
+                       }
+                       break;
+               case OPT_ALLOCATE_GID:
+                       if (!wbinfo_allocate_gid()) {
+                               d_fprintf(stderr, "Could not allocate a gid\n");
                                goto done;
                        }
                        break;
                case 't':
                        if (!wbinfo_check_secret()) {
-                               d_printf("Could not check secret\n");
+                               d_fprintf(stderr, "Could not check secret\n");
                                goto done;
                        }
                        break;
                case 'm':
-                       if (!wbinfo_list_domains()) {
-                               d_printf("Could not list trusted domains\n");
+                       if (!wbinfo_list_domains(False)) {
+                               d_fprintf(stderr, "Could not list trusted domains\n");
                                goto done;
                        }
                        break;
                case OPT_SEQUENCE:
                        if (!wbinfo_show_sequence(opt_domain_name)) {
-                               d_printf("Could not show sequence numbers\n");
+                               d_fprintf(stderr, "Could not show sequence numbers\n");
                                goto done;
                        }
                        break;
                case 'D':
                        if (!wbinfo_domain_info(string_arg)) {
-                               d_printf("Could not get domain info\n");
+                               d_fprintf(stderr, "Could not get domain info\n");
+                               goto done;
+                       }
+                       break;
+               case 'i':
+                       if (!wbinfo_get_userinfo(string_arg)) {
+                               d_fprintf(stderr, "Could not get info for user %s\n",
+                                                 string_arg);
                                goto done;
                        }
                        break;
+               case OPT_GROUP_INFO:
+                       if ( !wbinfo_get_groupinfo(string_arg)) {
+                               d_fprintf(stderr, "Could not get info for "
+                                         "group %s\n", string_arg);
+                               goto done;
+                       }
+            break;
                case 'r':
                        if (!wbinfo_get_usergroups(string_arg)) {
-                               d_printf("Could not get groups for user %s\n", 
+                               d_fprintf(stderr, "Could not get groups for user %s\n", 
                                       string_arg);
                                goto done;
                        }
                        break;
                case OPT_USERSIDS:
                        if (!wbinfo_get_usersids(string_arg)) {
-                               d_printf("Could not get group SIDs for user SID %s\n", 
+                               d_fprintf(stderr, "Could not get group SIDs for user SID %s\n", 
                                       string_arg);
                                goto done;
                        }
                        break;
                case OPT_USERDOMGROUPS:
                        if (!wbinfo_get_userdomgroups(string_arg)) {
-                               d_printf("Could not get user's domain groups "
+                               d_fprintf(stderr, "Could not get user's domain groups "
                                         "for user SID %s\n", string_arg);
                                goto done;
                        }
@@ -1174,13 +1443,13 @@ int main(int argc, char **argv)
                                BOOL got_error = False;
 
                                if (!wbinfo_auth(string_arg)) {
-                                       d_printf("Could not authenticate user %s with "
+                                       d_fprintf(stderr, "Could not authenticate user %s with "
                                                "plaintext password\n", string_arg);
                                        got_error = True;
                                }
 
                                if (!wbinfo_auth_crap(string_arg)) {
-                                       d_printf("Could not authenticate user %s with "
+                                       d_fprintf(stderr, "Could not authenticate user %s with "
                                                "challenge/response\n", string_arg);
                                        got_error = True;
                                }
@@ -1189,31 +1458,83 @@ int main(int argc, char **argv)
                                        goto done;
                                break;
                        }
+               case 'K': {
+                               BOOL got_error = False;
+                               uint32 flags =  WBFLAG_PAM_KRB5 |
+                                               WBFLAG_PAM_CACHED_LOGIN |
+                                               WBFLAG_PAM_FALLBACK_AFTER_KRB5 |
+                                               WBFLAG_PAM_INFO3_TEXT;
+                               fstring tok;
+                               int i;
+                               const char *arg[] = { NULL, NULL };
+                               const char *cctypes[] = { "FILE", 
+                                                         "KCM", 
+                                                         "KCM:0", 
+                                                         "Garbage", 
+                                                         NULL, 
+                                                         "0"};
+
+                               arg[0] = string_arg;
+
+                               while (next_token(arg, tok, LIST_SEP, sizeof(tok))) {
+
+                                       for (i=0; i < ARRAY_SIZE(cctypes); i++) {
+                                               if (!wbinfo_auth_krb5(tok, cctypes[i], flags)) {
+                                                       d_fprintf(stderr, "Could not authenticate user [%s] with "
+                                                               "Kerberos (ccache: %s)\n", tok, cctypes[i]);
+                                                       got_error = True;
+                                               }
+                                       }
+                               }
+
+                               if (got_error)
+                                       goto done;
+
+                               break;
+                       }
                case 'k':
                        if (!wbinfo_klog(string_arg)) {
-                               d_printf("Could not klog user\n");
+                               d_fprintf(stderr, "Could not klog user\n");
                                goto done;
                        }
                        break;
                case 'p':
                        if (!wbinfo_ping()) {
-                               d_printf("could not ping winbindd!\n");
+                               d_fprintf(stderr, "could not ping winbindd!\n");
                                goto done;
                        }
                        break;
                case OPT_SET_AUTH_USER:
-                       wbinfo_set_auth_user(string_arg);
+                       if (!wbinfo_set_auth_user(string_arg)) {
+                               goto done;
+                       }
                        break;
                case OPT_GET_AUTH_USER:
                        wbinfo_get_auth_user();
                        break;
                case OPT_GETDCNAME:
-                       wbinfo_getdcname(string_arg);
+                       if (!wbinfo_getdcname(string_arg)) {
+                               goto done;
+                       }
                        break;
-               case OPT_SEPARATOR:
-                       d_printf("%c\n", winbind_separator_int(True));
+               case OPT_SEPARATOR: {
+                       const char sep = winbind_separator_int(True);
+                       if ( !sep ) {
+                               goto done;
+                       }
+                       d_printf("%c\n", sep);
+                       break;
+               }
+               case OPT_LIST_ALL_DOMAINS:
+                       if (!wbinfo_list_domains(True)) {
+                               goto done;
+                       }
+                       break;
+               case OPT_LIST_OWN_DOMAIN:
+                       if (!wbinfo_list_own_domain()) {
+                               goto done;
+                       }
                        break;
-
                /* generic configuration options */
                case OPT_DOMAIN_NAME:
                        break;