diff options
author | Lars Müller <lmuelle@samba.org> | 2006-02-16 16:22:44 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:10:10 -0500 |
commit | 394d1aeb8e2922a261efa78d65fc21defde63448 (patch) | |
tree | 4ae9cbaea3a9d8e5e9a9c7cb1a503f1577faf8b0 /source3/utils/smbpasswd.c | |
parent | ee078e61a6e4d0ae462ff480d89eb83298523ec3 (diff) | |
download | samba-394d1aeb8e2922a261efa78d65fc21defde63448.tar.gz samba-394d1aeb8e2922a261efa78d65fc21defde63448.tar.bz2 samba-394d1aeb8e2922a261efa78d65fc21defde63448.zip |
r13524: Add -t|--password-from-stdin option to pdbedit as we had with Samba 2.2.
This fixes bug #1386.
The initial changes had been made by Carsten Höger <choeger at
open-xhange dot com> for Samba 2.2 while being at SuSE. *sigh*
To not duplicate code from smbpasswd in pdbedit stdin_new_passwd() and
get_pass() are moved from smbpasswd to utils/passwd_util.c.
(This used to be commit dbdc5ba497c6010dbad47c9d77fc8bec5557a328)
Diffstat (limited to 'source3/utils/smbpasswd.c')
-rw-r--r-- | source3/utils/smbpasswd.c | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c index 4323ee29e0..9325c24881 100644 --- a/source3/utils/smbpasswd.c +++ b/source3/utils/smbpasswd.c @@ -197,48 +197,6 @@ static int process_options(int argc, char **argv, int local_flags) } /************************************************************* - Utility function to prompt for passwords from stdin. Each - password entered must end with a newline. -*************************************************************/ -static char *stdin_new_passwd(void) -{ - static fstring new_pw; - size_t len; - - ZERO_ARRAY(new_pw); - - /* - * if no error is reported from fgets() and string at least contains - * the newline that ends the password, then replace the newline with - * a null terminator. - */ - if ( fgets(new_pw, sizeof(new_pw), stdin) != NULL) { - if ((len = strlen(new_pw)) > 0) { - if(new_pw[len-1] == '\n') - new_pw[len - 1] = 0; - } - } - return(new_pw); -} - - -/************************************************************* - Utility function to get passwords via tty or stdin - Used if the '-s' option is set to silently get passwords - to enable scripting. -*************************************************************/ -static char *get_pass( const char *prompt, BOOL stdin_get) -{ - char *p; - if (stdin_get) { - p = stdin_new_passwd(); - } else { - p = getpass(prompt); - } - return smb_xstrdup(p); -} - -/************************************************************* Utility function to prompt for new password. *************************************************************/ static char *prompt_for_new_password(BOOL stdin_get) |