osaf/services/saf/smfsv/smfd/SmfUtils.cc | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-)
The reader function of "longDnsAllowed" IMM attribute changed to not block in case of unsuccessful read of the attribute. It also handles the attribute values which are not 0 or 1. diff --git a/osaf/services/saf/smfsv/smfd/SmfUtils.cc b/osaf/services/saf/smfsv/smfd/SmfUtils.cc --- a/osaf/services/saf/smfsv/smfd/SmfUtils.cc +++ b/osaf/services/saf/smfsv/smfd/SmfUtils.cc @@ -748,20 +748,14 @@ SmfImmUtils::read_IMM_long_DN_config_and const SaUint32T *longDnsAllowed = immutil_getUint32Attr((const SaImmAttrValuesT_2 **)attributes, IMM_LONG_DN_CONFIG_ATTRIBUTE_NAME, 0); if(longDnsAllowed) { TRACE("%s=%u", IMM_LONG_DN_CONFIG_ATTRIBUTE_NAME, *longDnsAllowed); - if(*longDnsAllowed == 0) { + if(*longDnsAllowed == 0) cb->maxDnLength = DEFAULT_MAX_DN_LENGTH; - TRACE_LEAVE(); - return true; - } - if(*longDnsAllowed == 1) { + else cb->maxDnLength = maxDnLength; - TRACE_LEAVE(); - return true; - } - } - LOG_ER("Could not get long DN config from IMM attr %s %s", IMM_LONG_DN_CONFIG_ATTRIBUTE_NAME, IMM_CONFIG_OBJECT_DN); + } else + LOG_NO("Could not get long DN config [%s %s], use default DN length", IMM_LONG_DN_CONFIG_ATTRIBUTE_NAME, IMM_CONFIG_OBJECT_DN); TRACE_LEAVE(); - return false; + return true; } // ------------------------------------------------------------------------------ ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel