diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2013-01-01 14:12:29 +0100 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2013-01-01 14:12:29 +0100 |
| commit | 82010e23099d70b6b2b1fc04b301259a04269e39 (patch) | |
| tree | 1de67fb4868bdb5536c3cd501704532dd7b24ca4 /nslcd/myldap.c | |
| parent | 2f6f6a20a8d9a21ee20a976d78f97e5f9949bb17 (diff) | |
log and return a diagnostic message instead of just the LDAP error on password change failure
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1895 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd/myldap.c')
| -rw-r--r-- | nslcd/myldap.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/nslcd/myldap.c b/nslcd/myldap.c index bacfb4f..883fbc7 100644 --- a/nslcd/myldap.c +++ b/nslcd/myldap.c @@ -1977,3 +1977,29 @@ int myldap_modify(MYLDAP_SESSION *session, const char *dn, LDAPMod * mods[]) } return ldap_modify_ext_s(session->ld, dn, mods, NULL, NULL); } + +int myldap_error_message(MYLDAP_SESSION *session, int rc, + char *buffer, size_t buflen) +{ + char *msg_diag = NULL; + if (!is_valid_session(session) || (buffer == NULL) || (buflen <= 0)) + { + log_log(LOG_ERR, "myldap_error_message(): invalid parameter passed"); + errno = EINVAL; + return LDAP_OTHER; + } + /* clear buffer */ + buffer[0] = '\0'; +#ifdef LDAP_OPT_DIAGNOSTIC_MESSAGE + if (session->ld != NULL) + ldap_get_option(session->ld, LDAP_OPT_DIAGNOSTIC_MESSAGE, &msg_diag); +#endif /* LDAP_OPT_DIAGNOSTIC_MESSAGE */ + /* return msg_diag or generic error message */ + mysnprintf(buffer, buflen - 1, "%s", + ((msg_diag != NULL) && (msg_diag[0]!='\0')) ? + msg_diag : ldap_err2string(rc)); + /* free diagnostic message */ + if (msg_diag != NULL) + ldap_memfree(msg_diag); + return LDAP_SUCCESS; +} |