Put back the changes that Simo reverted and fix a speling mistak.
[tprouty/samba.git] / source / nsswitch / wbinfo.c
index 5ffd58b183c70bb8572be8d83cf081ed137f9c6e..0018e99f60f83e017f227d12eaa8dd45cc7d8910 100644 (file)
@@ -1,10 +1,10 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 2.0
+   Unix SMB/CIFS implementation.
 
    Winbind status program.
 
-   Copyright (C) Tim Potter 2000
+   Copyright (C) Tim Potter      2000-2003
+   Copyright (C) Andrew Bartlett 2002
    
    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 "winbindd.h"
 #include "debug.h"
 
-/* Prototypes from common.h */
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_WINBIND
 
-int winbindd_request(int req_type, struct winbindd_request *request,
-                    struct winbindd_response *response);
+extern int winbindd_fd;
+
+static char winbind_separator(void)
+{
+       struct winbindd_response response;
+       static BOOL got_sep;
+       static char sep;
+
+       if (got_sep)
+               return sep;
+
+       ZERO_STRUCT(response);
+
+       /* Send off request */
+
+       if (winbindd_request(WINBINDD_INFO, NULL, &response) !=
+           NSS_STATUS_SUCCESS) {
+               d_printf("could not obtain winbind separator!\n");
+               /* HACK: (this module should not call lp_ funtions) */
+               return *lp_winbind_separator();
+       }
+
+       sep = response.data.info.winbind_separator;
+       got_sep = True;
+
+       if (!sep) {
+               d_printf("winbind separator was NULL!\n");
+               /* HACK: (this module should not call lp_ funtions) */
+               sep = *lp_winbind_separator();
+       }
+       
+       return sep;
+}
+
+static const char *get_winbind_domain(void)
+{
+       struct winbindd_response response;
+       static fstring winbind_domain;
+
+       ZERO_STRUCT(response);
+
+       /* Send off request */
+
+       if (winbindd_request(WINBINDD_DOMAIN_NAME, NULL, &response) !=
+           NSS_STATUS_SUCCESS) {
+               d_printf("could not obtain winbind domain name!\n");
+               
+               /* HACK: (this module should not call lp_ funtions) */
+               return lp_workgroup();
+       }
+
+       fstrcpy(winbind_domain, response.data.domain_name);
+
+       return winbind_domain;
+
+}
+
+/* Copy of parse_domain_user from winbindd_util.c.  Parse a string of the
+   form DOMAIN/user into a domain and a user */
+
+static BOOL parse_wbinfo_domain_user(const char *domuser, fstring domain, 
+                                    fstring user)
+{
+
+       char *p = strchr(domuser,winbind_separator());
+
+       if (!p) {
+               fstrcpy(user, domuser);
+               fstrcpy(domain, get_winbind_domain());
+               return True;
+       }
+        
+       fstrcpy(user, p+1);
+       fstrcpy(domain, domuser);
+       domain[PTR_DIFF(p, domuser)] = 0;
+       strupper_m(domain);
+
+       return True;
+}
 
 /* List groups a user is a member of */
 
@@ -36,7 +114,8 @@ static BOOL wbinfo_get_usergroups(char *user)
 {
        struct winbindd_request request;
        struct winbindd_response response;
-       int result, i;
+       NSS_STATUS result;
+       int i;
        
        ZERO_STRUCT(response);
 
@@ -46,14 +125,66 @@ static BOOL wbinfo_get_usergroups(char *user)
 
        result = winbindd_request(WINBINDD_GETGROUPS, &request, &response);
 
-       if (result != NSS_STATUS_SUCCESS) {
+       if (result != NSS_STATUS_SUCCESS)
+               return False;
+
+       for (i = 0; i < response.data.num_entries; i++)
+               d_printf("%d\n", (int)((gid_t *)response.extra_data)[i]);
+
+       SAFE_FREE(response.extra_data);
+
+       return True;
+}
+
+/* Convert NetBIOS name to IP */
+
+static BOOL wbinfo_wins_byname(char *name)
+{
+       struct winbindd_request request;
+       struct winbindd_response response;
+
+       ZERO_STRUCT(request);
+       ZERO_STRUCT(response);
+
+       /* Send request */
+
+       fstrcpy(request.data.winsreq, name);
+
+       if (winbindd_request(WINBINDD_WINS_BYNAME, &request, &response) !=
+           NSS_STATUS_SUCCESS) {
                return False;
        }
 
-       for (i = 0; i < response.data.num_entries; i++) {
-               printf("%d\n", (int)((gid_t *)response.extra_data)[i]);
+       /* Display response */
+
+       printf("%s\n", response.data.winsresp);
+
+       return True;
+}
+
+/* Convert IP to NetBIOS name */
+
+static BOOL wbinfo_wins_byip(char *ip)
+{
+       struct winbindd_request request;
+       struct winbindd_response response;
+
+       ZERO_STRUCT(request);
+       ZERO_STRUCT(response);
+
+       /* Send request */
+
+       fstrcpy(request.data.winsreq, ip);
+
+       if (winbindd_request(WINBINDD_WINS_BYIP, &request, &response) !=
+           NSS_STATUS_SUCCESS) {
+               return False;
        }
 
+       /* Display response */
+
+       printf("%s\n", response.data.winsresp);
+
        return True;
 }
 
@@ -68,18 +199,49 @@ static BOOL wbinfo_list_domains(void)
 
        /* Send request */
 
-       if (winbindd_request(WINBINDD_LIST_TRUSTDOM, NULL, &response) ==
-           WINBINDD_ERROR) {
+       if (winbindd_request(WINBINDD_LIST_TRUSTDOM, NULL, &response) !=
+           NSS_STATUS_SUCCESS)
                return False;
+
+       /* Display response */
+
+       if (response.extra_data) {
+               const char *extra_data = (char *)response.extra_data;
+
+               while(next_token(&extra_data, name, ",", sizeof(fstring)))
+                       d_printf("%s\n", name);
+
+               SAFE_FREE(response.extra_data);
        }
 
+       return True;
+}
+
+
+/* show sequence numbers */
+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, &request, &response) !=
+           NSS_STATUS_SUCCESS)
+               return False;
+
        /* Display response */
 
        if (response.extra_data) {
-               while(next_token((char **)&response.extra_data, name, ",", 
-                                sizeof(fstring))) {
-                       printf("%s\n", name);
-               }
+               char *extra_data = (char *)response.extra_data;
+               d_printf("%s", extra_data);
+               SAFE_FREE(response.extra_data);
        }
 
        return True;
@@ -90,26 +252,21 @@ static BOOL wbinfo_list_domains(void)
 static BOOL wbinfo_check_secret(void)
 {
         struct winbindd_response response;
-        BOOL result;
+        NSS_STATUS result;
 
         ZERO_STRUCT(response);
 
-        result = winbindd_request(WINBINDD_CHECK_MACHACC, NULL, &response) ==
-                NSS_STATUS_SUCCESS;
-
-        if (result) {
+        result = winbindd_request(WINBINDD_CHECK_MACHACC, NULL, &response);
+               
+       d_printf("checking the trust secret via RPC calls %s\n", 
+                (result == NSS_STATUS_SUCCESS) ? "succeeded" : "failed");
 
-                if (response.data.num_entries == 0) {
-                        printf("Secret is good\n");
-                } else {
-                        printf("Secret is bad\n0x%08x\n", 
-                              response.data.num_entries);
-                }
-
-                return True;
-        }
-
-        return False;
+       if (result != NSS_STATUS_SUCCESS)       
+               d_printf("error code was %s (0x%x)\n", 
+                        response.data.auth.nt_status_string, 
+                        response.data.auth.nt_status);
+       
+       return result == NSS_STATUS_SUCCESS;    
 }
 
 /* Convert uid to sid */
@@ -125,14 +282,14 @@ static BOOL wbinfo_uid_to_sid(uid_t uid)
        /* Send request */
 
        request.data.uid = uid;
-       if (winbindd_request(WINBINDD_UID_TO_SID, &request, &response) ==
-           WINBINDD_ERROR) {
+
+       if (winbindd_request(WINBINDD_UID_TO_SID, &request, &response) !=
+           NSS_STATUS_SUCCESS)
                return False;
-       }
 
        /* Display response */
 
-       printf("%s\n", response.data.sid.sid);
+       d_printf("%s\n", response.data.sid.sid);
 
        return True;
 }
@@ -150,14 +307,14 @@ static BOOL wbinfo_gid_to_sid(gid_t gid)
        /* Send request */
 
        request.data.gid = gid;
-       if (winbindd_request(WINBINDD_GID_TO_SID, &request, &response) ==
-           WINBINDD_ERROR) {
+
+       if (winbindd_request(WINBINDD_GID_TO_SID, &request, &response) !=
+           NSS_STATUS_SUCCESS)
                return False;
-       }
 
        /* Display response */
 
-       printf("%s\n", response.data.sid.sid);
+       d_printf("%s\n", response.data.sid.sid);
 
        return True;
 }
@@ -175,14 +332,14 @@ static BOOL wbinfo_sid_to_uid(char *sid)
        /* Send request */
 
        fstrcpy(request.data.sid, sid);
-       if (winbindd_request(WINBINDD_SID_TO_UID, &request, &response) ==
-           WINBINDD_ERROR) {
+
+       if (winbindd_request(WINBINDD_SID_TO_UID, &request, &response) !=
+           NSS_STATUS_SUCCESS)
                return False;
-       }
 
        /* Display response */
 
-       printf("%d\n", (int)response.data.uid);
+       d_printf("%d\n", (int)response.data.uid);
 
        return True;
 }
@@ -198,14 +355,14 @@ static BOOL wbinfo_sid_to_gid(char *sid)
        /* Send request */
 
        fstrcpy(request.data.sid, sid);
-       if (winbindd_request(WINBINDD_SID_TO_GID, &request, &response) ==
-           WINBINDD_ERROR) {
+
+       if (winbindd_request(WINBINDD_SID_TO_GID, &request, &response) !=
+           NSS_STATUS_SUCCESS)
                return False;
-       }
 
        /* Display response */
 
-       printf("%d\n", (int)response.data.gid);
+       d_printf("%d\n", (int)response.data.gid);
 
        return True;
 }
@@ -223,14 +380,16 @@ static BOOL wbinfo_lookupsid(char *sid)
        /* Send off request */
 
        fstrcpy(request.data.sid, sid);
-       if (winbindd_request(WINBINDD_LOOKUPSID, &request, &response) ==
-           WINBINDD_ERROR) {
+
+       if (winbindd_request(WINBINDD_LOOKUPSID, &request, &response) !=
+           NSS_STATUS_SUCCESS)
                return False;
-       }
 
        /* Display response */
 
-       printf("%s %d\n", response.data.name.name, response.data.name.type);
+       d_printf("%s%c%s %d\n", response.data.name.dom_name, 
+                winbind_separator(), response.data.name.name, 
+                response.data.name.type);
 
        return True;
 }
@@ -247,213 +406,732 @@ static BOOL wbinfo_lookupname(char *name)
        ZERO_STRUCT(request);
        ZERO_STRUCT(response);
 
-       fstrcpy(request.data.name, name);
-       if (winbindd_request(WINBINDD_LOOKUPNAME, &request, &response) ==
-           WINBINDD_ERROR) {
+       parse_wbinfo_domain_user(name, request.data.name.dom_name, 
+                                request.data.name.name);
+
+       if (winbindd_request(WINBINDD_LOOKUPNAME, &request, &response) !=
+           NSS_STATUS_SUCCESS)
                return False;
+
+       /* Display response */
+
+       d_printf("%s %d\n", response.data.sid.sid, response.data.sid.type);
+
+       return True;
+}
+
+/* Authenticate a user with a plaintext password */
+
+static BOOL wbinfo_auth(char *username)
+{
+       struct winbindd_request request;
+       struct winbindd_response response;
+        NSS_STATUS result;
+        char *p;
+
+       /* Send off request */
+
+       ZERO_STRUCT(request);
+       ZERO_STRUCT(response);
+
+        p = strchr(username, '%');
+
+        if (p) {
+                *p = 0;
+                fstrcpy(request.data.auth.user, username);
+                fstrcpy(request.data.auth.pass, p + 1);
+                *p = '%';
+        } else
+                fstrcpy(request.data.auth.user, username);
+
+       result = winbindd_request(WINBINDD_PAM_AUTH, &request, &response);
+
+       /* Display response */
+
+        d_printf("plaintext password authentication %s\n", 
+               (result == NSS_STATUS_SUCCESS) ? "succeeded" : "failed");
+
+       if (response.data.auth.nt_status)
+               d_printf("error code was %s (0x%x)\nerror messsage was: %s\n", 
+                        response.data.auth.nt_status_string, 
+                        response.data.auth.nt_status,
+                        response.data.auth.error_string);
+
+        return result == NSS_STATUS_SUCCESS;
+}
+
+/* Authenticate a user with a challenge/response */
+
+static BOOL wbinfo_auth_crap(char *username)
+{
+       struct winbindd_request request;
+       struct winbindd_response response;
+        NSS_STATUS result;
+        fstring name_user;
+        fstring name_domain;
+        fstring pass;
+        char *p;
+
+       /* Send off request */
+
+       ZERO_STRUCT(request);
+       ZERO_STRUCT(response);
+
+        p = strchr(username, '%');
+
+        if (p) {
+                *p = 0;
+                fstrcpy(pass, p + 1);
        }
+               
+       parse_wbinfo_domain_user(username, name_domain, 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;
+       }
+
+       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);
+        
+        SMBencrypt(pass, request.data.auth_crap.chal, 
+                   (uchar *)request.data.auth_crap.lm_resp);
+        SMBNTencrypt(pass, request.data.auth_crap.chal,
+                     (uchar *)request.data.auth_crap.nt_resp);
+
+        request.data.auth_crap.lm_resp_len = 24;
+        request.data.auth_crap.nt_resp_len = 24;
+
+       result = winbindd_request(WINBINDD_PAM_AUTH_CRAP, &request, &response);
 
        /* Display response */
 
-       printf("%s %d\n", response.data.sid.sid, response.data.sid.type);
+        d_printf("challenge/response password authentication %s\n", 
+               (result == NSS_STATUS_SUCCESS) ? "succeeded" : "failed");
+
+       if (response.data.auth.nt_status)
+               d_printf("error code was %s (0x%x)\nerror messsage was: %s\n", 
+                        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;
+       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) ==
-           WINBINDD_ERROR) {
+       if (winbindd_request(WINBINDD_LIST_USERS, &request, &response) !=
+           NSS_STATUS_SUCCESS)
                return False;
-       }
 
        /* Look through extra data */
 
-       if (!response.extra_data) {
+       if (!response.extra_data)
                return False;
-       }
 
-       while(next_token((char **)&response.extra_data, name, ",", 
-                        sizeof(fstring))) {
-               printf("%s\n", name);
-       }
+       extra_data = (const char *)response.extra_data;
+
+       while(next_token(&extra_data, name, ",", sizeof(fstring)))
+               d_printf("%s\n", name);
        
+       SAFE_FREE(response.extra_data);
+
        return True;
 }
 
 /* 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;
+       const char *extra_data;
        fstring name;
 
+       ZERO_STRUCT(request);
        ZERO_STRUCT(response);
 
-       if (winbindd_request(WINBINDD_LIST_GROUPS, NULL, &response) ==
-           WINBINDD_ERROR) {
-               return False;
+       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;
+
        /* Look through extra data */
 
-       if (!response.extra_data) {
+       if (!response.extra_data)
                return False;
-       }
 
-       while(next_token((char **)&response.extra_data, name, ",", 
-                        sizeof(fstring))) {
-               printf("%s\n", name);
-       }
+       extra_data = (const char *)response.extra_data;
+
+       while(next_token(&extra_data, name, ",", sizeof(fstring)))
+               d_printf("%s\n", name);
+
+       SAFE_FREE(response.extra_data);
        
        return True;
 }
 
-/* Print program usage */
+/* Set the authorised user for winbindd access in secrets.tdb */
 
-static void usage(void)
+static BOOL wbinfo_set_auth_user(char *username)
 {
-       printf("Usage: wbinfo -ug | -n name | -sSY sid | -UG uid/gid | -tm\n");
-       printf("\t-u\tlists all domain users\n");
-       printf("\t-g\tlists all domain groups\n");
-       printf("\t-n name\tconverts name to sid\n");
-       printf("\t-s sid\tconverts sid to name\n");
-       printf("\t-U uid\tconverts uid to sid\n");
-       printf("\t-G gid\tconverts gid to sid\n");
-       printf("\t-S sid\tconverts sid to uid\n");
-       printf("\t-Y sid\tconverts sid to gid\n");
-       printf("\t-t\tcheck shared secret\n");
-       printf("\t-m\tlist trusted domains\n");
-       printf("\t-r user\tget user groups\n");
+       char *password;
+       fstring user, domain;
+
+       /* Separate into user and password */
+
+       parse_wbinfo_domain_user(username, domain, user);
+
+       password = strchr(user, '%');
+
+       if (password) {
+               *password = 0;
+               password++;
+       } 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;
+}
+
+static void wbinfo_get_auth_user(void)
+{
+       char *user, *domain, *password;
+
+       /* Lift data from secrets file */
+
+       secrets_init();
+
+       user = secrets_fetch(SECRETS_AUTH_USER, NULL);
+       domain = secrets_fetch(SECRETS_AUTH_DOMAIN, NULL);
+       password = secrets_fetch(SECRETS_AUTH_PASSWORD, NULL);
+
+       if (!user && !domain && !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 ? "\\" : "",
+                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 on fd %d\n", 
+               (result == NSS_STATUS_SUCCESS) ? "succeeded" : "failed", winbindd_fd);
+
+        return result == NSS_STATUS_SUCCESS;
 }
 
 /* Main program */
 
+enum {
+       OPT_SET_AUTH_USER = 1000,
+       OPT_GET_AUTH_USER,
+       OPT_DOMAIN_NAME,
+       OPT_SEQUENCE
+};
+
 int main(int argc, char **argv)
 {
-       extern pstring global_myname;
        int opt;
 
-       /* Samba client initialisation */
+       poptContext pc;
+       static char *string_arg;
+       static char *opt_domain_name;
+       static int int_arg;
+       int result = 1;
+
+       struct poptOption long_options[] = {
+               POPT_AUTOHELP
+
+               /* longName, shortName, argInfo, argPtr, value, descrip, 
+                  argDesc */
+
+               { "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", "USER" },
+               { "authenticate", 'a', POPT_ARG_STRING, &string_arg, 'a', "authenticate user", "user%password" },
+               { "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 operatio", "domain" },
+               POPT_COMMON_VERSION
+               POPT_TABLEEND
+       };
 
-       if (!*global_myname) {
-               char *p;
+       /* Samba client initialisation */
 
-               fstrcpy(global_myname, myhostname());
-               p = strchr_m(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);
        }
 
-       TimeInit();
+       if (!init_names())
+               return 1;
 
-       if (!lp_load(CONFIGFILE, True, False, False)) {
-               DEBUG(0, ("error opening config file\n"));
-               exit(1);
-       }
-       
        load_interfaces();
 
+       /* Parse options */
+
+       pc = poptGetContext("wbinfo", argc, (const char **)argv, long_options, 0);
+
        /* Parse command line options */
 
        if (argc == 1) {
-               usage();
+               poptPrintHelp(pc, stderr, 0);
                return 1;
        }
 
-       while ((opt = getopt(argc, argv, "ugs:n:U:G:S:Y:tmr:")) != EOF) {
+       while((opt = poptGetNextOpt(pc)) != -1) {
+               /* get the generic configuration parameters like --domain */
+       }
+
+       poptFreeContext(pc);
+
+       pc = poptGetContext(NULL, argc, (const char **)argv, long_options, 
+                           POPT_CONTEXT_KEEP_FIRST);
+
+       while((opt = poptGetNextOpt(pc)) != -1) {
                switch (opt) {
                case 'u':
-                       if (!print_domain_users()) {
-                               printf("Error looking up domain users\n");
-                               return 1;
+                       if (!print_domain_users(opt_domain_name)) {
+                               d_printf("Error looking up domain users\n");
+                               goto done;
                        }
                        break;
                case 'g':
-                       if (!print_domain_groups()) {
-                               printf("Error looking up domain groups\n");
-                               return 1;
+                       if (!print_domain_groups(opt_domain_name)) {
+                               d_printf("Error looking up domain groups\n");
+                               goto done;
                        }
                        break;
                case 's':
-                       if (!wbinfo_lookupsid(optarg)) {
-                               printf("Could not lookup sid %s\n", optarg);
-                               return 1;
+                       if (!wbinfo_lookupsid(string_arg)) {
+                               d_printf("Could not lookup sid %s\n", string_arg);
+                               goto done;
                        }
                        break;
                case 'n':
-                       if (!wbinfo_lookupname(optarg)) {
-                               printf("Could not lookup name %s\n", optarg);
-                               return 1;
+                       if (!wbinfo_lookupname(string_arg)) {
+                               d_printf("Could not lookup name %s\n", string_arg);
+                               goto done;
+                       }
+                       break;
+               case 'N':
+                       if (!wbinfo_wins_byname(string_arg)) {
+                               d_printf("Could not lookup WINS by name %s\n", string_arg);
+                               goto done;
+                       }
+                       break;
+               case 'I':
+                       if (!wbinfo_wins_byip(string_arg)) {
+                               d_printf("Could not lookup WINS by IP %s\n", string_arg);
+                               goto done;
                        }
                        break;
                case 'U':
-                       if (!wbinfo_uid_to_sid(atoi(optarg))) {
-                               printf("Could not convert uid %s to sid\n",
-                                      optarg);
-                               return 1;
+                       if (!wbinfo_uid_to_sid(int_arg)) {
+                               d_printf("Could not convert uid %d to sid\n", int_arg);
+                               goto done;
                        }
                        break;
                case 'G':
-                       if (!wbinfo_gid_to_sid(atoi(optarg))) {
-                               printf("Could not convert gid %s to sid\n",
-                                      optarg);
-                               return 1;
+                       if (!wbinfo_gid_to_sid(int_arg)) {
+                               d_printf("Could not convert gid %d to sid\n",
+                                      int_arg);
+                               goto done;
                        }
                        break;
                case 'S':
-                       if (!wbinfo_sid_to_uid(optarg)) {
-                               printf("Could not convert sid %s to uid\n",
-                                      optarg);
-                               return 1;
+                       if (!wbinfo_sid_to_uid(string_arg)) {
+                               d_printf("Could not convert sid %s to uid\n",
+                                      string_arg);
+                               goto done;
                        }
                        break;
                case 'Y':
-                       if (!wbinfo_sid_to_gid(optarg)) {
-                               printf("Could not convert sid %s to gid\n",
-                                      optarg);
-                               return 1;
+                       if (!wbinfo_sid_to_gid(string_arg)) {
+                               d_printf("Could not convert sid %s to gid\n",
+                                      string_arg);
+                               goto done;
                        }
                        break;
                case 't':
                        if (!wbinfo_check_secret()) {
-                               printf("Could not check secret\n");
-                               return 1;
+                               d_printf("Could not check secret\n");
+                               goto done;
                        }
                        break;
                case 'm':
                        if (!wbinfo_list_domains()) {
-                               printf("Could not list trusted domains\n");
-                               return 1;
+                               d_printf("Could not list trusted domains\n");
+                               goto done;
+                       }
+                       break;
+               case OPT_SEQUENCE:
+                       if (!wbinfo_show_sequence(opt_domain_name)) {
+                               d_printf("Could not show sequence numbers\n");
+                               goto done;
                        }
                        break;
                case 'r':
-                       if (!wbinfo_get_usergroups(optarg)) {
-                               printf("Could not get groups for user %s\n", 
-                                      optarg);
-                               return 1;
+                       if (!wbinfo_get_usergroups(string_arg)) {
+                               d_printf("Could not get groups for user %s\n", 
+                                      string_arg);
+                               goto done;
                        }
                        break;
-                               
-                      /* Invalid option */
-
+               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 kfrom 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:
-                       usage();
-                       return 1;
+                       d_fprintf(stderr, "Invalid option\n");
+                       poptPrintHelp(pc, stderr, 0);
+                       goto done;
                }
        }
-       
-       /* Clean exit */
 
-       return 0;
+       result = 0;
+
+       /* Exit code */
+
+ done:
+       poptFreeContext(pc);
+       return result;
 }