mirror of
https://github.com/samba-team/samba.git
synced 2024-12-27 03:21:53 +03:00
ef5a3bedab
get_pass can return NULL on error. Ensure that this is always the case and fix all callers to cope (some already did). Reported by Joonas Kuorilehto <joneskoo@codenomicon.com> BUG: https://bugzilla.samba.org/show_bug.cgi?id=10320 Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Volker Lendecke <vl@samba.org> Autobuild-User(master): Volker Lendecke <vl@samba.org> Autobuild-Date(master): Mon Dec 16 15:17:58 CET 2013 on sn-devel-104
80 lines
2.2 KiB
C
80 lines
2.2 KiB
C
/*
|
|
Unix SMB/CIFS implementation.
|
|
passdb editing frontend
|
|
|
|
Copyright (C) Jeremy Allison 1998
|
|
Copyright (C) Andrew Tridgell 1998
|
|
Copyright (C) Tim Potter 2000
|
|
Copyright (C) Simo Sorce 2000
|
|
Copyright (C) Martin Pool 2001
|
|
Copyright (C) Gerald Carter 2002
|
|
Copyright (C) Andrew Bartlett 2003
|
|
|
|
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
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "includes.h"
|
|
|
|
/*************************************************************
|
|
Utility function to prompt for passwords from stdin. Each
|
|
password entered must end with a newline.
|
|
*************************************************************/
|
|
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) {
|
|
return 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' (smbpasswd) or '-t' (pdbedit) option is set
|
|
to silently get passwords to enable scripting.
|
|
*************************************************************/
|
|
char *get_pass( const char *prompt, bool stdin_get)
|
|
{
|
|
char pwd[256] = {0};
|
|
char *p;
|
|
int rc;
|
|
|
|
if (stdin_get) {
|
|
p = stdin_new_passwd();
|
|
if (p == NULL) {
|
|
return NULL;
|
|
}
|
|
} else {
|
|
rc = samba_getpass(prompt, pwd, sizeof(pwd), false, false);
|
|
if (rc < 0) {
|
|
return NULL;
|
|
}
|
|
p = pwd;
|
|
}
|
|
return smb_xstrdup( p);
|
|
}
|