From 3940a574f95750e6bd02dcc30953db0fe9146f0a Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Tue, 27 Aug 2013 17:34:46 -0400 Subject: Re-order NULL check in ipa_lockout. There is no risk of crash here as slapi_valueset_first_value() can handle the case where the valueset is NULL, but there is no point in calling that if we know there are no values. https://fedorahosted.org/freeipa/ticket/3880 --- daemons/ipa-slapi-plugins/ipa-lockout/ipa_lockout.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/daemons/ipa-slapi-plugins/ipa-lockout/ipa_lockout.c b/daemons/ipa-slapi-plugins/ipa-lockout/ipa_lockout.c index 9e903aaf1..fd6602fde 100644 --- a/daemons/ipa-slapi-plugins/ipa-lockout/ipa_lockout.c +++ b/daemons/ipa-slapi-plugins/ipa-lockout/ipa_lockout.c @@ -244,9 +244,8 @@ int ipalockout_getpolicy(Slapi_Entry *target_entry, Slapi_Entry **policy_entry, if (ldrc == 0) { Slapi_Value *sv = NULL; - slapi_valueset_first_value(*values, &sv); - if (values != NULL) { + slapi_valueset_first_value(*values, &sv); *policy_dn = slapi_value_get_string(sv); } } -- cgit