libreplace: Fix the build on Solaris
[sfrench/samba-autobuild/.git] / nsswitch / wbinfo.c
index 372896ce71b56e68c25ec5c620f3996b37de5344..f45d7b583351cab5d7da0d2ff03dbd9390ff4035 100644 (file)
@@ -4,7 +4,8 @@
    Winbind status program.
 
    Copyright (C) Tim Potter      2000-2003
-   Copyright (C) Andrew Bartlett 2002
+   Copyright (C) Andrew Bartlett 2002-2007
+   Copyright (C) Volker Lendecke 2009
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 #include "includes.h"
 #include "winbind_client.h"
 #include "libwbclient/wbclient.h"
+#include "../libcli/auth/libcli_auth.h"
+#include "lib/cmdline/popt_common.h"
+#include "lib/afs/afs_settoken.h"
 
+#ifdef DBGC_CLASS
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
+#endif
 
 static struct wbcInterfaceDetails *init_interface_details(void)
 {
@@ -38,13 +44,14 @@ static struct wbcInterfaceDetails *init_interface_details(void)
 
        wbc_status = wbcInterfaceDetails(&details);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
-               d_fprintf(stderr, "could not obtain winbind interface details!\n");
+               d_fprintf(stderr, "could not obtain winbind interface "
+                                 "details: %s\n", wbcErrorString(wbc_status));
        }
 
        return details;
 }
 
-static char winbind_separator_int(bool strict)
+static char winbind_separator(void)
 {
        struct wbcInterfaceDetails *details;
        static bool got_sep;
@@ -57,11 +64,7 @@ static char winbind_separator_int(bool strict)
 
        if (!details) {
                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 0;
        }
 
        sep = details->winbind_separator;
@@ -69,21 +72,12 @@ static char winbind_separator_int(bool strict)
 
        if (!sep) {
                d_fprintf(stderr, "winbind separator was NULL!\n");
-               if (strict) {
-                       return 0;
-               }
-               /* HACK: (this module should not call lp_ funtions) */
-               sep = *lp_winbind_separator();
+               return 0;
        }
 
        return sep;
 }
 
-static char winbind_separator(void)
-{
-       return winbind_separator_int(false);
-}
-
 static const char *get_winbind_domain(void)
 {
        static struct wbcInterfaceDetails *details;
@@ -92,14 +86,26 @@ static const char *get_winbind_domain(void)
 
        if (!details) {
                d_fprintf(stderr, "could not obtain winbind domain name!\n");
-
-               /* HACK: (this module should not call lp_ functions) */
-               return lp_workgroup();
+               return 0;
        }
 
        return details->netbios_domain;
 }
 
+static const char *get_winbind_netbios_name(void)
+{
+       static struct wbcInterfaceDetails *details;
+
+       details = init_interface_details();
+
+       if (!details) {
+               d_fprintf(stderr, "could not obtain winbind netbios name!\n");
+               return 0;
+       }
+
+       return details->netbios_name;
+}
+
 /* Copy of parse_domain_user from winbindd_util.c.  Parse a string of the
    form DOMAIN/user into a domain and a user */
 
@@ -111,7 +117,8 @@ static bool parse_wbinfo_domain_user(const char *domuser, fstring domain,
 
        if (!p) {
                /* Maybe it was a UPN? */
-               if ((p = strchr(domuser, '@')) != NULL) {
+               p = strchr(domuser, '@');
+               if (p != NULL) {
                        fstrcpy(domain, "");
                        fstrcpy(user, domuser);
                        return true;
@@ -125,7 +132,6 @@ static bool parse_wbinfo_domain_user(const char *domuser, fstring domain,
        fstrcpy(user, p+1);
        fstrcpy(domain, domuser);
        domain[PTR_DIFF(p, domuser)] = 0;
-       strupper_m(domain);
 
        return true;
 }
@@ -164,18 +170,22 @@ static bool wbinfo_get_userinfo(char *user)
 
        wbc_status = wbcGetpwnam(user, &pwd);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcGetpwnam: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
-       d_printf("%s:%s:%d:%d:%s:%s:%s\n",
+       d_printf("%s:%s:%u:%u:%s:%s:%s\n",
                 pwd->pw_name,
                 pwd->pw_passwd,
-                pwd->pw_uid,
-                pwd->pw_gid,
+                (unsigned int)pwd->pw_uid,
+                (unsigned int)pwd->pw_gid,
                 pwd->pw_gecos,
                 pwd->pw_dir,
                 pwd->pw_shell);
 
+       wbcFreeMemory(pwd);
+
        return true;
 }
 
@@ -187,18 +197,22 @@ static bool wbinfo_get_uidinfo(int uid)
 
        wbc_status = wbcGetpwuid(uid, &pwd);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcGetpwuid: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
-       d_printf("%s:%s:%d:%d:%s:%s:%s\n",
+       d_printf("%s:%s:%u:%u:%s:%s:%s\n",
                 pwd->pw_name,
                 pwd->pw_passwd,
-                pwd->pw_uid,
-                pwd->pw_gid,
+                (unsigned int)pwd->pw_uid,
+                (unsigned int)pwd->pw_gid,
                 pwd->pw_gecos,
                 pwd->pw_dir,
                 pwd->pw_shell);
 
+       wbcFreeMemory(pwd);
+
        return true;
 }
 
@@ -211,18 +225,22 @@ static bool wbinfo_get_user_sidinfo(const char *sid_str)
        wbc_status = wbcStringToSid(sid_str, &sid);
        wbc_status = wbcGetpwsid(&sid, &pwd);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcGetpwsid: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
-       d_printf("%s:%s:%d:%d:%s:%s:%s\n",
+       d_printf("%s:%s:%u:%u:%s:%s:%s\n",
                 pwd->pw_name,
                 pwd->pw_passwd,
-                pwd->pw_uid,
-                pwd->pw_gid,
+                (unsigned int)pwd->pw_uid,
+                (unsigned int)pwd->pw_gid,
                 pwd->pw_gecos,
                 pwd->pw_dir,
                 pwd->pw_shell);
 
+       wbcFreeMemory(pwd);
+
        return true;
 }
 
@@ -232,16 +250,26 @@ static bool wbinfo_get_groupinfo(const char *group)
 {
        wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
        struct group *grp;
+       char **mem;
 
        wbc_status = wbcGetgrnam(group, &grp);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcGetgrnam: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
-       d_printf("%s:%s:%d\n",
+       d_printf("%s:%s:%u:",
                 grp->gr_name,
                 grp->gr_passwd,
-                grp->gr_gid);
+                (unsigned int)grp->gr_gid);
+
+       mem = grp->gr_mem;
+       while (*mem != NULL) {
+               d_printf("%s%s", *mem, *(mem+1) != NULL ? "," : "");
+               mem += 1;
+       }
+       d_printf("\n");
 
        wbcFreeMemory(grp);
 
@@ -253,16 +281,26 @@ static bool wbinfo_get_gidinfo(int gid)
 {
        wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
        struct group *grp;
+       char **mem;
 
        wbc_status = wbcGetgrgid(gid, &grp);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcGetgrgid: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
-       d_printf("%s:%s:%d\n",
+       d_printf("%s:%s:%u:",
                 grp->gr_name,
                 grp->gr_passwd,
-                grp->gr_gid);
+                (unsigned int)grp->gr_gid);
+
+       mem = grp->gr_mem;
+       while (*mem != NULL) {
+               d_printf("%s%s", *mem, *(mem+1) != NULL ? "," : "");
+               mem += 1;
+       }
+       d_printf("\n");
 
        wbcFreeMemory(grp);
 
@@ -282,6 +320,8 @@ static bool wbinfo_get_usergroups(const char *user)
 
        wbc_status = wbcGetGroups(user, &num_groups, &groups);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcGetGroups: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
@@ -307,23 +347,22 @@ static bool wbinfo_get_usersids(const char *user_sid_str)
 
        wbc_status = wbcStringToSid(user_sid_str, &user_sid);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcStringToSid: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
        wbc_status = wbcLookupUserSids(&user_sid, false, &num_sids, &sids);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcLookupUserSids: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
        for (i = 0; i < num_sids; i++) {
-               char *str = NULL;
-               wbc_status = wbcSidToString(&sids[i], &str);
-               if (!WBC_ERROR_IS_OK(wbc_status)) {
-                       wbcFreeMemory(sids);
-                       return false;
-               }
+               char str[WBC_SID_STRING_BUFLEN];
+               wbcSidToStringBuf(&sids[i], str, sizeof(str));
                d_printf("%s\n", str);
-               wbcFreeMemory(str);
        }
 
        wbcFreeMemory(sids);
@@ -342,23 +381,22 @@ static bool wbinfo_get_userdomgroups(const char *user_sid_str)
 
        wbc_status = wbcStringToSid(user_sid_str, &user_sid);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcStringToSid: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
        wbc_status = wbcLookupUserSids(&user_sid, true, &num_sids, &sids);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcLookupUserSids: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
        for (i = 0; i < num_sids; i++) {
-               char *str = NULL;
-               wbc_status = wbcSidToString(&sids[i], &str);
-               if (!WBC_ERROR_IS_OK(wbc_status)) {
-                       wbcFreeMemory(sids);
-                       return false;
-               }
+               char str[WBC_SID_STRING_BUFLEN];
+               wbcSidToStringBuf(&sids[i], str, sizeof(str));
                d_printf("%s\n", str);
-               wbcFreeMemory(str);
        }
 
        wbcFreeMemory(sids);
@@ -366,6 +404,56 @@ static bool wbinfo_get_userdomgroups(const char *user_sid_str)
        return true;
 }
 
+static bool wbinfo_get_sidaliases(const char *domain,
+                                 const char *user_sid_str)
+{
+       wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
+       struct wbcDomainInfo *dinfo = NULL;
+       uint32_t i;
+       struct wbcDomainSid user_sid;
+       uint32_t *alias_rids = NULL;
+       uint32_t num_alias_rids;
+       char domain_sid_str[WBC_SID_STRING_BUFLEN];
+
+       /* Send request */
+       if ((domain == NULL) || (strequal(domain, ".")) ||
+           (domain[0] == '\0')) {
+               domain = get_winbind_domain();
+       }
+
+       /* Send request */
+
+       wbc_status = wbcDomainInfo(domain, &dinfo);
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "wbcDomainInfo(%s) failed: %s\n", domain,
+                         wbcErrorString(wbc_status));
+               goto done;
+       }
+       wbc_status = wbcStringToSid(user_sid_str, &user_sid);
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
+               goto done;
+       }
+
+       wbc_status = wbcGetSidAliases(&dinfo->sid, &user_sid, 1,
+           &alias_rids, &num_alias_rids);
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
+               goto done;
+       }
+
+       wbcSidToStringBuf(&dinfo->sid, domain_sid_str, sizeof(domain_sid_str));
+
+       for (i = 0; i < num_alias_rids; i++) {
+               d_printf("%s-%d\n", domain_sid_str, alias_rids[i]);
+       }
+
+       wbcFreeMemory(alias_rids);
+
+done:
+       wbcFreeMemory(dinfo);
+       return (WBC_ERR_SUCCESS == wbc_status);
+}
+
+
 /* Convert NetBIOS name to IP */
 
 static bool wbinfo_wins_byname(const char *name)
@@ -375,6 +463,8 @@ static bool wbinfo_wins_byname(const char *name)
 
        wbc_status = wbcResolveWinsByName(name, &ip);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcResolveWinsByName: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
@@ -396,6 +486,8 @@ static bool wbinfo_wins_byip(const char *ip)
 
        wbc_status = wbcResolveWinsByIP(ip, &name);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcResolveWinsByIP: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
@@ -420,11 +512,13 @@ static bool wbinfo_list_domains(bool list_all_domains, bool verbose)
 
        wbc_status = wbcListTrusts(&domain_list, &num_domains);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcListTrusts: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
        if (print_all) {
-               d_printf("%-16s%-24s%-12s%-12s%-5s%-5s\n",
+               d_printf("%-16s%-65s%-12s%-12s%-5s%-5s\n",
                         "Domain Name", "DNS Domain", "Trust Type",
                         "Transitive", "In", "Out");
        }
@@ -438,7 +532,7 @@ static bool wbinfo_list_domains(bool list_all_domains, bool verbose)
                        continue;
                }
 
-               d_printf("%-24s", domain_list[i].dns_name);
+               d_printf("%-65s", domain_list[i].dns_name);
 
                switch(domain_list[i].trust_type) {
                case WBC_DOMINFO_TRUSTTYPE_NONE:
@@ -476,6 +570,8 @@ static bool wbinfo_list_domains(bool list_all_domains, bool verbose)
                d_printf("\n");
        }
 
+       wbcFreeMemory(domain_list);
+
        return true;
 }
 
@@ -491,7 +587,8 @@ static bool wbinfo_list_own_domain(void)
 /* show sequence numbers */
 static bool wbinfo_show_sequence(const char *domain)
 {
-       d_printf("This command has been deprecated.  Please use the --online-status option instead.\n");
+       d_printf("This command has been deprecated.  Please use the "
+                "--online-status option instead.\n");
        return false;
 }
 
@@ -505,6 +602,8 @@ static bool wbinfo_show_onlinestatus(const char *domain)
 
        wbc_status = wbcListTrusts(&domain_list, &num_domains);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcListTrusts: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
@@ -517,13 +616,16 @@ static bool wbinfo_show_onlinestatus(const char *domain)
                        }
                }
 
-               is_offline = (domain_list[i].domain_flags & WBC_DOMINFO_DOMAIN_OFFLINE);
+               is_offline = (domain_list[i].domain_flags &
+                             WBC_DOMINFO_DOMAIN_OFFLINE);
 
                d_printf("%s : %s\n",
                         domain_list[i].short_name,
                         is_offline ? "offline" : "online" );
        }
 
+       wbcFreeMemory(domain_list);
+
        return true;
 }
 
@@ -534,9 +636,9 @@ static bool wbinfo_domain_info(const char *domain)
 {
        wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
        struct wbcDomainInfo *dinfo = NULL;
-       char *sid_str = NULL;
+       char sid_str[WBC_SID_STRING_BUFLEN];
 
-       if ((domain == NULL) || (strequal(domain, ".")) || (domain[0] == '\0')) {
+       if ((domain == NULL) || (strequal(domain, ".")) || (domain[0] == '\0')){
                domain = get_winbind_domain();
        }
 
@@ -544,14 +646,12 @@ static bool wbinfo_domain_info(const char *domain)
 
        wbc_status = wbcDomainInfo(domain, &dinfo);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcDomainInfo: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
-       wbc_status = wbcSidToString(&dinfo->sid, &sid_str);
-       if (!WBC_ERROR_IS_OK(wbc_status)) {
-               wbcFreeMemory(dinfo);
-               return false;
-       }
+       wbcSidToStringBuf(&dinfo->sid, sid_str, sizeof(sid_str));
 
        /* Display response */
 
@@ -563,12 +663,13 @@ static bool wbinfo_domain_info(const char *domain)
        d_printf("Active Directory  : %s\n",
                 (dinfo->domain_flags & WBC_DOMINFO_DOMAIN_AD) ? "Yes" : "No");
        d_printf("Native            : %s\n",
-                (dinfo->domain_flags & WBC_DOMINFO_DOMAIN_NATIVE) ? "Yes" : "No");
+                (dinfo->domain_flags & WBC_DOMINFO_DOMAIN_NATIVE) ?
+                "Yes" : "No");
 
        d_printf("Primary           : %s\n",
-                (dinfo->domain_flags & WBC_DOMINFO_DOMAIN_PRIMARY) ? "Yes" : "No");
+                (dinfo->domain_flags & WBC_DOMINFO_DOMAIN_PRIMARY) ?
+                "Yes" : "No");
 
-       wbcFreeMemory(sid_str);
        wbcFreeMemory(dinfo);
 
        return true;
@@ -587,9 +688,9 @@ static bool wbinfo_getdcname(const char *domain_name)
 
        /* Send request */
 
-       if (winbindd_request_response(WINBINDD_GETDCNAME, &request, &response) !=
-           NSS_STATUS_SUCCESS) {
-               d_fprintf(stderr, "Could not get dc name for %s\n", domain_name);
+       if (winbindd_request_response(NULL, WINBINDD_GETDCNAME, &request,
+                                     &response) != NSS_STATUS_SUCCESS) {
+               d_fprintf(stderr, "Could not get dc name for %s\n",domain_name);
                return false;
        }
 
@@ -603,58 +704,159 @@ static bool wbinfo_getdcname(const char *domain_name)
 /* Find a DC */
 static bool wbinfo_dsgetdcname(const char *domain_name, uint32_t flags)
 {
-       struct winbindd_request request;
-       struct winbindd_response response;
+       wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
+       struct wbcDomainControllerInfoEx *dc_info;
+       char *str = NULL;
 
-       ZERO_STRUCT(request);
-       ZERO_STRUCT(response);
+       wbc_status = wbcLookupDomainControllerEx(domain_name, NULL, NULL,
+                                                flags | DS_DIRECTORY_SERVICE_REQUIRED,
+                                                &dc_info);
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
+               printf("Could not find dc for %s\n", domain_name);
+               return false;
+       }
 
-       fstrcpy(request.data.dsgetdcname.domain_name, domain_name);
-       request.data.dsgetdcname.flags = flags;
+       wbcGuidToString(dc_info->domain_guid, &str);
 
-       request.flags |= DS_DIRECTORY_SERVICE_REQUIRED;
+       d_printf("%s\n", dc_info->dc_unc);
+       d_printf("%s\n", dc_info->dc_address);
+       d_printf("%d\n", dc_info->dc_address_type);
+       d_printf("%s\n", str);
+       d_printf("%s\n", dc_info->domain_name);
+       d_printf("%s\n", dc_info->forest_name);
+       d_printf("0x%08x\n", dc_info->dc_flags);
+       d_printf("%s\n", dc_info->dc_site_name);
+       d_printf("%s\n", dc_info->client_site_name);
 
-       /* Send request */
+       return true;
+}
+
+/* Check trust account password */
 
-       if (winbindd_request_response(WINBINDD_DSGETDCNAME, &request, &response) !=
-           NSS_STATUS_SUCCESS) {
-               d_fprintf(stderr, "Could not find dc for %s\n", domain_name);
+static bool wbinfo_check_secret(const char *domain)
+{
+       wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
+       struct wbcAuthErrorInfo *error = NULL;
+       const char *domain_name;
+
+       if (domain) {
+               domain_name = domain;
+       } else {
+               domain_name = get_winbind_domain();
+       }
+
+       wbc_status = wbcCheckTrustCredentials(domain_name, &error);
+
+       d_printf("checking the trust secret for domain %s via RPC calls %s\n",
+               domain_name,
+               WBC_ERROR_IS_OK(wbc_status) ? "succeeded" : "failed");
+
+       if (wbc_status == WBC_ERR_AUTH_ERROR) {
+               d_fprintf(stderr, "wbcCheckTrustCredentials(%s): error code was %s (0x%x)\n",
+                         domain_name, error->nt_string, error->nt_status);
+               wbcFreeMemory(error);
+       }
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcCheckTrustCredentials: "
+                         "%s\n", wbcErrorString(wbc_status));
                return false;
        }
 
-       /* Display response */
+       return true;
+}
 
-       d_printf("%s\n", response.data.dsgetdcname.dc_unc);
-       d_printf("%s\n", response.data.dsgetdcname.dc_address);
-       d_printf("%d\n", response.data.dsgetdcname.dc_address_type);
-       d_printf("%s\n", response.data.dsgetdcname.domain_guid);
-       d_printf("%s\n", response.data.dsgetdcname.domain_name);
-       d_printf("%s\n", response.data.dsgetdcname.forest_name);
-       d_printf("0x%08x\n", response.data.dsgetdcname.dc_flags);
-       d_printf("%s\n", response.data.dsgetdcname.dc_site_name);
-       d_printf("%s\n", response.data.dsgetdcname.client_site_name);
+/* Find the currently connected DCs */
+
+static bool wbinfo_dc_info(const char *domain_name)
+{
+       wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
+       size_t i, num_dcs;
+       const char **dc_names, **dc_ips;
+
+       wbc_status = wbcDcInfo(domain_name, &num_dcs,
+                              &dc_names, &dc_ips);
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
+               printf("Could not find dc info %s\n",
+                      domain_name ? domain_name : "our domain");
+               return false;
+       }
+
+       for (i=0; i<num_dcs; i++) {
+               printf("%s (%s)\n", dc_names[i], dc_ips[i]);
+       }
+       wbcFreeMemory(dc_names);
+       wbcFreeMemory(dc_ips);
 
        return true;
 }
 
-/* Check trust account password */
+/* Change trust account password */
 
-static bool wbinfo_check_secret(void)
+static bool wbinfo_change_secret(const char *domain)
 {
        wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
        struct wbcAuthErrorInfo *error = NULL;
+       const char *domain_name;
 
-       wbc_status = wbcCheckTrustCredentials(NULL, &error);
+       if (domain) {
+               domain_name = domain;
+       } else {
+               domain_name = get_winbind_domain();
+       }
+
+       wbc_status = wbcChangeTrustCredentials(domain_name, &error);
 
-       d_printf("checking the trust secret via RPC calls %s\n",
+       d_printf("changing the trust secret for domain %s via RPC calls %s\n",
+               domain_name,
+               WBC_ERROR_IS_OK(wbc_status) ? "succeeded" : "failed");
+
+       if (wbc_status == WBC_ERR_AUTH_ERROR) {
+               d_fprintf(stderr, "wbcChangeTrustCredentials(%s): error code was %s (0x%x)\n",
+                         domain_name, error->nt_string, error->nt_status);
+               wbcFreeMemory(error);
+       }
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcChangeTrustCredentials: "
+                         "%s\n", wbcErrorString(wbc_status));
+               return false;
+       }
+
+       return true;
+}
+
+/* Check DC connection */
+
+static bool wbinfo_ping_dc(const char *domain)
+{
+       wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
+       struct wbcAuthErrorInfo *error = NULL;
+       char *dcname = NULL;
+
+       const char *domain_name;
+
+       if (domain) {
+               domain_name = domain;
+       } else {
+               domain_name = get_winbind_domain();
+       }
+
+       wbc_status = wbcPingDc2(domain_name, &error, &dcname);
+
+       d_printf("checking the NETLOGON for domain[%s] dc connection to \"%s\" %s\n",
+                domain_name ? domain_name : "",
+                dcname ? dcname : "",
                 WBC_ERROR_IS_OK(wbc_status) ? "succeeded" : "failed");
 
+       wbcFreeMemory(dcname);
        if (wbc_status == WBC_ERR_AUTH_ERROR) {
-               d_fprintf(stderr, "error code was %s (0x%x)\n",
-                         error->nt_string, error->nt_status);
+               d_fprintf(stderr, "wbcPingDc2(%s): error code was %s (0x%x)\n",
+                         domain_name, error->nt_string, error->nt_status);
                wbcFreeMemory(error);
+               return false;
        }
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcPingDc: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
@@ -667,26 +869,23 @@ static bool wbinfo_uid_to_sid(uid_t uid)
 {
        wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
        struct wbcDomainSid sid;
-       char *sid_str = NULL;
+       char sid_str[WBC_SID_STRING_BUFLEN];
 
        /* Send request */
 
        wbc_status = wbcUidToSid(uid, &sid);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcUidToSid: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
-       wbc_status = wbcSidToString(&sid, &sid_str);
-       if (!WBC_ERROR_IS_OK(wbc_status)) {
-               return false;
-       }
+       wbcSidToStringBuf(&sid, sid_str, sizeof(sid_str));
 
        /* Display response */
 
        d_printf("%s\n", sid_str);
 
-       wbcFreeMemory(sid_str);
-
        return true;
 }
 
@@ -696,26 +895,23 @@ static bool wbinfo_gid_to_sid(gid_t gid)
 {
        wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
        struct wbcDomainSid sid;
-       char *sid_str = NULL;
+       char sid_str[WBC_SID_STRING_BUFLEN];
 
        /* Send request */
 
        wbc_status = wbcGidToSid(gid, &sid);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcGidToSid: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
-       wbc_status = wbcSidToString(&sid, &sid_str);
-       if (!WBC_ERROR_IS_OK(wbc_status)) {
-               return false;
-       }
+       wbcSidToStringBuf(&sid, sid_str, sizeof(sid_str));
 
        /* Display response */
 
        d_printf("%s\n", sid_str);
 
-       wbcFreeMemory(sid_str);
-
        return true;
 }
 
@@ -731,11 +927,15 @@ static bool wbinfo_sid_to_uid(const char *sid_str)
 
        wbc_status = wbcStringToSid(sid_str, &sid);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcStringToSid: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
        wbc_status = wbcSidToUid(&sid, &uid);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcSidToUid: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
@@ -756,11 +956,15 @@ static bool wbinfo_sid_to_gid(const char *sid_str)
 
        wbc_status = wbcStringToSid(sid_str, &sid);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcStringToSid: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
        wbc_status = wbcSidToGid(&sid, &gid);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcSidToGid: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
@@ -771,6 +975,77 @@ static bool wbinfo_sid_to_gid(const char *sid_str)
        return true;
 }
 
+static bool wbinfo_sids_to_unix_ids(const char *arg)
+{
+       char sidstr[WBC_SID_STRING_BUFLEN];
+       struct wbcDomainSid *sids;
+       struct wbcUnixId *unix_ids;
+       int i, num_sids;
+       const char *p;
+       wbcErr wbc_status;
+
+
+       num_sids = 0;
+       sids = NULL;
+       p = arg;
+
+       while (next_token(&p, sidstr, LIST_SEP, sizeof(sidstr))) {
+               sids = talloc_realloc(talloc_tos(), sids, struct wbcDomainSid,
+                                     num_sids+1);
+               if (sids == NULL) {
+                       d_fprintf(stderr, "talloc failed\n");
+                       return false;
+               }
+               wbc_status = wbcStringToSid(sidstr, &sids[num_sids]);
+               if (!WBC_ERROR_IS_OK(wbc_status)) {
+                       d_fprintf(stderr, "wbcSidToString(%s) failed: %s\n",
+                                 sidstr, wbcErrorString(wbc_status));
+                       TALLOC_FREE(sids);
+                       return false;
+               }
+               num_sids += 1;
+       }
+
+       unix_ids = talloc_array(talloc_tos(), struct wbcUnixId, num_sids);
+       if (unix_ids == NULL) {
+               TALLOC_FREE(sids);
+               return false;
+       }
+
+       wbc_status = wbcSidsToUnixIds(sids, num_sids, unix_ids);
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "wbcSidsToUnixIds failed: %s\n",
+                         wbcErrorString(wbc_status));
+               TALLOC_FREE(sids);
+               return false;
+       }
+
+       for (i=0; i<num_sids; i++) {
+
+               wbcSidToStringBuf(&sids[i], sidstr, sizeof(sidstr));
+
+               switch(unix_ids[i].type) {
+               case WBC_ID_TYPE_UID:
+                       d_printf("%s -> uid %d\n", sidstr, unix_ids[i].id.uid);
+                       break;
+               case WBC_ID_TYPE_GID:
+                       d_printf("%s -> gid %d\n", sidstr, unix_ids[i].id.gid);
+                       break;
+               case WBC_ID_TYPE_BOTH:
+                       d_printf("%s -> uid/gid %d\n", sidstr, unix_ids[i].id.uid);
+                       break;
+               default:
+                       d_printf("%s -> unmapped\n", sidstr);
+                       break;
+               }
+       }
+
+       TALLOC_FREE(sids);
+       TALLOC_FREE(unix_ids);
+
+       return true;
+}
+
 static bool wbinfo_allocate_uid(void)
 {
        wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
@@ -780,12 +1055,14 @@ static bool wbinfo_allocate_uid(void)
 
        wbc_status = wbcAllocateUid(&uid);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcAllocateUid: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
        /* Display response */
 
-       d_printf("New uid: %d\n", uid);
+       d_printf("New uid: %u\n", (unsigned int)uid);
 
        return true;
 }
@@ -799,12 +1076,14 @@ static bool wbinfo_allocate_gid(void)
 
        wbc_status = wbcAllocateGid(&gid);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcAllocateGid: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
        /* Display response */
 
-       d_printf("New gid: %d\n", gid);
+       d_printf("New gid: %u\n", (unsigned int)gid);
 
        return true;
 }
@@ -818,17 +1097,22 @@ static bool wbinfo_set_uid_mapping(uid_t uid, const char *sid_str)
 
        wbc_status = wbcStringToSid(sid_str, &sid);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcStringToSid: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
        wbc_status = wbcSetUidMapping(uid, &sid);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcSetUidMapping: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
        /* Display response */
 
-       d_printf("uid %d now mapped to sid %s\n", uid, sid_str);
+       d_printf("uid %u now mapped to sid %s\n",
+               (unsigned int)uid, sid_str);
 
        return true;
 }
@@ -842,17 +1126,22 @@ static bool wbinfo_set_gid_mapping(gid_t gid, const char *sid_str)
 
        wbc_status = wbcStringToSid(sid_str, &sid);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcStringToSid: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
        wbc_status = wbcSetGidMapping(gid, &sid);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcSetGidMapping: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
        /* Display response */
 
-       d_printf("gid %d now mapped to sid %s\n", gid, sid_str);
+       d_printf("gid %u now mapped to sid %s\n",
+               (unsigned int)gid, sid_str);
 
        return true;
 }
@@ -866,17 +1155,22 @@ static bool wbinfo_remove_uid_mapping(uid_t uid, const char *sid_str)
 
        wbc_status = wbcStringToSid(sid_str, &sid);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcStringToSid: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
        wbc_status = wbcRemoveUidMapping(uid, &sid);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcRemoveUidMapping: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
        /* Display response */
 
-       d_printf("Removed uid %d to sid %s mapping\n", uid, sid_str);
+       d_printf("Removed uid %u to sid %s mapping\n",
+               (unsigned int)uid, sid_str);
 
        return true;
 }
@@ -890,17 +1184,22 @@ static bool wbinfo_remove_gid_mapping(gid_t gid, const char *sid_str)
 
        wbc_status = wbcStringToSid(sid_str, &sid);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcStringToSid: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
        wbc_status = wbcRemoveGidMapping(gid, &sid);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcRemoveGidMapping: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
        /* Display response */
 
-       d_printf("Removed gid %d to sid %s mapping\n", gid, sid_str);
+       d_printf("Removed gid %u to sid %s mapping\n",
+               (unsigned int)gid, sid_str);
 
        return true;
 }
@@ -919,18 +1218,29 @@ static bool wbinfo_lookupsid(const char *sid_str)
 
        wbc_status = wbcStringToSid(sid_str, &sid);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcStringToSid: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
        wbc_status = wbcLookupSid(&sid, &domain, &name, &type);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcLookupSid: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
        /* Display response */
 
-       d_printf("%s%c%s %d\n",
-                domain, winbind_separator(), name, type);
+       if (type == WBC_SID_NAME_DOMAIN) {
+               d_printf("%s %d\n", domain, type);
+       } else {
+               d_printf("%s%c%s %d\n",
+                        domain, winbind_separator(), name, type);
+       }
+
+       wbcFreeMemory(domain);
+       wbcFreeMemory(name);
 
        return true;
 }
@@ -949,11 +1259,15 @@ static bool wbinfo_lookupsid_fullname(const char *sid_str)
 
        wbc_status = wbcStringToSid(sid_str, &sid);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcStringToSid: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
        wbc_status = wbcGetDisplayName(&sid, &domain, &name, &type);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcGetDisplayName: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
@@ -962,6 +1276,9 @@ static bool wbinfo_lookupsid_fullname(const char *sid_str)
        d_printf("%s%c%s %d\n",
                 domain, winbind_separator(), name, type);
 
+       wbcFreeMemory(domain);
+       wbcFreeMemory(name);
+
        return true;
 }
 
@@ -976,13 +1293,13 @@ static bool wbinfo_lookuprids(const char *domain, const char *arg)
        enum wbcSidType *types = NULL;
        size_t i;
        int num_rids;
-       uint32 *rids = NULL;
+       uint32_t *rids = NULL;
        const char *p;
        char *ridstr;
        TALLOC_CTX *mem_ctx = NULL;
        bool ret = false;
 
-       if ((domain == NULL) || (strequal(domain, ".")) || (domain[0] == '\0')) {
+       if ((domain == NULL) || (strequal(domain, ".")) || (domain[0] == '\0')){
                domain = get_winbind_domain();
        }
 
@@ -1006,8 +1323,13 @@ static bool wbinfo_lookuprids(const char *domain, const char *arg)
        p = arg;
 
        while (next_token_talloc(mem_ctx, &p, &ridstr, " ,\n")) {
-               uint32 rid = strtoul(ridstr, NULL, 10);
-               ADD_TO_ARRAY(mem_ctx, uint32, rid, &rids, &num_rids);
+               uint32_t rid = strtoul(ridstr, NULL, 10);
+               rids = talloc_realloc(mem_ctx, rids, uint32_t, num_rids + 1);
+               if (rids == NULL) {
+                       d_printf("talloc_realloc failed\n");
+               }
+               rids[num_rids] = rid;
+               num_rids += 1;
        }
 
        if (rids == NULL) {
@@ -1016,36 +1338,100 @@ static bool wbinfo_lookuprids(const char *domain, const char *arg)
        }
 
        wbc_status = wbcLookupRids(&dinfo->sid, num_rids, rids,
-                                  (const char **)&domain_name, &names, &types);
+                                  &p, &names, &types);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
                d_printf("winbind_lookup_rids failed: %s\n",
                         wbcErrorString(wbc_status));
                goto done;
        }
 
+       domain_name = discard_const_p(char, p);
        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]));
+                        wbcSidTypeString(types[i]));
        }
 
        ret = true;
 done:
-       if (dinfo) {
-               wbcFreeMemory(dinfo);
-       }
-       if (domain_name) {
-               wbcFreeMemory(domain_name);
+       wbcFreeMemory(dinfo);
+       wbcFreeMemory(domain_name);
+       wbcFreeMemory(names);
+       wbcFreeMemory(types);
+       TALLOC_FREE(mem_ctx);
+       return ret;
+}
+
+static bool wbinfo_lookup_sids(const char *arg)
+{
+       char sidstr[WBC_SID_STRING_BUFLEN];
+       struct wbcDomainSid *sids;
+       struct wbcDomainInfo *domains;
+       struct wbcTranslatedName *names;
+       int num_domains;
+       int i, num_sids;
+       const char *p;
+       wbcErr wbc_status;
+
+
+       num_sids = 0;
+       sids = NULL;
+       p = arg;
+
+       while (next_token(&p, sidstr, LIST_SEP, sizeof(sidstr))) {
+               sids = talloc_realloc(talloc_tos(), sids, struct wbcDomainSid,
+                                     num_sids+1);
+               if (sids == NULL) {
+                       d_fprintf(stderr, "talloc failed\n");
+                       return false;
+               }
+               wbc_status = wbcStringToSid(sidstr, &sids[num_sids]);
+               if (!WBC_ERROR_IS_OK(wbc_status)) {
+                       d_fprintf(stderr, "wbcSidToString(%s) failed: %s\n",
+                                 sidstr, wbcErrorString(wbc_status));
+                       TALLOC_FREE(sids);
+                       return false;
+               }
+               num_sids += 1;
        }
-       if (names) {
-               wbcFreeMemory(names);
+
+       wbc_status = wbcLookupSids(sids, num_sids, &domains, &num_domains,
+                                  &names);
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "wbcLookupSids failed: %s\n",
+                         wbcErrorString(wbc_status));
+               TALLOC_FREE(sids);
+               return false;
        }
-       if (types) {
-               wbcFreeMemory(types);
+
+       for (i=0; i<num_sids; i++) {
+               const char *domain = NULL;
+
+               wbcSidToStringBuf(&sids[i], sidstr, sizeof(sidstr));
+
+               if (names[i].domain_index >= num_domains) {
+                       domain = "<none>";
+               } else if (names[i].domain_index < 0) {
+                       domain = "<none>";
+               } else {
+                       domain = domains[names[i].domain_index].short_name;
+               }
+
+               if (names[i].type == WBC_SID_NAME_DOMAIN) {
+                       d_printf("%s -> %s %d\n", sidstr,
+                                domain,
+                                names[i].type);
+               } else {
+                       d_printf("%s -> %s%c%s %d\n", sidstr,
+                                domain,
+                                winbind_separator(),
+                                names[i].name, names[i].type);
+               }
        }
-       TALLOC_FREE(mem_ctx);
-       return ret;
+       wbcFreeMemory(names);
+       wbcFreeMemory(domains);
+       return true;
 }
 
 /* Convert string to sid */
@@ -1054,7 +1440,7 @@ static bool wbinfo_lookupname(const char *full_name)
 {
        wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
        struct wbcDomainSid sid;
-       char *sid_str;
+       char sid_str[WBC_SID_STRING_BUFLEN];
        enum wbcSidType type;
        fstring domain_name;
        fstring account_name;
@@ -1067,30 +1453,29 @@ static bool wbinfo_lookupname(const char *full_name)
        wbc_status = wbcLookupName(domain_name, account_name,
                                   &sid, &type);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcLookupName: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
-       wbc_status = wbcSidToString(&sid, &sid_str);
-       if (!WBC_ERROR_IS_OK(wbc_status)) {
-               return false;
-       }
+       wbcSidToStringBuf(&sid, sid_str, sizeof(sid_str));
 
        /* Display response */
 
-       d_printf("%s %s (%d)\n", sid_str, sid_type_lookup(type), type);
-
-       wbcFreeMemory(sid_str);
+       d_printf("%s %s (%d)\n", sid_str, wbcSidTypeString(type), type);
 
        return true;
 }
 
-static char *wbinfo_prompt_pass(const char *prefix,
+static char *wbinfo_prompt_pass(TALLOC_CTX *mem_ctx,
+                               const char *prefix,
                                const char *username)
 {
        char *prompt;
-       const char *ret = NULL;
+       char buf[1024] = {0};
+       int rc;
 
-       prompt = talloc_asprintf(talloc_tos(), "Enter %s's ", username);
+       prompt = talloc_asprintf(mem_ctx, "Enter %s's ", username);
        if (!prompt) {
                return NULL;
        }
@@ -1105,76 +1490,137 @@ static char *wbinfo_prompt_pass(const char *prefix,
                return NULL;
        }
 
-       ret = getpass(prompt);
+       rc = samba_getpass(prompt, buf, sizeof(buf), false, false);
        TALLOC_FREE(prompt);
+       if (rc < 0) {
+               return NULL;
+       }
 
-       return SMB_STRDUP(ret);
+       return talloc_strdup(mem_ctx, buf);
 }
 
 /* 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;
-       NSS_STATUS result;
-       char *p;
-       char *password;
-
-       /* Send off request */
-
-       ZERO_STRUCT(request);
-       ZERO_STRUCT(response);
+       wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
+       char *s = NULL;
+       char *p = NULL;
+       char *password = NULL;
+       char *name = NULL;
+       char *local_cctype = NULL;
+       uid_t uid;
+       struct wbcLogonUserParams params;
+       struct wbcLogonUserInfo *info;
+       struct wbcAuthErrorInfo *error;
+       struct wbcUserPasswordPolicyInfo *policy;
+       TALLOC_CTX *frame = talloc_tos();
 
-       p = strchr(username, '%');
+       if ((s = talloc_strdup(frame, username)) == NULL) {
+               return false;
+       }
 
-       if (p) {
+       if ((p = strchr(s, '%')) != NULL) {
                *p = 0;
-               fstrcpy(request.data.auth.user, username);
-               fstrcpy(request.data.auth.pass, p + 1);
-               *p = '%';
+               p++;
+               password = talloc_strdup(frame, p);
        } else {
-               fstrcpy(request.data.auth.user, username);
-               password = wbinfo_prompt_pass(NULL, username);
-               fstrcpy(request.data.auth.pass, password);
-               SAFE_FREE(password);
+               password = wbinfo_prompt_pass(frame, NULL, username);
        }
 
-       request.flags = flags;
+       local_cctype = talloc_strdup(frame, cctype);
 
-       fstrcpy(request.data.auth.krb5_cc_type, cctype);
+       name = s;
 
-       request.data.auth.uid = geteuid();
+       uid = geteuid();
 
-       result = winbindd_request_response(WINBINDD_PAM_AUTH, &request, &response);
+       params.username = name;
+       params.password = password;
+       params.num_blobs = 0;
+       params.blobs = NULL;
 
-       /* Display response */
+       wbc_status = wbcAddNamedBlob(&params.num_blobs,
+                                    &params.blobs,
+                                    "flags",
+                                    0,
+                                    (uint8_t *)&flags,
+                                    sizeof(flags));
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcAddNamedBlob: %s\n",
+                         wbcErrorString(wbc_status));
+               goto done;
+       }
 
-       d_printf("plaintext kerberos password authentication for [%s] %s (requesting cctype: %s)\n",
-               username, (result == NSS_STATUS_SUCCESS) ? "succeeded" : "failed", cctype);
+       wbc_status = wbcAddNamedBlob(&params.num_blobs,
+                                    &params.blobs,
+                                    "user_uid",
+                                    0,
+                                    (uint8_t *)&uid,
+                                    sizeof(uid));
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcAddNamedBlob: %s\n",
+                         wbcErrorString(wbc_status));
+               goto done;
+       }
 
-       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);
+       wbc_status = wbcAddNamedBlob(&params.num_blobs,
+                                    &params.blobs,
+                                    "krb5_cc_type",
+                                    0,
+                                    (uint8_t *)local_cctype,
+                                    strlen(cctype)+1);
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcAddNamedBlob: %s\n",
+                         wbcErrorString(wbc_status));
+               goto done;
+       }
+
+       wbc_status = wbcLogonUser(&params, &info, &error, &policy);
 
-       if (result == NSS_STATUS_SUCCESS) {
+       d_printf("plaintext kerberos password authentication for [%s] %s "
+                "(requesting cctype: %s)\n",
+                username, WBC_ERROR_IS_OK(wbc_status) ? "succeeded" : "failed",
+                cctype);
 
-               if (request.flags & WBFLAG_PAM_INFO3_TEXT) {
-                       if (response.data.auth.info3.user_flgs & NETLOGON_CACHED_ACCOUNT) {
-                               d_printf("user_flgs: NETLOGON_CACHED_ACCOUNT\n");
+       if (error) {
+               d_fprintf(stderr,
+                        "wbcLogonUser(%s): error code was %s (0x%x)\n"
+                        "error message was: %s\n",
+                        params.username, error->nt_string,
+                        error->nt_status,
+                        error->display_string);
+       }
+
+       if (WBC_ERROR_IS_OK(wbc_status)) {
+               if (flags & WBFLAG_PAM_INFO3_TEXT) {
+                       if (info && info->info && info->info->user_flags &
+                           NETLOGON_CACHED_ACCOUNT) {
+                               d_printf("user_flgs: "
+                                        "NETLOGON_CACHED_ACCOUNT\n");
                        }
                }
 
-               if (response.data.auth.krb5ccname[0] != '\0') {
-                       d_printf("credentials were put in: %s\n", response.data.auth.krb5ccname);
+               if (info) {
+                       int i;
+                       for (i=0; i < info->num_blobs; i++) {
+                               if (strequal(info->blobs[i].name,
+                                            "krb5ccname")) {
+                                       d_printf("credentials were put "
+                                                "in: %s\n",
+                                               (const char *)
+                                                     info->blobs[i].blob.data);
+                                       break;
+                               }
+                       }
                } else {
                        d_printf("no credentials cached\n");
                }
        }
+ done:
 
-       return result == NSS_STATUS_SUCCESS;
+       wbcFreeMemory(params.blobs);
+
+       return WBC_ERROR_IS_OK(wbc_status);
 }
 
 /* Authenticate a user with a plaintext password */
@@ -1186,17 +1632,18 @@ static bool wbinfo_auth(char *username)
        char *p = NULL;
        char *password = NULL;
        char *name = NULL;
+       TALLOC_CTX *frame = talloc_tos();
 
-       if ((s = SMB_STRDUP(username)) == NULL) {
+       if ((s = talloc_strdup(frame, username)) == NULL) {
                return false;
        }
 
        if ((p = strchr(s, '%')) != NULL) {
                *p = 0;
                p++;
-               password = SMB_STRDUP(p);
+               password = talloc_strdup(frame, p);
        } else {
-               password = wbinfo_prompt_pass(NULL, username);
+               password = wbinfo_prompt_pass(frame, NULL, username);
        }
 
        name = s;
@@ -1208,21 +1655,19 @@ static bool wbinfo_auth(char *username)
 
 #if 0
        if (response.data.auth.nt_status)
-               d_fprintf(stderr, "error code was %s (0x%x)\nerror messsage was: %s\n",
+               d_fprintf(stderr,
+                        "error code was %s (0x%x)\nerror message was: %s\n",
                         response.data.auth.nt_status_string,
                         response.data.auth.nt_status,
                         response.data.auth.error_string);
 #endif
 
-       SAFE_FREE(s);
-       SAFE_FREE(password);
-
        return WBC_ERROR_IS_OK(wbc_status);
 }
 
 /* Authenticate a user with a challenge/response */
 
-static bool wbinfo_auth_crap(char *username)
+static bool wbinfo_auth_crap(char *username, bool use_ntlmv2, bool use_lanman)
 {
        wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
        struct wbcAuthUserParams params;
@@ -1234,14 +1679,15 @@ static bool wbinfo_auth_crap(char *username)
        fstring name_domain;
        char *pass;
        char *p;
+       TALLOC_CTX *frame = talloc_tos();
 
        p = strchr(username, '%');
 
        if (p) {
                *p = 0;
-               pass = SMB_STRDUP(p + 1);
+               pass = talloc_strdup(frame, p + 1);
        } else {
-               pass = wbinfo_prompt_pass(NULL, username);
+               pass = wbinfo_prompt_pass(frame, NULL, username);
        }
 
        parse_wbinfo_domain_user(username, name_domain, name_user);
@@ -1258,31 +1704,35 @@ static bool wbinfo_auth_crap(char *username)
 
        generate_random_buffer(params.password.response.challenge, 8);
 
-       if (lp_client_ntlmv2_auth()) {
+       if (use_ntlmv2) {
                DATA_BLOB server_chal;
                DATA_BLOB names_blob;
 
                server_chal = data_blob(params.password.response.challenge, 8);
 
                /* Pretend this is a login to 'us', for blob purposes */
-               names_blob = NTLMv2_generate_names_blob(global_myname(), lp_workgroup());
+               names_blob = NTLMv2_generate_names_blob(NULL,
+                                               get_winbind_netbios_name(),
+                                               get_winbind_domain());
 
-               if (!SMBNTLMv2encrypt(name_user, name_domain, pass, &server_chal,
+               if (!SMBNTLMv2encrypt(NULL, name_user, name_domain, pass,
+                                     &server_chal,
                                      &names_blob,
-                                     &lm, &nt, NULL)) {
+                                     &lm, &nt, NULL, NULL)) {
                        data_blob_free(&names_blob);
                        data_blob_free(&server_chal);
-                       SAFE_FREE(pass);
+                       TALLOC_FREE(pass);
                        return false;
                }
                data_blob_free(&names_blob);
                data_blob_free(&server_chal);
 
        } else {
-               if (lp_client_lanman_auth()) {
+               if (use_lanman) {
                        bool ok;
                        lm = data_blob(NULL, 24);
-                       ok = SMBencrypt(pass, params.password.response.challenge,
+                       ok = SMBencrypt(pass,
+                                       params.password.response.challenge,
                                        lm.data);
                        if (!ok) {
                                data_blob_free(&lm);
@@ -1306,7 +1756,12 @@ static bool wbinfo_auth_crap(char *username)
                 WBC_ERROR_IS_OK(wbc_status) ? "succeeded" : "failed");
 
        if (wbc_status == WBC_ERR_AUTH_ERROR) {
-               d_fprintf(stderr, "error code was %s (0x%x)\nerror messsage was: %s\n",
+               d_fprintf(stderr,
+                        "wbcAuthenticateUserEx(%s%c%s): error code was %s (0x%x)\n"
+                        "error message was: %s\n",
+                        name_domain,
+                        winbind_separator(),
+                        name_user,
                         err->nt_string,
                         err->nt_status,
                         err->display_string);
@@ -1317,11 +1772,157 @@ static bool wbinfo_auth_crap(char *username)
 
        data_blob_free(&nt);
        data_blob_free(&lm);
-       SAFE_FREE(pass);
 
        return WBC_ERROR_IS_OK(wbc_status);
 }
 
+/* Authenticate a user with a plaintext password */
+
+static bool wbinfo_pam_logon(char *username, bool verbose)
+{
+       wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
+       struct wbcLogonUserParams params;
+       struct wbcLogonUserInfo *info = NULL;
+       struct wbcAuthErrorInfo *error = NULL;
+       char *s = NULL;
+       char *p = NULL;
+       TALLOC_CTX *frame = talloc_tos();
+       uint32_t flags;
+       uint32_t uid;
+
+       ZERO_STRUCT(params);
+
+       if ((s = talloc_strdup(frame, username)) == NULL) {
+               return false;
+       }
+
+       if ((p = strchr(s, '%')) != NULL) {
+               *p = 0;
+               p++;
+               params.password = talloc_strdup(frame, p);
+       } else {
+               params.password = wbinfo_prompt_pass(frame, NULL, username);
+       }
+       params.username = s;
+
+       flags = WBFLAG_PAM_CACHED_LOGIN;
+
+       wbc_status = wbcAddNamedBlob(&params.num_blobs, &params.blobs,
+                                    "flags", 0,
+                                    (uint8_t *)&flags, sizeof(flags));
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_printf("wbcAddNamedBlob failed: %s\n",
+                        wbcErrorString(wbc_status));
+               return false;
+       }
+
+       uid = getuid();
+
+       wbc_status = wbcAddNamedBlob(&params.num_blobs, &params.blobs,
+                                    "user_uid", 0,
+                                    (uint8_t *)&uid, sizeof(uid));
+       if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_printf("wbcAddNamedBlob failed: %s\n",
+                        wbcErrorString(wbc_status));
+               return false;
+       }
+
+       wbc_status = wbcLogonUser(&params, &info, &error, NULL);
+
+       if (verbose && (info != NULL)) {
+               struct wbcAuthUserInfo *i = info->info;
+
+               if (i->account_name != NULL) {
+                       d_printf("account_name: %s\n", i->account_name);
+               }
+               if (i->user_principal != NULL) {
+                       d_printf("user_principal: %s\n", i->user_principal);
+               }
+               if (i->full_name != NULL) {
+                       d_printf("full_name: %s\n", i->full_name);
+               }
+               if (i->domain_name != NULL) {
+                       d_printf("domain_name: %s\n", i->domain_name);
+               }
+               if (i->dns_domain_name != NULL) {
+                       d_printf("dns_domain_name: %s\n", i->dns_domain_name);
+               }
+               if (i->logon_server != NULL) {
+                       d_printf("logon_server: %s\n", i->logon_server);
+               }
+               if (i->logon_script != NULL) {
+                       d_printf("logon_script: %s\n", i->logon_script);
+               }
+               if (i->profile_path != NULL) {
+                       d_printf("profile_path: %s\n", i->profile_path);
+               }
+               if (i->home_directory != NULL) {
+                       d_printf("home_directory: %s\n", i->home_directory);
+               }
+               if (i->home_drive != NULL) {
+                       d_printf("home_drive: %s\n", i->home_drive);
+               }
+
+               wbcFreeMemory(info);
+               info = NULL;
+       }
+
+       wbcFreeMemory(params.blobs);
+
+       d_printf("plaintext password authentication %s\n",
+                WBC_ERROR_IS_OK(wbc_status) ? "succeeded" : "failed");
+
+       if (!WBC_ERROR_IS_OK(wbc_status) && (error != NULL)) {
+               d_fprintf(stderr,
+                         "wbcLogonUser(%s): error code was %s (0x%x)\n"
+                         "error message was: %s\n",
+                         params.username,
+                         error->nt_string,
+                         (int)error->nt_status,
+                         error->display_string);
+               wbcFreeMemory(error);
+       }
+       return WBC_ERROR_IS_OK(wbc_status);
+}
+
+/* Save creds with winbind */
+
+static bool wbinfo_ccache_save(char *username)
+{
+       wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
+       char *s = NULL;
+       char *p = NULL;
+       char *password = NULL;
+       char *name = NULL;
+       TALLOC_CTX *frame = talloc_stackframe();
+
+       s = talloc_strdup(frame, username);
+       if (s == NULL) {
+               return false;
+       }
+
+       p = strchr(s, '%');
+       if (p != NULL) {
+               *p = 0;
+               p++;
+               password = talloc_strdup(frame, p);
+       } else {
+               password = wbinfo_prompt_pass(frame, NULL, username);
+       }
+
+       name = s;
+
+       wbc_status = wbcCredentialSave(name, password);
+
+       d_printf("saving creds %s\n",
+                WBC_ERROR_IS_OK(wbc_status) ? "succeeded" : "failed");
+
+       TALLOC_FREE(frame);
+
+       return WBC_ERROR_IS_OK(wbc_status);
+}
+
+#ifdef WITH_FAKE_KASERVER
 /* Authenticate a user with a plaintext password and set a token */
 
 static bool wbinfo_klog(char *username)
@@ -1345,12 +1946,16 @@ static bool wbinfo_klog(char *username)
                *p = '%';
        } else {
                fstrcpy(request.data.auth.user, username);
-               fstrcpy(request.data.auth.pass, getpass("Password: "));
+               (void) samba_getpass("Password: ",
+                                    request.data.auth.pass,
+                                    sizeof(request.data.auth.pass),
+                                    false, false);
        }
 
        request.flags |= WBFLAG_PAM_AFS_TOKEN;
 
-       result = winbindd_request_response(WINBINDD_PAM_AUTH, &request, &response);
+       result = winbindd_request_response(NULL, WINBINDD_PAM_AUTH, &request,
+                                          &response);
 
        /* Display response */
 
@@ -1358,7 +1963,8 @@ static bool wbinfo_klog(char *username)
                 (result == NSS_STATUS_SUCCESS) ? "succeeded" : "failed");
 
        if (response.data.auth.nt_status)
-               d_fprintf(stderr, "error code was %s (0x%x)\nerror messsage was: %s\n",
+               d_fprintf(stderr,
+                        "error code was %s (0x%x)\nerror message was: %s\n",
                         response.data.auth.nt_status_string,
                         response.data.auth.nt_status,
                         response.data.auth.error_string);
@@ -1379,6 +1985,13 @@ static bool wbinfo_klog(char *username)
        d_printf("Successfully created AFS token\n");
        return true;
 }
+#else
+static bool wbinfo_klog(char *username)
+{
+       d_fprintf(stderr, "No AFS support compiled in.\n");
+       return false;
+}
+#endif
 
 /* Print domain users */
 
@@ -1391,9 +2004,16 @@ static bool print_domain_users(const char *domain)
 
        /* Send request to winbind daemon */
 
-       /* '.' is the special sign for our own domain */
-       if (domain && strcmp(domain, ".") == 0) {
+       if (domain == NULL) {
                domain = get_winbind_domain();
+       } else {
+               /* '.' is the special sign for our own domain */
+               if ((domain[0] == '\0') || strcmp(domain, ".") == 0) {
+                       domain = get_winbind_domain();
+               /* '*' is the special sign for all domains */
+               } else if (strcmp(domain, "*") == 0) {
+                       domain = NULL;
+               }
        }
 
        wbc_status = wbcListUsers(domain, &num_users, &users);
@@ -1421,13 +2041,22 @@ static bool print_domain_groups(const char *domain)
 
        /* Send request to winbind daemon */
 
-       /* '.' is the special sign for our own domain */
-       if (domain && strcmp(domain, ".") == 0) {
+       if (domain == NULL) {
                domain = get_winbind_domain();
+       } else {
+               /* '.' is the special sign for our own domain */
+               if ((domain[0] == '\0') || strcmp(domain, ".") == 0) {
+                       domain = get_winbind_domain();
+               /* '*' is the special sign for all domains */
+               } else if (strcmp(domain, "*") == 0) {
+                       domain = NULL;
+               }
        }
 
        wbc_status = wbcListGroups(domain, &num_groups, &groups);
        if (!WBC_ERROR_IS_OK(wbc_status)) {
+               d_fprintf(stderr, "failed to call wbcListGroups: %s\n",
+                         wbcErrorString(wbc_status));
                return false;
        }
 
@@ -1444,92 +2073,15 @@ static bool print_domain_groups(const char *domain)
 
 static bool wbinfo_set_auth_user(char *username)
 {
-       const char *password;
-       char *p;
-       fstring user, domain;
-
-       /* Separate into user and password */
-
-       parse_wbinfo_domain_user(username, domain, user);
-
-       p = strchr(user, '%');
-
-       if (p != NULL) {
-               *p = 0;
-               password = p+1;
-       } else {
-               char *thepass = getpass("Password: ");
-               if (thepass) {
-                       password = thepass;
-               } else
-                       password = "";
-       }
-
-       /* Store or remove DOMAIN\username%password in secrets.tdb */
-
-       secrets_init();
-
-       if (user[0]) {
-
-               if (!secrets_store(SECRETS_AUTH_USER, user,
-                                  strlen(user) + 1)) {
-                       d_fprintf(stderr, "error storing username\n");
-                       return false;
-               }
-
-               /* We always have a domain name added by the
-                  parse_wbinfo_domain_user() function. */
-
-               if (!secrets_store(SECRETS_AUTH_DOMAIN, domain,
-                                  strlen(domain) + 1)) {
-                       d_fprintf(stderr, "error storing domain name\n");
-                       return false;
-               }
-
-       } else {
-               secrets_delete(SECRETS_AUTH_USER);
-               secrets_delete(SECRETS_AUTH_DOMAIN);
-       }
-
-       if (password[0]) {
-
-               if (!secrets_store(SECRETS_AUTH_PASSWORD, password,
-                                  strlen(password) + 1)) {
-                       d_fprintf(stderr, "error storing password\n");
-                       return false;
-               }
-
-       } else
-               secrets_delete(SECRETS_AUTH_PASSWORD);
-
-       return true;
+       d_fprintf(stderr, "This functionality was moved to the 'net' utility.\n"
+                         "See 'net help setauthuser' for details.\n");
+       return false;
 }
 
 static void wbinfo_get_auth_user(void)
 {
-       char *user, *domain, *password;
-
-       /* Lift data from secrets file */
-
-       secrets_fetch_ipc_userpass(&user, &domain, &password);
-
-       if ((!user || !*user) && (!domain || !*domain ) && (!password || !*password)){
-
-               SAFE_FREE(user);
-               SAFE_FREE(domain);
-               SAFE_FREE(password);
-               d_printf("No authorised user configured\n");
-               return;
-       }
-
-       /* Pretty print authorised user info */
-
-       d_printf("%s%s%s%s%s\n", domain ? domain : "", domain ? lp_winbind_separator(): "",
-                user, password ? "%" : "", password ? password : "");
-
-       SAFE_FREE(user);
-       SAFE_FREE(domain);
-       SAFE_FREE(password);
+       d_fprintf(stderr, "This functionality was moved to the 'net' utility.\n"
+                         "See 'net help getauthuser' for details.\n");
 }
 
 static bool wbinfo_ping(void)
@@ -1551,20 +2103,18 @@ static bool wbinfo_change_user_password(const char *username)
        wbcErr wbc_status;
        char *old_password = NULL;
        char *new_password = NULL;
+       TALLOC_CTX *frame = talloc_tos();
 
-       old_password = wbinfo_prompt_pass("old", username);
-       new_password = wbinfo_prompt_pass("new", username);
+       old_password = wbinfo_prompt_pass(frame, "old", username);
+       new_password = wbinfo_prompt_pass(frame, "new", username);
 
-       wbc_status = wbcChangeUserPassword(username, old_password, new_password);
+       wbc_status = wbcChangeUserPassword(username, old_password,new_password);
 
        /* Display response */
 
        d_printf("Password change for user %s %s\n", username,
                WBC_ERROR_IS_OK(wbc_status) ? "succeeded" : "failed");
 
-       SAFE_FREE(old_password);
-       SAFE_FREE(new_password);
-
        return WBC_ERROR_IS_OK(wbc_status);
 }
 
@@ -1577,14 +2127,18 @@ enum {
        OPT_SEQUENCE,
        OPT_GETDCNAME,
        OPT_DSGETDCNAME,
+       OPT_DC_INFO,
        OPT_USERDOMGROUPS,
+       OPT_SIDALIASES,
        OPT_USERSIDS,
+       OPT_LOOKUP_SIDS,
        OPT_ALLOCATE_UID,
        OPT_ALLOCATE_GID,
        OPT_SET_UID_MAPPING,
        OPT_SET_GID_MAPPING,
        OPT_REMOVE_UID_MAPPING,
        OPT_REMOVE_GID_MAPPING,
+       OPT_SIDS_TO_XIDS,
        OPT_SEPARATOR,
        OPT_LIST_ALL_DOMAINS,
        OPT_LIST_OWN_DOMAIN,
@@ -1595,10 +2149,18 @@ enum {
        OPT_VERBOSE,
        OPT_ONLINESTATUS,
        OPT_CHANGE_USER_PASSWORD,
-       OPT_SID_TO_FULLNAME
+       OPT_CCACHE_SAVE,
+       OPT_SID_TO_FULLNAME,
+       OPT_NTLMV2,
+       OPT_PAM_LOGON,
+       OPT_LOGOFF,
+       OPT_LOGOFF_USER,
+       OPT_LOGOFF_UID,
+       OPT_LANMAN,
+       OPT_KRB5CCNAME
 };
 
-int main(int argc, char **argv, char **envp)
+int main(int argc, const char **argv, char **envp)
 {
        int opt;
        TALLOC_CTX *frame = talloc_stackframe();
@@ -1610,6 +2172,11 @@ int main(int argc, char **argv, char **envp)
        int int_subarg = -1;
        int result = 1;
        bool verbose = false;
+       bool use_ntlmv2 = false;
+       bool use_lanman = false;
+       char *logoff_user = getenv("USER");
+       int logoff_uid = geteuid();
+       const char *opt_krb5ccname = "FILE";
 
        struct poptOption long_options[] = {
                POPT_AUTOHELP
@@ -1626,6 +2193,9 @@ int main(int argc, char **argv, char **envp)
                { "sid-to-fullname", 0, POPT_ARG_STRING, &string_arg,
                  OPT_SID_TO_FULLNAME, "Converts sid to fullname", "SID" },
                { "lookup-rids", 'R', POPT_ARG_STRING, &string_arg, 'R', "Converts RIDs to names", "RIDs" },
+               { "lookup-sids", 0, POPT_ARG_STRING, &string_arg,
+                 OPT_LOOKUP_SIDS, "Converts SIDs to types and names",
+                 "Sid-List"},
                { "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" },
@@ -1638,11 +2208,16 @@ int main(int argc, char **argv, char **envp)
                { "set-gid-mapping", 0, POPT_ARG_STRING, &string_arg, OPT_SET_GID_MAPPING, "Create or modify gid to sid mapping in idmap", "GID,SID" },
                { "remove-uid-mapping", 0, POPT_ARG_STRING, &string_arg, OPT_REMOVE_UID_MAPPING, "Remove uid to sid mapping in idmap", "UID,SID" },
                { "remove-gid-mapping", 0, POPT_ARG_STRING, &string_arg, OPT_REMOVE_GID_MAPPING, "Remove gid to sid mapping in idmap", "GID,SID" },
+               { "sids-to-unix-ids", 0, POPT_ARG_STRING, &string_arg,
+                 OPT_SIDS_TO_XIDS, "Translate SIDs to Unix IDs", "Sid-List" },
                { "check-secret", 't', POPT_ARG_NONE, 0, 't', "Check shared secret" },
+               { "change-secret", 'c', POPT_ARG_NONE, 0, 'c', "Change shared secret" },
+               { "ping-dc", 'P', POPT_ARG_NONE, 0, 'P',
+                 "Check the NETLOGON connection" },
                { "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" },
+               { "sequence", 0, POPT_ARG_NONE, 0, OPT_SEQUENCE, "Deprecated command, see --online-status" },
                { "online-status", 0, POPT_ARG_NONE, 0, OPT_ONLINESTATUS, "Show whether domains are marked as online or offline"},
                { "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" },
@@ -1653,12 +2228,26 @@ int main(int argc, char **argv, char **envp)
                { "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" },
+               { "sid-aliases", 0, POPT_ARG_STRING, &string_arg, OPT_SIDALIASES, "Get sid aliases", "SID" },
                { "user-sids", 0, POPT_ARG_STRING, &string_arg, OPT_USERSIDS, "Get user group sids for user SID", "SID" },
                { "authenticate", 'a', POPT_ARG_STRING, &string_arg, 'a', "authenticate user", "user%password" },
+               { "pam-logon", 0, POPT_ARG_STRING, &string_arg, OPT_PAM_LOGON,
+                 "do a pam logon equivalent", "user%password" },
+               { "logoff", 0, POPT_ARG_NONE, NULL, OPT_LOGOFF,
+                 "log off user", "uid" },
+               { "logoff-user", 0, POPT_ARG_STRING, &logoff_user,
+                 OPT_LOGOFF_USER, "username to log off" },
+               { "logoff-uid", 0, POPT_ARG_INT, &logoff_uid,
+                 OPT_LOGOFF_UID, "uid to log off" },
                { "set-auth-user", 0, POPT_ARG_STRING, &string_arg, OPT_SET_AUTH_USER, "Store user and password used by winbindd (root only)", "user%password" },
+               { "ccache-save", 0, POPT_ARG_STRING, &string_arg,
+                 OPT_CCACHE_SAVE, "Store user and password for ccache "
+                 "operation", "user%password" },
                { "getdcname", 0, POPT_ARG_STRING, &string_arg, OPT_GETDCNAME,
                  "Get a DC name for a foreign domain", "domainname" },
                { "dsgetdcname", 0, POPT_ARG_STRING, &string_arg, OPT_DSGETDCNAME, "Find a DC for a domain", "domainname" },
+               { "dc-info", 0, POPT_ARG_STRING, &string_arg, OPT_DC_INFO,
+                 "Find the currently known DCs", "domainname" },
                { "get-auth-user", 0, POPT_ARG_NONE, NULL, OPT_GET_AUTH_USER, "Retrieve user and password used by winbindd (root only)", NULL },
                { "ping", 'p', POPT_ARG_NONE, 0, 'p', "Ping winbindd to see if it is alive" },
                { "domain", 0, POPT_ARG_STRING, &opt_domain_name, OPT_DOMAIN_NAME, "Define to the domain to restrict operation", "domain" },
@@ -1669,22 +2258,25 @@ int main(int argc, char **argv, char **envp)
                { "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" }, */
+               { "krb5ccname", 0, POPT_ARG_STRING, &opt_krb5ccname, OPT_KRB5CCNAME, "authenticate user using Kerberos and specific credential cache type", "krb5ccname" },
 #endif
                { "separator", 0, POPT_ARG_NONE, 0, OPT_SEPARATOR, "Get the active winbind separator", NULL },
                { "verbose", 0, POPT_ARG_NONE, 0, OPT_VERBOSE, "Print additional information per command", NULL },
                { "change-user-password", 0, POPT_ARG_STRING, &string_arg, OPT_CHANGE_USER_PASSWORD, "Change the password for a user", NULL },
-               POPT_COMMON_CONFIGFILE
+               { "ntlmv2", 0, POPT_ARG_NONE, 0, OPT_NTLMV2, "Use NTLMv2 cryptography for user authentication", NULL},
+               { "lanman", 0, POPT_ARG_NONE, 0, OPT_LANMAN, "Use lanman cryptography for user authentication", NULL},
                POPT_COMMON_VERSION
                POPT_TABLEEND
        };
 
        /* Samba client initialisation */
-       load_case_tables();
+       smb_init_locale();
 
 
        /* Parse options */
 
-       pc = poptGetContext("wbinfo", argc, (const char **)argv, long_options, 0);
+       pc = poptGetContext("wbinfo", argc, argv,
+                           long_options, 0);
 
        /* Parse command line options */
 
@@ -1697,24 +2289,19 @@ int main(int argc, char **argv, char **envp)
                /* get the generic configuration parameters like --domain */
                switch (opt) {
                case OPT_VERBOSE:
-                       verbose = True;
+                       verbose = true;
+                       break;
+               case OPT_NTLMV2:
+                       use_ntlmv2 = true;
+                       break;
+               case OPT_LANMAN:
+                       use_lanman = true;
                        break;
                }
        }
 
        poptFreeContext(pc);
 
-       if (!lp_load(get_dyn_CONFIGFILE(), true, false, false, true)) {
-               d_fprintf(stderr, "wbinfo: error opening config file %s. Error was %s\n",
-                       get_dyn_CONFIGFILE(), strerror(errno));
-               exit(1);
-       }
-
-       if (!init_names())
-               return 1;
-
-       load_interfaces();
-
        pc = poptGetContext(NULL, argc, (const char **)argv, long_options,
                            POPT_CONTEXT_KEEP_FIRST);
 
@@ -1722,19 +2309,23 @@ int main(int argc, char **argv, char **envp)
                switch (opt) {
                case 'u':
                        if (!print_domain_users(opt_domain_name)) {
-                               d_fprintf(stderr, "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_fprintf(stderr, "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_fprintf(stderr, "Could not lookup sid %s\n", string_arg);
+                               d_fprintf(stderr,
+                                         "Could not lookup sid %s\n",
+                                         string_arg);
                                goto done;
                        }
                        break;
@@ -1747,52 +2338,70 @@ int main(int argc, char **argv, char **envp)
                        break;
                case 'R':
                        if (!wbinfo_lookuprids(opt_domain_name, string_arg)) {
-                               d_fprintf(stderr, "Could not lookup RIDs %s\n", string_arg);
+                               d_fprintf(stderr, "Could not lookup RIDs %s\n",
+                                         string_arg);
+                               goto done;
+                       }
+                       break;
+               case OPT_LOOKUP_SIDS:
+                       if (!wbinfo_lookup_sids(string_arg)) {
+                               d_fprintf(stderr, "Could not lookup SIDs %s\n",
+                                         string_arg);
                                goto done;
                        }
                        break;
                case 'n':
                        if (!wbinfo_lookupname(string_arg)) {
-                               d_fprintf(stderr, "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_fprintf(stderr, "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_fprintf(stderr, "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_fprintf(stderr, "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_fprintf(stderr, "Could not convert gid %d to sid\n",
-                                      int_arg);
+                               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_fprintf(stderr, "Could not convert sid %s to uid\n",
-                                      string_arg);
+                               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_fprintf(stderr, "Could not convert sid %s to gid\n",
-                                      string_arg);
+                               d_fprintf(stderr,
+                                         "Could not convert sid %s to gid\n",
+                                         string_arg);
                                goto done;
                        }
                        break;
@@ -1850,47 +2459,71 @@ int main(int argc, char **argv, char **envp)
                                goto done;
                        }
                        break;
+               case OPT_SIDS_TO_XIDS:
+                       if (!wbinfo_sids_to_unix_ids(string_arg)) {
+                               d_fprintf(stderr, "wbinfo_sids_to_unix_ids "
+                                         "failed\n");
+                               goto done;
+                       }
+                       break;
                case 't':
-                       if (!wbinfo_check_secret()) {
+                       if (!wbinfo_check_secret(opt_domain_name)) {
                                d_fprintf(stderr, "Could not check secret\n");
                                goto done;
                        }
                        break;
+               case 'c':
+                       if (!wbinfo_change_secret(opt_domain_name)) {
+                               d_fprintf(stderr, "Could not change secret\n");
+                               goto done;
+                       }
+                       break;
+               case 'P':
+                       if (!wbinfo_ping_dc(opt_domain_name)) {
+                               goto done;
+                       }
+                       break;
                case 'm':
                        if (!wbinfo_list_domains(false, verbose)) {
-                               d_fprintf(stderr, "Could not list trusted domains\n");
+                               d_fprintf(stderr,
+                                         "Could not list trusted domains\n");
                                goto done;
                        }
                        break;
                case OPT_SEQUENCE:
                        if (!wbinfo_show_sequence(opt_domain_name)) {
-                               d_fprintf(stderr, "Could not show sequence numbers\n");
+                               d_fprintf(stderr,
+                                         "Could not show sequence numbers\n");
                                goto done;
                        }
                        break;
                case OPT_ONLINESTATUS:
                        if (!wbinfo_show_onlinestatus(opt_domain_name)) {
-                               d_fprintf(stderr, "Could not show online-status\n");
+                               d_fprintf(stderr,
+                                         "Could not show online-status\n");
                                goto done;
                        }
                        break;
                case 'D':
                        if (!wbinfo_domain_info(string_arg)) {
-                               d_fprintf(stderr, "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);
+                               d_fprintf(stderr,
+                                         "Could not get info for user %s\n",
+                                         string_arg);
                                goto done;
                        }
                        break;
                case OPT_USER_SIDINFO:
                        if ( !wbinfo_get_user_sidinfo(string_arg)) {
-                               d_fprintf(stderr, "Could not get info for user sid %s\n",
-                                   string_arg);
+                               d_fprintf(stderr,
+                                         "Could not get info for user "
+                                         "sid %s\n", string_arg);
                                goto done;
                        }
                        break;
@@ -1917,21 +2550,32 @@ int main(int argc, char **argv, char **envp)
                        break;
                case 'r':
                        if (!wbinfo_get_usergroups(string_arg)) {
-                               d_fprintf(stderr, "Could not get groups for user %s\n",
-                                      string_arg);
+                               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_fprintf(stderr, "Could not get group SIDs for user SID %s\n",
-                                      string_arg);
+                               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_fprintf(stderr, "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;
+                       }
+                       break;
+               case OPT_SIDALIASES:
+                       if (!wbinfo_get_sidaliases(opt_domain_name,
+                                                  string_arg)) {
+                               d_fprintf(stderr, "Could not get sid aliases "
                                         "for user SID %s\n", string_arg);
                                goto done;
                        }
@@ -1940,14 +2584,19 @@ int main(int argc, char **argv, char **envp)
                                bool got_error = false;
 
                                if (!wbinfo_auth(string_arg)) {
-                                       d_fprintf(stderr, "Could not authenticate user %s with "
-                                               "plaintext password\n", string_arg);
+                                       d_fprintf(stderr,
+                                                 "Could not authenticate user "
+                                                 "%s with plaintext "
+                                                 "password\n", string_arg);
                                        got_error = true;
                                }
 
-                               if (!wbinfo_auth_crap(string_arg)) {
-                                       d_fprintf(stderr, "Could not authenticate user %s with "
-                                               "challenge/response\n", string_arg);
+                               if (!wbinfo_auth_crap(string_arg, use_ntlmv2,
+                                                     use_lanman)) {
+                                       d_fprintf(stderr,
+                                               "Could not authenticate user "
+                                               "%s with challenge/response\n",
+                                               string_arg);
                                        got_error = true;
                                }
 
@@ -1955,15 +2604,37 @@ int main(int argc, char **argv, char **envp)
                                        goto done;
                                break;
                        }
+               case OPT_PAM_LOGON:
+                       if (!wbinfo_pam_logon(string_arg, verbose)) {
+                               d_fprintf(stderr, "pam_logon failed for %s\n",
+                                         string_arg);
+                               goto done;
+                       }
+                       break;
+               case OPT_LOGOFF:
+               {
+                       wbcErr wbc_status;
+
+                       wbc_status = wbcLogoffUser(logoff_user, logoff_uid,
+                                                  "");
+                       d_printf("Logoff %s (%d): %s\n", logoff_user,
+                                logoff_uid, wbcErrorString(wbc_status));
+                       break;
+               }
                case 'K': {
-                               uint32 flags =  WBFLAG_PAM_KRB5 |
-                                               WBFLAG_PAM_CACHED_LOGIN |
+                               uint32_t flags = WBFLAG_PAM_KRB5 |
+                                                WBFLAG_PAM_CACHED_LOGIN |
                                                WBFLAG_PAM_FALLBACK_AFTER_KRB5 |
-                                               WBFLAG_PAM_INFO3_TEXT;
-
-                               if (!wbinfo_auth_krb5(string_arg, "FILE", flags)) {
-                                       d_fprintf(stderr, "Could not authenticate user [%s] with "
-                                               "Kerberos (ccache: %s)\n", string_arg, "FILE");
+                                                WBFLAG_PAM_INFO3_TEXT |
+                                                WBFLAG_PAM_CONTACT_TRUSTDOM;
+
+                               if (!wbinfo_auth_krb5(string_arg, opt_krb5ccname,
+                                                     flags)) {
+                                       d_fprintf(stderr,
+                                               "Could not authenticate user "
+                                               "[%s] with Kerberos "
+                                               "(ccache: %s)\n", string_arg,
+                                               opt_krb5ccname);
                                        goto done;
                                }
                                break;
@@ -1987,6 +2658,12 @@ int main(int argc, char **argv, char **envp)
                        break;
                case OPT_GET_AUTH_USER:
                        wbinfo_get_auth_user();
+                       goto done;
+                       break;
+               case OPT_CCACHE_SAVE:
+                       if (!wbinfo_ccache_save(string_arg)) {
+                               goto done;
+                       }
                        break;
                case OPT_GETDCNAME:
                        if (!wbinfo_getdcname(string_arg)) {
@@ -1998,8 +2675,13 @@ int main(int argc, char **argv, char **envp)
                                goto done;
                        }
                        break;
+               case OPT_DC_INFO:
+                       if (!wbinfo_dc_info(string_arg)) {
+                               goto done;
+                       }
+                       break;
                case OPT_SEPARATOR: {
-                       const char sep = winbind_separator_int(true);
+                       const char sep = winbind_separator();
                        if ( !sep ) {
                                goto done;
                        }
@@ -2018,7 +2700,8 @@ int main(int argc, char **argv, char **envp)
                        break;
                case OPT_CHANGE_USER_PASSWORD:
                        if (!wbinfo_change_user_password(string_arg)) {
-                               d_fprintf(stderr, "Could not change user password "
+                               d_fprintf(stderr,
+                                       "Could not change user password "
                                         "for user %s\n", string_arg);
                                goto done;
                        }
@@ -2026,8 +2709,12 @@ int main(int argc, char **argv, char **envp)
 
                /* generic configuration options */
                case OPT_DOMAIN_NAME:
-                       break;
                case OPT_VERBOSE:
+               case OPT_NTLMV2:
+               case OPT_LANMAN:
+               case OPT_LOGOFF_USER:
+               case OPT_LOGOFF_UID:
+               case OPT_KRB5CCNAME:
                        break;
                default:
                        d_fprintf(stderr, "Invalid option\n");
@@ -2041,7 +2728,7 @@ int main(int argc, char **argv, char **envp)
        /* Exit code */
 
  done:
-       talloc_destroy(frame);
+       talloc_free(frame);
 
        poptFreeContext(pc);
        return result;