diff options
| author | Michen Chang <Michen.Chang@Sun.COM> | 2010-03-10 13:19:51 -0800 |
|---|---|---|
| committer | Michen Chang <Michen.Chang@Sun.COM> | 2010-03-10 13:19:51 -0800 |
| commit | 20945219a0f4861cc03785ce980b5814bad7267d (patch) | |
| tree | e10c530a104afb085f1c451465878af0ecced055 /usr/src/lib/libsldap | |
| parent | 15766bceb715eeb30eacf0edf5da34f6337d80fe (diff) | |
| download | illumos-joyent-20945219a0f4861cc03785ce980b5814bad7267d.tar.gz | |
6930785 passwd command crashes on LDAP client using passwd_compat, if the new password is in the pwd-history
Diffstat (limited to 'usr/src/lib/libsldap')
| -rw-r--r-- | usr/src/lib/libsldap/common/ns_writes.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/usr/src/lib/libsldap/common/ns_writes.c b/usr/src/lib/libsldap/common/ns_writes.c index fe62259a7e..86444725f9 100644 --- a/usr/src/lib/libsldap/common/ns_writes.c +++ b/usr/src/lib/libsldap/common/ns_writes.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -675,6 +675,7 @@ write_state_machine( int len; int msgid; int Errno; + boolean_t from_get_lderrno = B_FALSE; int always = 1; char *err, *errmsg = NULL; /* referrals returned by the LDAP operation */ @@ -827,13 +828,24 @@ write_state_machine( Errno = rc; (void) ldap_get_lderrno(conp->ld, NULL, &errmsg); + /* - * free errmsg if it is an empty string + * No need to deal with the error message if + * it's an empty string. */ - if (errmsg && *errmsg == '\0') { - ldap_memfree(errmsg); + if (errmsg != NULL && *errmsg == '\0') errmsg = NULL; + + if (errmsg != NULL) { + /* + * ldap_get_lderrno does not expect + * errmsg to be freed after use, while + * ldap_parse_result below does, so set + * a flag to indicate source. + */ + from_get_lderrno = B_TRUE; } + new_state = W_LDAP_ERROR; } else { return_rc = NS_LDAP_SUCCESS; @@ -1039,8 +1051,13 @@ write_state_machine( pwd_status = __s_api_set_passwd_status( Errno, errmsg); - ldap_memfree(errmsg); + /* + * free only if not returned by ldap_get_lderrno + */ + if (!from_get_lderrno) + ldap_memfree(errmsg); errmsg = NULL; + from_get_lderrno = B_FALSE; } (void) snprintf(errstr, sizeof (errstr), |