[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3761-g687ef28

[Günther Deschner]

The branch, v3-devel has been updated
       via  687ef28874eb311b3e3919c3a38a22e5186d4c1b (commit)
       via  7cf6ed68236e7dd64657cb1087a5a687d6f59ad1 (commit)
      from  8504a92ac55d6936df051be66207a59a76bf32a3 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel


- Log -----------------------------------------------------------------
commit 687ef28874eb311b3e3919c3a38a22e5186d4c1b
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Tue Aug 19 15:09:12 2008 +0200

    wbinfo: use wbinfo_prompt_pass() everywhere.
    
    Guenther

commit 7cf6ed68236e7dd64657cb1087a5a687d6f59ad1
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Tue Aug 19 15:32:37 2008 +0200

    wbinfo: add wbinfo_prompt_pass.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/nsswitch/wbinfo.c |   66 ++++++++++++++++++++++++++++++----------------
 1 files changed, 43 insertions(+), 23 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/wbinfo.c b/source/nsswitch/wbinfo.c
index c1d41a5..463d923 100644
--- a/source/nsswitch/wbinfo.c
+++ b/source/nsswitch/wbinfo.c
@@ -879,6 +879,33 @@ static bool wbinfo_lookupname(const char *full_name)
        return true;
 }
 
+static char *wbinfo_prompt_pass(const char *prefix,
+                               const char *username)
+{
+       char *prompt;
+       const char *ret = NULL;
+
+       prompt = talloc_asprintf(talloc_tos(), "Enter %s's ", username);
+       if (!prompt) {
+               return NULL;
+       }
+       if (prefix) {
+               prompt = talloc_asprintf_append(prompt, "%s ", prefix);
+               if (!prompt) {
+                       return NULL;
+               }
+       }
+       prompt = talloc_asprintf_append(prompt, "password: ");
+       if (!prompt) {
+               return NULL;
+       }
+
+       ret = getpass(prompt);
+       TALLOC_FREE(prompt);
+
+       return SMB_STRDUP(ret);
+}
+
 /* Authenticate a user with a plaintext password */
 
 static bool wbinfo_auth_krb5(char *username, const char *cctype, uint32 flags)
@@ -887,6 +914,7 @@ static bool wbinfo_auth_krb5(char *username, const char 
*cctype, uint32 flags)
        struct winbindd_response response;
        NSS_STATUS result;
        char *p;
+       char *password;
 
        /* Send off request */
 
@@ -900,8 +928,12 @@ static bool wbinfo_auth_krb5(char *username, const char 
*cctype, uint32 flags)
                fstrcpy(request.data.auth.user, username);
                fstrcpy(request.data.auth.pass, p + 1);
                *p = '%';
-       } else
+       } else {
                fstrcpy(request.data.auth.user, username);
+               password = wbinfo_prompt_pass(NULL, username);
+               fstrcpy(request.data.auth.pass, password);
+               SAFE_FREE(password);
+       }
 
        request.flags = flags;
 
@@ -947,7 +979,7 @@ static bool wbinfo_auth(char *username)
        wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
        char *s = NULL;
        char *p = NULL;
-       const char *password = NULL;
+       char *password = NULL;
        char *name = NULL;
 
        if ((s = SMB_STRDUP(username)) == NULL) {
@@ -957,16 +989,9 @@ static bool wbinfo_auth(char *username)
        if ((p = strchr(s, '%')) != NULL) {
                *p = 0;
                p++;
-               password = p;
+               password = SMB_STRDUP(p);
        } else {
-               char *prompt;
-               asprintf(&prompt, "Enter %s's password:", username);
-               if (!prompt) {
-                       return false;
-               }
-
-               password = getpass(prompt);
-               SAFE_FREE(prompt);
+               password = wbinfo_prompt_pass(NULL, username);
        }
 
        name = s;
@@ -985,6 +1010,7 @@ static bool wbinfo_auth(char *username)
 #endif
 
        SAFE_FREE(s);
+       SAFE_FREE(password);
 
        return WBC_ERROR_IS_OK(wbc_status);
 }
@@ -1001,26 +1027,18 @@ static bool wbinfo_auth_crap(char *username)
        DATA_BLOB nt = data_blob_null;
        fstring name_user;
        fstring name_domain;
-       fstring pass;
+       char *pass;
        char *p;
 
        p = strchr(username, '%');
 
        if (p) {
                *p = 0;
-               fstrcpy(pass, p + 1);
+               pass = SMB_STRDUP(p + 1);
        } else {
-               char *prompt;
-               asprintf(&prompt, "Enter %s's password:", username);
-               if (!prompt) {
-                       return false;
-               }
-
-               fstrcpy(pass, getpass(prompt));
-               SAFE_FREE(prompt);
-
+               pass = wbinfo_prompt_pass(NULL, username);
        }
-               
+
        parse_wbinfo_domain_user(username, name_domain, name_user);
 
        params.account_name     = name_user;
@@ -1049,6 +1067,7 @@ static bool wbinfo_auth_crap(char *username)
                                      &lm, &nt, NULL)) {
                        data_blob_free(&names_blob);
                        data_blob_free(&server_chal);
+                       SAFE_FREE(pass);
                        return false;
                }
                data_blob_free(&names_blob);
@@ -1093,6 +1112,7 @@ 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);
 }


-- 
Samba Shared Repository