osaf/services/saf/immsv/immnd/ImmModel.cc | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
Only allow admin-operation directly targeting implementer if protocol4.5
is allowed. This is an addition to enhancement [#799] not any defect fix.
diff --git a/osaf/services/saf/immsv/immnd/ImmModel.cc
b/osaf/services/saf/immsv/immnd/ImmModel.cc
--- a/osaf/services/saf/immsv/immnd/ImmModel.cc
+++ b/osaf/services/saf/immsv/immnd/ImmModel.cc
@@ -10149,11 +10149,16 @@ SaAisErrorT ImmModel::adminOperationInvo
/* Appears to be an admin-op directed at OI.
Verify that admo-name matches impl-name. */
if(objectName == adminOwner->mAdminOwnerName) {
- object = &dummyObject;
- goto fake_obj;
- }
- LOG_NO("ERR_NOT_EXIST: Admin-op on OI rejected. Implementer
'%s' != adminowner '%s'",
- objectName.c_str(),
adminOwner->mAdminOwnerName.c_str());
+ if(this->protocol45Allowed()) {
+ object = &dummyObject;
+ goto fake_obj;
+ } else {
+ LOG_NO("ERR_NOT_EXIST: Admin-op on OI rejected.
Protocol4.5 not allowed");
+ }
+ } else {
+ LOG_NO("ERR_NOT_EXIST: Admin-op on OI rejected.
Implementer '%s' != adminowner '%s'",
+ objectName.c_str(),
adminOwner->mAdminOwnerName.c_str());
+ }
}
TRACE_7("ERR_NOT_EXIST: object '%s' does not exist",
objectName.c_str());
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
