IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix condition bug in ipa-pwd-extop plugin. Variable used uninitialized.

Browse Source
This commit is contained in:
Pavel Zuna
2010-02-04 16:31:24 +01:00
committed by Rob Crittenden
parent 3ff06c498b
commit 00b2f240f7
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
View File

@@ -3467,7 +3467,8 @@ static int ipapwd_pre_add(Slapi_PBlock *pb)
struct ipapwd_operation *pwdop = NULL; struct ipapwd_operation *pwdop = NULL;
void *op; void *op;
int is_repl_op, is_root, is_krb, is_smb; int is_repl_op, is_root, is_krb, is_smb;
int ret, rc; int ret;
int rc = LDAP_SUCCESS;
slapi_log_error(SLAPI_LOG_TRACE, IPAPWD_PLUGIN_NAME, "=> ipapwd_pre_add\n"); slapi_log_error(SLAPI_LOG_TRACE, IPAPWD_PLUGIN_NAME, "=> ipapwd_pre_add\n");
@@ -3516,14 +3517,16 @@ static int ipapwd_pre_add(Slapi_PBlock *pb)
/* unhashed#user#password doesn't always contain the clear text /* unhashed#user#password doesn't always contain the clear text
* password, therefore we need to check if its value isn't the same * password, therefore we need to check if its value isn't the same
* as userPassword to make sure */ * as userPassword to make sure */
if (!userpw || (0 == strcmp(userpw, userpw_clear))) { if (!userpw_clear || (0 == strcmp(userpw, userpw_clear))) {
rc = LDAP_CONSTRAINT_VIOLATION; rc = LDAP_CONSTRAINT_VIOLATION;
slapi_ch_free_string(&userpw);
} else {
userpw = slapi_ch_strdup(userpw_clear);
} }
slapi_ch_free_string(&userpw);
slapi_ch_free_string(&userpw_clear); slapi_ch_free_string(&userpw_clear);
if (rc) { if (rc != LDAP_SUCCESS) {
/* we don't have access to the clear text password; /* we don't have access to the clear text password;
* let it slide if migration is enabled, but don't * let it slide if migration is enabled, but don't
* generate kerberos keys */ * generate kerberos keys */
@@ -3547,12 +3550,12 @@ static int ipapwd_pre_add(Slapi_PBlock *pb)
rc = ipapwd_entry_checks(pb, e, rc = ipapwd_entry_checks(pb, e,
&is_root, &is_krb, &is_smb, &is_root, &is_krb, &is_smb,
NULL, SLAPI_ACL_ADD); NULL, SLAPI_ACL_ADD);
if (rc) { if (rc != LDAP_SUCCESS) {
goto done; goto done;
} }
rc = ipapwd_gen_checks(pb, &errMesg, &krbcfg, IPAPWD_CHECK_DN); rc = ipapwd_gen_checks(pb, &errMesg, &krbcfg, IPAPWD_CHECK_DN);
if (rc) { if (rc != LDAP_SUCCESS) {
goto done; goto done;
} }
@@ -3623,7 +3626,7 @@ static int ipapwd_pre_add(Slapi_PBlock *pb)
pwdop, userpw, pwdop, userpw,
is_krb, is_smb, is_krb, is_smb,
&svals, &nt, &lm); &svals, &nt, &lm);
if (rc) { if (rc != LDAP_SUCCESS) {
goto done; goto done;
} }