From: Pierangelo Masarati Date: Tue, 4 Jan 2011 01:02:12 +0000 (+0000) Subject: fix previous commit X-Git-Tag: MIGRATION_CVS2GIT~264 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e2440ccb004b86209a4ebab5d0ef7be5ca396d69;p=openldap fix previous commit --- diff --git a/clients/tools/common.c b/clients/tools/common.c index e68a3421af..c9301a54bd 100644 --- a/clients/tools/common.c +++ b/clients/tools/common.c @@ -162,7 +162,7 @@ static struct tool_ctrls_t { { LDAP_CONTROL_PAGEDRESULTS, TOOL_SEARCH, print_paged_results }, #ifdef LDAP_CONTROL_AUTHZID_RESPONSE /* this is generally deprecated in favor of LDAP WhoAmI? operation, hence only supported as a VC inner control */ - { LDAP_CONTROL_PASSWORDPOLICYRESPONSE, TOOL_VC, print_authzid }, + { LDAP_CONTROL_AUTHZID_RESPONSE, TOOL_VC, print_authzid }, #endif #ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST { LDAP_CONTROL_PASSWORDPOLICYRESPONSE, TOOL_ALL, print_ppolicy }, diff --git a/libraries/libldap/vc.c b/libraries/libldap/vc.c index 90c7d19561..03a57ceabc 100644 --- a/libraries/libldap/vc.c +++ b/libraries/libldap/vc.c @@ -117,7 +117,7 @@ int ldap_parse_verify_credentials( *ctrls = LDAP_MALLOC(1 * sizeof(LDAPControl *)); - if (*ctrls) { + if (!*ctrls) { rc = LDAP_NO_MEMORY; goto done; }