mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-02-23 14:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#10130 Several callers of getpassphrase() ignore NULL returns

Browse Source
This commit is contained in:
Stacey Marshall 2023-11-14 16:36:16 +00:00 committed by Quanah Gibson-Mount
parent f5c96f4469
commit 8139458b39
5 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clients/tools/common.c
View File

@ -1495,10 +1495,11 @@ tool_bind( LDAP *ld )
} else {
char *pw = getpassphrase( _("Enter LDAP Password: ") );
if ( pw ) {
passwd.bv_val = ber_strdup( pw );
passwd.bv_len = strlen( passwd.bv_val );
if ( pw == NULL ) { /* Allow EOF to exit. */
tool_exit( ld, EXIT_FAILURE );
}
passwd.bv_val = ber_strdup( pw );
passwd.bv_len = strlen( passwd.bv_val );
}
}

14
clients/tools/ldappasswd.c
View File

@ -220,7 +220,12 @@ main( int argc, char *argv[] )
if( want_oldpw && oldpw.bv_val == NULL ) {
/* prompt for old password */
char *ckoldpw;
oldpw.bv_val = strdup(getpassphrase(_("Old password: ")));
ckoldpw = getpassphrase(_("Old password: "));
if ( ckoldpw == NULL ) { /* Allow EOF to exit. */
rc = EXIT_FAILURE;
goto done;
}
oldpw.bv_val = strdup( ckoldpw );
ckoldpw = getpassphrase(_("Re-enter old password: "));
if( oldpw.bv_val == NULL || ckoldpw == NULL ||
@ -245,7 +250,12 @@ main( int argc, char *argv[] )
if( want_newpw && newpw.bv_val == NULL ) {
/* prompt for new password */
char *cknewpw;
newpw.bv_val = strdup(getpassphrase(_("New password: ")));
cknewpw = getpassphrase(_("New password: "));
if ( cknewpw == NULL ) { /* Allow EOF to exit. */
rc = EXIT_FAILURE;
goto done;
}
newpw.bv_val = strdup( cknewpw );
cknewpw = getpassphrase(_("Re-enter new password: "));
if( newpw.bv_val == NULL || cknewpw == NULL ||

10
clients/tools/ldapvc.c
View File

@ -309,8 +309,14 @@ main( int argc, char *argv[] )
#endif
&& !cred.bv_val)
{
cred.bv_val = strdup(getpassphrase(_("User's password: ")));
cred.bv_len = strlen(cred.bv_val);
char *userpw = getpassphrase(_("User's password: "));
if ( userpw == NULL ) /* Allow EOF to exit. */
{
free( cred.bv_val );
tool_exit( ld, EXIT_FAILURE );
}
cred.bv_val = strdup(userpw);
cred.bv_len = strlen(cred.bv_val);
}
#ifdef LDAP_API_FEATURE_VERIFY_CREDENTIALS_INTERACTIVE

13
servers/slapd/slappasswd.c
View File

@ -250,11 +250,16 @@ slappasswd( int argc, char *argv[] )
if( newpw == NULL ) {
/* prompt for new password */
char *cknewpw;
newpw = ch_strdup(getpassphrase("New password: "));
newpw = getpassphrase("New password: ");
if ( newpw == NULL ) { /* Allow EOF to exit. */
rc = EXIT_FAILURE;
goto destroy;
}
newpw = ch_strdup(newpw);
cknewpw = getpassphrase("Re-enter new password: ");
if( strcmp( newpw, cknewpw )) {
fprintf( stderr, "Password values do not match\n" );
if( cknewpw == NULL || strcmp( newpw, cknewpw )) {
fprintf( stderr,
"Password values do not match\n" );
rc = EXIT_FAILURE;
goto destroy;
}

3
tests/progs/slapd-tester.c
View File

@ -406,6 +406,9 @@ main( int argc, char **argv )
if ( pw_ask ) {
passwd = getpassphrase( _("Enter LDAP Password: ") );
if ( passwd == NULL ) { /* Allow EOF to exit. */
exit( EXIT_FAILURE );
}
} else if ( pw_file ) {
struct berval pw;