This might not be used a lot and might not survive for long, but at least it
[samba.git] / source3 / nsswitch / wbinfo.c
index d7d70b9e52e29a2b2ba58bbd1a21dcf545df7586..772332ee59272fe981fb1675c4592765a0ad0cec 100644 (file)
@@ -3,7 +3,7 @@
 
    Winbind status program.
 
-   Copyright (C) Tim Potter      2000-2002
+   Copyright (C) Tim Potter      2000-2003
    Copyright (C) Andrew Bartlett 2002
    
    This program is free software; you can redistribute it and/or modify
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
-/* Prototypes from common.h */
-
-NSS_STATUS winbindd_request(int req_type, 
-                           struct winbindd_request *request,
-                           struct winbindd_response *response);
+extern int winbindd_fd;
 
 static char winbind_separator(void)
 {
@@ -66,7 +62,7 @@ static char winbind_separator(void)
        return sep;
 }
 
-static char *get_winbind_domain(void)
+static const char *get_winbind_domain(void)
 {
        struct winbindd_response response;
        static fstring winbind_domain;
@@ -107,7 +103,7 @@ 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(domain);
+       strupper_m(domain);
 
        return True;
 }
@@ -140,6 +136,37 @@ static BOOL wbinfo_get_usergroups(char *user)
        return True;
 }
 
+
+/* List group SIDs a user SID is a member of */
+static BOOL wbinfo_get_usersids(char *user_sid)
+{
+       struct winbindd_request request;
+       struct winbindd_response response;
+       NSS_STATUS result;
+       int i;
+       const char *s;
+
+       ZERO_STRUCT(response);
+
+       /* Send request */
+       fstrcpy(request.data.sid, user_sid);
+
+       result = winbindd_request(WINBINDD_GETUSERSIDS, &request, &response);
+
+       if (result != NSS_STATUS_SUCCESS)
+               return False;
+
+       s = response.extra_data;
+       for (i = 0; i < response.data.num_entries; i++) {
+               d_printf("%s\n", s);
+               s += strlen(s) + 1;
+       }
+
+       SAFE_FREE(response.extra_data);
+
+       return True;
+}
+
 /* Convert NetBIOS name to IP */
 
 static BOOL wbinfo_wins_byname(char *name)
@@ -210,7 +237,7 @@ static BOOL wbinfo_list_domains(void)
        /* Display response */
 
        if (response.extra_data) {
-               char *extra_data = (char *)response.extra_data;
+               const char *extra_data = (char *)response.extra_data;
 
                while(next_token(&extra_data, name, ",", sizeof(fstring)))
                        d_printf("%s\n", name);
@@ -223,15 +250,20 @@ static BOOL wbinfo_list_domains(void)
 
 
 /* show sequence numbers */
-static BOOL wbinfo_show_sequence(void)
+static BOOL wbinfo_show_sequence(const char *domain)
 {
+       struct winbindd_request  request;
        struct winbindd_response response;
 
        ZERO_STRUCT(response);
+       ZERO_STRUCT(request);
+
+       if ( domain )
+               fstrcpy( request.domain_name, domain );
 
        /* Send request */
 
-       if (winbindd_request(WINBINDD_SHOW_SEQUENCE, NULL, &response) !=
+       if (winbindd_request(WINBINDD_SHOW_SEQUENCE, &request, &response) !=
            NSS_STATUS_SUCCESS)
                return False;
 
@@ -246,6 +278,44 @@ static BOOL wbinfo_show_sequence(void)
        return True;
 }
 
+/* Show domain info */
+
+static BOOL wbinfo_domain_info(const char *domain_name)
+{
+       struct winbindd_request request;
+       struct winbindd_response response;
+
+       ZERO_STRUCT(request);
+       ZERO_STRUCT(response);
+
+       fstrcpy(request.domain_name, domain_name);
+
+       /* Send request */
+
+       if (winbindd_request(WINBINDD_DOMAIN_INFO, &request, &response) !=
+           NSS_STATUS_SUCCESS)
+               return False;
+
+       /* Display response */
+
+       d_printf("Name              : %s\n", response.data.domain_info.name);
+       d_printf("Alt_Name          : %s\n", response.data.domain_info.alt_name);
+
+       d_printf("SID               : %s\n", response.data.domain_info.sid);
+
+       d_printf("Active Directory  : %s\n",
+                response.data.domain_info.active_directory ? "Yes" : "No");
+       d_printf("Native            : %s\n",
+                response.data.domain_info.native_mode ? "Yes" : "No");
+
+       d_printf("Primary           : %s\n",
+                response.data.domain_info.primary ? "Yes" : "No");
+
+       d_printf("Sequence          : %d\n", response.data.domain_info.sequence_number);
+
+       return True;
+}
+
 /* Check trust account password */
 
 static BOOL wbinfo_check_secret(void)
@@ -414,7 +484,7 @@ static BOOL wbinfo_lookupname(char *name)
 
        /* Display response */
 
-       d_printf("%s %d\n", response.data.sid.sid, response.data.sid.type);
+       d_printf("%s %s (%d)\n", response.data.sid.sid, sid_type_lookup(response.data.sid.type), response.data.sid.type);
 
        return True;
 }
@@ -450,9 +520,11 @@ static BOOL wbinfo_auth(char *username)
         d_printf("plaintext password authentication %s\n", 
                (result == NSS_STATUS_SUCCESS) ? "succeeded" : "failed");
 
-       d_printf("error code was %s (0x%x)\n", 
-                response.data.auth.nt_status_string, 
-                response.data.auth.nt_status);
+       if (response.data.auth.nt_status)
+               d_printf("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);
 
         return result == NSS_STATUS_SUCCESS;
 }
@@ -483,9 +555,18 @@ static BOOL wbinfo_auth_crap(char *username)
                
        parse_wbinfo_domain_user(username, name_domain, name_user);
 
-       fstrcpy(request.data.auth_crap.user, name_user);
+       if (push_utf8_fstring(request.data.auth_crap.user, name_user) == -1) {
+               d_printf("unable to create utf8 string for '%s'\n",
+                        name_user);
+               return False;
+       }
 
-       fstrcpy(request.data.auth_crap.domain, name_domain);
+       if (push_utf8_fstring(request.data.auth_crap.domain, 
+                             name_domain) == -1) {
+               d_printf("unable to create utf8 string for '%s'\n",
+                        name_domain);
+               return False;
+       }
 
        generate_random_buffer(request.data.auth_crap.chal, 8, False);
         
@@ -504,26 +585,207 @@ static BOOL wbinfo_auth_crap(char *username)
         d_printf("challenge/response password authentication %s\n", 
                (result == NSS_STATUS_SUCCESS) ? "succeeded" : "failed");
 
-       d_printf("error code was %s (0x%x)\n", 
-              response.data.auth.nt_status_string, 
-              response.data.auth.nt_status);
+       if (response.data.auth.nt_status)
+               d_printf("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);
+
+        return result == NSS_STATUS_SUCCESS;
+}
+
+/******************************************************************
+ create a winbindd user
+******************************************************************/
+
+static BOOL wbinfo_create_user(char *username)
+{
+       struct winbindd_request request;
+       struct winbindd_response response;
+        NSS_STATUS result;
+
+       /* Send off request */
+
+       ZERO_STRUCT(request);
+       ZERO_STRUCT(response);
+
+       request.flags = WBFLAG_ALLOCATE_RID;
+       fstrcpy(request.data.acct_mgt.username, username);
 
+       result = winbindd_request(WINBINDD_CREATE_USER, &request, &response);
+       
+       if ( result == NSS_STATUS_SUCCESS )
+               d_printf("New RID is %d\n", response.data.rid);
+       
+        return result == NSS_STATUS_SUCCESS;
+}
+
+/******************************************************************
+ remove a winbindd user
+******************************************************************/
+
+static BOOL wbinfo_delete_user(char *username)
+{
+       struct winbindd_request request;
+       struct winbindd_response response;
+        NSS_STATUS result;
+
+       /* Send off request */
+
+       ZERO_STRUCT(request);
+       ZERO_STRUCT(response);
+
+       fstrcpy(request.data.acct_mgt.username, username);
+
+       result = winbindd_request(WINBINDD_DELETE_USER, &request, &response);
+       
+        return result == NSS_STATUS_SUCCESS;
+}
+
+/******************************************************************
+ create a winbindd group
+******************************************************************/
+
+static BOOL wbinfo_create_group(char *groupname)
+{
+       struct winbindd_request request;
+       struct winbindd_response response;
+        NSS_STATUS result;
+
+       /* Send off request */
+
+       ZERO_STRUCT(request);
+       ZERO_STRUCT(response);
+
+       fstrcpy(request.data.acct_mgt.groupname, groupname);
+
+       result = winbindd_request(WINBINDD_CREATE_GROUP, &request, &response);
+       
+        return result == NSS_STATUS_SUCCESS;
+}
+
+/******************************************************************
+ remove a winbindd group
+******************************************************************/
+
+static BOOL wbinfo_delete_group(char *groupname)
+{
+       struct winbindd_request request;
+       struct winbindd_response response;
+        NSS_STATUS result;
+
+       /* Send off request */
+
+       ZERO_STRUCT(request);
+       ZERO_STRUCT(response);
+
+       fstrcpy(request.data.acct_mgt.groupname, groupname);
+
+       result = winbindd_request(WINBINDD_DELETE_GROUP, &request, &response);
+       
+        return result == NSS_STATUS_SUCCESS;
+}
+
+/******************************************************************
+ parse a string in the form user:group
+******************************************************************/
+
+static BOOL parse_user_group( const char *string, fstring user, fstring group )
+{
+       char *p;
+       
+       if ( !string )
+               return False;
+       
+       if ( !(p = strchr( string, ':' )) )
+               return False;
+               
+       *p = '\0';
+       p++;
+       
+       fstrcpy( user, string );
+       fstrcpy( group, p );
+       
+       return True;
+}
+
+/******************************************************************
+ add a user to a winbindd group
+******************************************************************/
+
+static BOOL wbinfo_add_user_to_group(char *string)
+{
+       struct winbindd_request request;
+       struct winbindd_response response;
+        NSS_STATUS result;
+
+       /* Send off request */
+
+       ZERO_STRUCT(request);
+       ZERO_STRUCT(response);
+
+       if ( !parse_user_group( string, request.data.acct_mgt.username,
+               request.data.acct_mgt.groupname))
+       {
+               d_printf("Can't parse user:group from %s\n", string);
+               return False;
+       }
+
+       result = winbindd_request(WINBINDD_ADD_USER_TO_GROUP, &request, &response);
+       
+        return result == NSS_STATUS_SUCCESS;
+}
+
+/******************************************************************
+ remove a user from a winbindd group
+******************************************************************/
+
+static BOOL wbinfo_remove_user_from_group(char *string)
+{
+       struct winbindd_request request;
+       struct winbindd_response response;
+        NSS_STATUS result;
+
+       /* Send off request */
+
+       ZERO_STRUCT(request);
+       ZERO_STRUCT(response);
+
+       if ( !parse_user_group( string, request.data.acct_mgt.username,
+               request.data.acct_mgt.groupname))
+       {
+               d_printf("Can't parse user:group from %s\n", string);
+               return False;
+       }
+
+       result = winbindd_request(WINBINDD_REMOVE_USER_FROM_GROUP, &request, &response);
+       
         return result == NSS_STATUS_SUCCESS;
 }
 
 /* Print domain users */
 
-static BOOL print_domain_users(void)
+static BOOL print_domain_users(const char *domain)
 {
+       struct winbindd_request request;
        struct winbindd_response response;
-       char *extra_data;
+       const char *extra_data;
        fstring name;
 
        /* Send request to winbind daemon */
 
+       ZERO_STRUCT(request);
        ZERO_STRUCT(response);
+       
+       if (domain) {
+               /* '.' is the special sign for our own domwin */
+               if ( strequal(domain, ".") )
+                       fstrcpy( request.domain_name, lp_workgroup() );
+               else
+                       fstrcpy( request.domain_name, domain );
+       }
 
-       if (winbindd_request(WINBINDD_LIST_USERS, NULL, &response) !=
+       if (winbindd_request(WINBINDD_LIST_USERS, &request, &response) !=
            NSS_STATUS_SUCCESS)
                return False;
 
@@ -532,7 +794,7 @@ static BOOL print_domain_users(void)
        if (!response.extra_data)
                return False;
 
-       extra_data = (char *)response.extra_data;
+       extra_data = (const char *)response.extra_data;
 
        while(next_token(&extra_data, name, ",", sizeof(fstring)))
                d_printf("%s\n", name);
@@ -544,15 +806,24 @@ static BOOL print_domain_users(void)
 
 /* Print domain groups */
 
-static BOOL print_domain_groups(void)
+static BOOL print_domain_groups(const char *domain)
 {
+       struct winbindd_request  request;
        struct winbindd_response response;
-       char *extra_data;
+       const char *extra_data;
        fstring name;
 
+       ZERO_STRUCT(request);
        ZERO_STRUCT(response);
 
-       if (winbindd_request(WINBINDD_LIST_GROUPS, NULL, &response) !=
+       if (domain) {
+               if ( strequal(domain, ".") )
+                       fstrcpy( request.domain_name, lp_workgroup() );
+               else
+                       fstrcpy( request.domain_name, domain );
+       }
+
+       if (winbindd_request(WINBINDD_LIST_GROUPS, &request, &response) !=
            NSS_STATUS_SUCCESS)
                return False;
 
@@ -561,7 +832,7 @@ static BOOL print_domain_groups(void)
        if (!response.extra_data)
                return False;
 
-       extra_data = (char *)response.extra_data;
+       extra_data = (const char *)response.extra_data;
 
        while(next_token(&extra_data, name, ",", sizeof(fstring)))
                d_printf("%s\n", name);
@@ -587,34 +858,91 @@ static BOOL wbinfo_set_auth_user(char *username)
        if (password) {
                *password = 0;
                password++;
-       } else
-               password = "";
+       } else {
+               char *thepass = getpass("Password: ");
+               if (thepass) {
+                       password = thepass;     
+               } else
+                       password = "";
+       }
 
-       /* Store in secrets.tdb */
+       /* Store or remove DOMAIN\username%password in secrets.tdb */
 
-       if (!secrets_store(SECRETS_AUTH_USER, user, 
-                          strlen(user) + 1) ||
-           !secrets_store(SECRETS_AUTH_DOMAIN, domain, 
-                          strlen(domain) + 1) ||
-           !secrets_store(SECRETS_AUTH_PASSWORD, password,
-                          strlen(password) + 1)) {
-               d_fprintf(stderr, "error storing authenticated user info\n");
-               return False;
+       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;
 }
 
+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);
+}
+
 static BOOL wbinfo_ping(void)
 {
         NSS_STATUS result;
-       
+
        result = winbindd_request(WINBINDD_PING, NULL, NULL);
 
        /* Display response */
 
-        d_printf("'ping' to winbindd %s\n", 
-               (result == NSS_STATUS_SUCCESS) ? "succeeded" : "failed");
+        d_printf("Ping to winbindd %s on fd %d\n", 
+               (result == NSS_STATUS_SUCCESS) ? "succeeded" : "failed", winbindd_fd);
 
         return result == NSS_STATUS_SUCCESS;
 }
@@ -623,18 +951,20 @@ static BOOL wbinfo_ping(void)
 
 enum {
        OPT_SET_AUTH_USER = 1000,
-       OPT_SEQUENCE
+       OPT_GET_AUTH_USER,
+       OPT_DOMAIN_NAME,
+       OPT_SEQUENCE,
+       OPT_USERSIDS
 };
 
 int main(int argc, char **argv)
 {
-       extern pstring global_myname;
        int opt;
 
        poptContext pc;
        static char *string_arg;
+       static char *opt_domain_name;
        static int int_arg;
-       BOOL got_command = False;
        int result = 1;
 
        struct poptOption long_options[] = {
@@ -643,43 +973,48 @@ int main(int argc, char **argv)
                /* longName, shortName, argInfo, argPtr, value, descrip, 
                   argDesc */
 
-               { "domain-users", 'u', POPT_ARG_NONE, 0, 'u', "Lists all domain users"},
-               { "domain-groups", 'g', POPT_ARG_NONE, 0, 'g', "Lists all domain groups" },
-               { "WINS-by-name", 'N', POPT_ARG_STRING, &string_arg, 'N', "Converts NetBIOS name to IP (WINS)" },
-               { "WINS-by-ip", 'I', POPT_ARG_STRING, &string_arg, 'I', "Converts IP address to NetBIOS name (WINS)" },
-               { "name-to-sid", 'n', POPT_ARG_STRING, &string_arg, 'n', "Converts name to sid" },
-               { "sid-to-name", 's', POPT_ARG_STRING, &string_arg, 's', "Converts sid to name" },
-               { "uid-to-sid", 'U', POPT_ARG_INT, &int_arg, 'U', "Converts uid to sid" },
-               { "gid-to-sid", 'G', POPT_ARG_INT, &int_arg, 'G', "Converts gid to sid" },
-               { "sid-to-uid", 'S', POPT_ARG_STRING, &string_arg, 'S', "Converts sid to uid" },
-               { "sid-to-gid", 'Y', POPT_ARG_STRING, &string_arg, 'Y', "Converts sid to gid" },
+               { "domain-users", 'u', POPT_ARG_NONE, 0, 'u', "Lists all domain users", "domain"},
+               { "domain-groups", 'g', POPT_ARG_NONE, 0, 'g', "Lists all domain groups", "domain" },
+               { "WINS-by-name", 'N', POPT_ARG_STRING, &string_arg, 'N', "Converts NetBIOS name to IP", "NETBIOS-NAME" },
+               { "WINS-by-ip", 'I', POPT_ARG_STRING, &string_arg, 'I', "Converts IP address to NetBIOS name", "IP" },
+               { "name-to-sid", 'n', POPT_ARG_STRING, &string_arg, 'n', "Converts name to sid", "NAME" },
+               { "sid-to-name", 's', POPT_ARG_STRING, &string_arg, 's', "Converts sid to name", "SID" },
+               { "uid-to-sid", 'U', POPT_ARG_INT, &int_arg, 'U', "Converts uid to sid" , "UID" },
+               { "gid-to-sid", 'G', POPT_ARG_INT, &int_arg, 'G', "Converts gid to sid", "GID" },
+               { "sid-to-uid", 'S', POPT_ARG_STRING, &string_arg, 'S', "Converts sid to uid", "SID" },
+               { "sid-to-gid", 'Y', POPT_ARG_STRING, &string_arg, 'Y', "Converts sid to gid", "SID" },
+               { "create-user", 'c', POPT_ARG_STRING, &string_arg, 'c', "Create a local user account", "name" },
+               { "delete-user", 'x', POPT_ARG_STRING, &string_arg, 'x', "Delete a local user account", "name" },
+               { "create-group", 'C', POPT_ARG_STRING, &string_arg, 'C', "Create a local group", "name" },
+               { "delete-group", 'X', POPT_ARG_STRING, &string_arg, 'X', "Delete a local group", "name" },
+               { "add-to-group", 'o', POPT_ARG_STRING, &string_arg, 'o', "Add user to group", "user:group" },
+               { "del-from-group", 'O', POPT_ARG_STRING, &string_arg, 'O', "Remove user from group", "user:group" },
                { "check-secret", 't', POPT_ARG_NONE, 0, 't', "Check shared secret" },
                { "trusted-domains", 'm', POPT_ARG_NONE, 0, 'm', "List trusted domains" },
-               { "sequence", 0, POPT_ARG_NONE, 0, OPT_SEQUENCE, "show sequence numbers of all domains" },
-               { "user-groups", 'r', POPT_ARG_STRING, &string_arg, 'r', "Get user groups" },
+               { "sequence", 0, POPT_ARG_NONE, 0, OPT_SEQUENCE, "Show sequence numbers of all domains" },
+               { "domain-info", 'D', POPT_ARG_STRING, &string_arg, 'D', "Show most of the info we have about the domain" },
+               { "user-groups", 'r', POPT_ARG_STRING, &string_arg, 'r', "Get user groups", "USER" },
+               { "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" },
-               { "set-auth-user", 'A', POPT_ARG_STRING, &string_arg, OPT_SET_AUTH_USER, "Store user and password used by winbindd (root only)", "user%password" },
-               { "ping", 'p', POPT_ARG_NONE, 0, 'p', "'ping' winbindd to see if it is alive" },
-               { 0, 0, 0, 0 }
+               { "set-auth-user", 0, POPT_ARG_STRING, &string_arg, OPT_SET_AUTH_USER, "Store user and password used by winbindd (root only)", "user%password" },
+               { "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" },
+               POPT_COMMON_VERSION
+               POPT_TABLEEND
        };
 
        /* Samba client initialisation */
 
-       if (!*global_myname) {
-               char *p;
-
-               fstrcpy(global_myname, myhostname());
-               p = strchr(global_myname, '.');
-               if (p)
-                       *p = 0;
-       }
-
        if (!lp_load(dyn_CONFIGFILE, True, False, False)) {
                d_fprintf(stderr, "wbinfo: error opening config file %s. Error was %s\n",
                        dyn_CONFIGFILE, strerror(errno));
                exit(1);
        }
 
+       if (!init_names())
+               return 1;
+
        load_interfaces();
 
        /* Parse options */
@@ -694,11 +1029,7 @@ int main(int argc, char **argv)
        }
 
        while((opt = poptGetNextOpt(pc)) != -1) {
-               if (got_command) {
-                       d_fprintf(stderr, "No more than one command may be specified at once.\n");
-                       exit(1);
-               }
-               got_command = True;
+               /* get the generic configuration parameters like --domain */
        }
 
        poptFreeContext(pc);
@@ -709,13 +1040,13 @@ int main(int argc, char **argv)
        while((opt = poptGetNextOpt(pc)) != -1) {
                switch (opt) {
                case 'u':
-                       if (!print_domain_users()) {
+                       if (!print_domain_users(opt_domain_name)) {
                                d_printf("Error looking up domain users\n");
                                goto done;
                        }
                        break;
                case 'g':
-                       if (!print_domain_groups()) {
+                       if (!print_domain_groups(opt_domain_name)) {
                                d_printf("Error looking up domain groups\n");
                                goto done;
                        }
@@ -784,11 +1115,17 @@ int main(int argc, char **argv)
                        }
                        break;
                case OPT_SEQUENCE:
-                       if (!wbinfo_show_sequence()) {
+                       if (!wbinfo_show_sequence(opt_domain_name)) {
                                d_printf("Could not show sequence numbers\n");
                                goto done;
                        }
                        break;
+               case 'D':
+                       if (!wbinfo_domain_info(string_arg)) {
+                               d_printf("Could not get domain info\n");
+                               goto done;
+                       }
+                       break;
                case 'r':
                        if (!wbinfo_get_usergroups(string_arg)) {
                                d_printf("Could not get groups for user %s\n", 
@@ -796,36 +1133,82 @@ int main(int argc, char **argv)
                                goto done;
                        }
                        break;
-                case 'a': {
-                        BOOL got_error = False;
-
-                        if (!wbinfo_auth(string_arg)) {
-                                d_printf("Could not authenticate user %s with "
-                                       "plaintext password\n", string_arg);
-                                got_error = True;
-                        }
-
-                        if (!wbinfo_auth_crap(string_arg)) {
-                                d_printf("Could not authenticate user %s with "
-                                       "challenge/response\n", string_arg);
-                                got_error = True;
-                        }
-                       
-                        if (got_error)
-                                goto done;
-                        break;
-               }
-                case 'p': {
-
-                        if (!wbinfo_ping()) {
-                                d_printf("could not ping winbindd!\n");
-                                goto done;
+               case OPT_USERSIDS:
+                       if (!wbinfo_get_usersids(string_arg)) {
+                               d_printf("Could not get group SIDs for user SID %s\n", 
+                                      string_arg);
+                               goto done;
                        }
-                        break;
-               }
-               case OPT_SET_AUTH_USER:
-                       if (!(wbinfo_set_auth_user(string_arg)))
+                       break;
+               case 'a': {
+                               BOOL got_error = False;
+
+                               if (!wbinfo_auth(string_arg)) {
+                                       d_printf("Could not authenticate user %s with "
+                                               "plaintext password\n", string_arg);
+                                       got_error = True;
+                               }
+
+                               if (!wbinfo_auth_crap(string_arg)) {
+                                       d_printf("Could not authenticate user %s with "
+                                               "challenge/response\n", string_arg);
+                                       got_error = True;
+                               }
+
+                               if (got_error)
+                                       goto done;
+                               break;
+                       }
+               case 'c':
+                       if ( !wbinfo_create_user(string_arg) ) {
+                               d_printf("Could not create user account\n");
+                               goto done;
+                       }
+                       break;
+               case 'C':
+                       if ( !wbinfo_create_group(string_arg) ) {
+                               d_printf("Could not create group\n");
+                               goto done;
+                       }
+                       break;
+               case 'o':
+                       if ( !wbinfo_add_user_to_group(string_arg) ) {
+                               d_printf("Could not add user to group\n");
+                               goto done;
+                       }
+                       break;
+               case 'O':
+                       if ( !wbinfo_remove_user_from_group(string_arg) ) {
+                               d_printf("Could not remove user from group\n");
+                               goto done;
+                       }
+                       break;
+               case 'x':
+                       if ( !wbinfo_delete_user(string_arg) ) {
+                               d_printf("Could not delete user account\n");
                                goto done;
+                       }
+                       break;
+               case 'X':
+                       if ( !wbinfo_delete_group(string_arg) ) {
+                               d_printf("Could not delete group\n");
+                               goto done;
+                       }
+                       break;
+               case 'p':
+                       if (!wbinfo_ping()) {
+                               d_printf("could not ping winbindd!\n");
+                               goto done;
+                       }
+                       break;
+               case OPT_SET_AUTH_USER:
+                       wbinfo_set_auth_user(string_arg);
+                       break;
+               case OPT_GET_AUTH_USER:
+                       wbinfo_get_auth_user();
+                       break;
+               /* generic configuration options */
+               case OPT_DOMAIN_NAME:
                        break;
                default:
                        d_fprintf(stderr, "Invalid option\n");