osaf/services/saf/clmsv/clms/clms_imm.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


Wrong used error codes SA_AIS_ERR_NOT_SUPPORTED and SA_AIS_ERR_INAVLID_PARAM 
are replaced with SA_AIS_ERR_BAD_OPERATION.

diff --git a/osaf/services/saf/clmsv/clms/clms_imm.c 
b/osaf/services/saf/clmsv/clms/clms_imm.c
--- a/osaf/services/saf/clmsv/clms/clms_imm.c
+++ b/osaf/services/saf/clmsv/clms/clms_imm.c
@@ -1401,7 +1401,7 @@ static SaAisErrorT clms_imm_ccb_obj_crea
                /* Find the RDN attribute and store the object DN */
                while ((attrValue = attr[i++]) != NULL) {
                        if (!strncmp(attrValue->attrName, "safCluster", 10)) {
-                               rc = SA_AIS_ERR_NOT_SUPPORTED;
+                               rc = SA_AIS_ERR_BAD_OPERATION;
                                goto done;
                        } else if (!strncmp(attrValue->attrName, "safNode", 7)) 
{
                                if (attrValue->attrValueType == 
SA_IMM_ATTR_SASTRINGT) {
@@ -1423,7 +1423,7 @@ static SaAisErrorT clms_imm_ccb_obj_crea
 
        if ((rt = clms_node_dn_chk(&operation->objectName)) != 
NCSCC_RC_SUCCESS) {
                TRACE("Node DN name is incorrect");
-               rc = SA_AIS_ERR_INVALID_PARAM;
+               rc = SA_AIS_ERR_BAD_OPERATION;
        }
 
  done:
@@ -1452,7 +1452,7 @@ static SaAisErrorT clms_imm_ccb_obj_dele
 
        if (!strncmp((const char *)objectName->value, "safCluster=", 11)) {
                LOG_ER("Deletion of the present single cluster Object not 
supported");
-               rc = SA_AIS_ERR_NOT_SUPPORTED;
+               rc = SA_AIS_ERR_BAD_OPERATION;
        }
 
        TRACE_LEAVE();
@@ -1547,11 +1547,11 @@ SaAisErrorT clms_node_ccb_comp_modify(Cc
                        }
                } else if (!strcmp(attribute->attrName, 
"saClmNodeAddressFamily")) {
                        LOG_NO("Modification of saClmNodeAddressFamily of 
object %s not allowed",opdata->objectName.value);
-                       rc = SA_AIS_ERR_NOT_SUPPORTED;
+                       rc = SA_AIS_ERR_BAD_OPERATION;
                        goto done;
                } else if (!strcmp(attribute->attrName, "saClmNodeAddress")) {
                        LOG_NO("Modification of saClmNodeAddress of object %s 
not allowed",opdata->objectName.value);
-                       rc = SA_AIS_ERR_NOT_SUPPORTED;
+                       rc = SA_AIS_ERR_BAD_OPERATION;
                        goto done;
                } else if (!strcmp(attribute->attrName, 
"saClmNodeLockCallbackTimeout")) {
                        SaTimeT Timeout = *((SaTimeT *)value);
@@ -1567,7 +1567,7 @@ SaAisErrorT clms_node_ccb_comp_modify(Cc
                                goto done;
                        } else {
                                LOG_NO("saClmNodeEE attribute change of object 
%s is not supported",opdata->objectName.value);
-                               rc = SA_AIS_ERR_NOT_SUPPORTED;
+                               rc = SA_AIS_ERR_BAD_OPERATION;
                                goto done;
                        }
                } else {

------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are 
consuming the most bandwidth. Provides multi-vendor support for NetFlow, 
J-Flow, sFlow and other flows. Make informed decisions using capacity planning
reports.http://sdm.link/zohodev2dev
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to