On Thu, 03 Nov 2011, Simo Sorce wrote: > Just some unchecked returns, we do not care much, but will keep Coverity > happy. ACK to all below, they seem to be straight-forward. As slapi_ch_free_string() accepts a pointer to NULL and does nothing in that case, you don't need to protect against fetched NULL in ipa_pwd_extop.c.
> https://fedorahosted.org/freeipa/ticket/2036 > --- > .../ipa-enrollment/ipa_enrollment.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c > b/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c > index > 1f5ce9b477a6152e3ef7befeea1230ab75dfba70..9f884bd39233adf90b0f4eff1868885d587d351a > 100644 > --- a/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c > +++ b/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c > @@ -451,7 +451,7 @@ ipaenrollment_init(Slapi_PBlock *pb) > if (!ret) ret = slapi_pblock_set(pb, SLAPI_PLUGIN_DESCRIPTION, (void > *)&pdesc); > if (!ret) ret = slapi_pblock_set(pb, SLAPI_PLUGIN_EXT_OP_OIDLIST, > ipaenrollment_oid_list); > if (!ret) ret = slapi_pblock_set(pb, SLAPI_PLUGIN_EXT_OP_NAMELIST, > ipaenrollment_name_list); > - if (!ret) slapi_pblock_set(pb, SLAPI_PLUGIN_EXT_OP_FN, (void > *)ipaenrollment_extop); > + if (!ret) ret = slapi_pblock_set(pb, SLAPI_PLUGIN_EXT_OP_FN, (void > *)ipaenrollment_extop); > > if (ret) { > LOG("Failed to set plug-in version, function, and OID.\n"); ACK. > https://fedorahosted.org/freeipa/ticket/2036 > --- > .../ipa-pwd-extop/ipa_pwd_extop.c | 10 ++++++++-- > 1 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c > b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c > index > 95ac68e9cfc8d7024048d8a9d2793044f01dd1aa..a0f9c5e14747b5c38952db27b005874a4afe1c4d > 100644 > --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c > +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c > @@ -504,9 +504,15 @@ free_and_return: > /* Either this is the same pointer that we allocated and set above, > * or whoever used it should have freed it and allocated a new > * value that we need to free here */ > - slapi_pblock_get(pb, SLAPI_ORIGINAL_TARGET, &dn); > + ret = slapi_pblock_get(pb, SLAPI_ORIGINAL_TARGET, &dn); > + if (ret) { > + LOG_TRACE("Failed to get SLAPI_ORIGINAL_TARGET\n"); > + } > slapi_ch_free_string(&dn); > - slapi_pblock_set(pb, SLAPI_ORIGINAL_TARGET, NULL); > + ret = slapi_pblock_set(pb, SLAPI_ORIGINAL_TARGET, NULL); > + if (ret) { > + LOG_TRACE("Failed to clear SLAPI_ORIGINAL_TARGET\n"); > + } > slapi_ch_free_string(&authmethod); > slapi_ch_free_string(&principal); ACK. > https://fedorahosted.org/freeipa/ticket/2036 > --- > .../ipa-pwd-extop/ipa_pwd_extop.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c > b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c > index > a0f9c5e14747b5c38952db27b005874a4afe1c4d..65c5834595f89aee8502347311f247be058c3416 > 100644 > --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c > +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c > @@ -1295,7 +1295,7 @@ int ipapwd_init( Slapi_PBlock *pb ) > if (!ret) ret = slapi_pblock_set(pb, SLAPI_PLUGIN_DESCRIPTION, (void > *)&ipapwd_plugin_desc); > if (!ret) ret = slapi_pblock_set(pb, SLAPI_PLUGIN_EXT_OP_OIDLIST, > ipapwd_oid_list); > if (!ret) ret = slapi_pblock_set(pb, SLAPI_PLUGIN_EXT_OP_NAMELIST, > ipapwd_name_list); > - if (!ret) slapi_pblock_set(pb, SLAPI_PLUGIN_EXT_OP_FN, (void > *)ipapwd_extop); > + if (!ret) ret = slapi_pblock_set(pb, SLAPI_PLUGIN_EXT_OP_FN, (void > *)ipapwd_extop); > if (ret) { > LOG("Failed to set plug-in version, function, and OID.\n" ); > return -1; ACK. -- / Alexander Bokovoy _______________________________________________ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel