Ack from me.
/AndersBj
Hans Feldt wrote:
> osaf/libs/common/immsv/include/immsv_api.h | 2 +-
> osaf/services/saf/immsv/immloadd/imm_loader.cc | 2 +-
> osaf/services/saf/immsv/immnd/ImmModel.cc | 12 ++++++------
> osaf/services/saf/immsv/immnd/ImmModel.hh | 2 +-
> osaf/services/saf/immsv/immnd/immnd_evt.c | 10 +++++-----
> osaf/services/saf/immsv/immnd/immnd_init.h | 2 +-
> samples/immsv/OpensafImm_Upgrade_4.5.xml | 2 +-
> 7 files changed, 16 insertions(+), 16 deletions(-)
>
>
> Generalize the attribute name since it is about access and not administration
> of IMM.
>
> diff --git a/osaf/libs/common/immsv/include/immsv_api.h
> b/osaf/libs/common/immsv/include/immsv_api.h
> --- a/osaf/libs/common/immsv/include/immsv_api.h
> +++ b/osaf/libs/common/immsv/include/immsv_api.h
> @@ -60,7 +60,7 @@ extern "C" {
>
> #define OPENSAF_IMM_LONG_DNS_ALLOWED "longDnsAllowed"
> #define OPENSAF_IMM_ACCESS_CONTROL_MODE "accessControlMode"
> -#define OPENSAF_IMM_ADMIN_GROUP_NAME "adminGroupName"
> +#define OPENSAF_IMM_AUTHORIZED_GROUP "authorizedGroup"
>
> typedef enum {
> ACCESS_CONTROL_DISABLED = 0,
> diff --git a/osaf/services/saf/immsv/immloadd/imm_loader.cc
> b/osaf/services/saf/immsv/immloadd/imm_loader.cc
> --- a/osaf/services/saf/immsv/immloadd/imm_loader.cc
> +++ b/osaf/services/saf/immsv/immloadd/imm_loader.cc
> @@ -335,7 +335,7 @@ void opensafClassCreate(SaImmHandleT imm
> d7.attrFlags = SA_IMM_ATTR_CONFIG | SA_IMM_ATTR_WRITABLE;
> d7.attrDefaultValue = &access_control_mode_default;
>
> - d8.attrName = (char *) OPENSAF_IMM_ADMIN_GROUP_NAME;
> + d8.attrName = (char *) OPENSAF_IMM_AUTHORIZED_GROUP;
> d8.attrValueType = SA_IMM_ATTR_SASTRINGT;
> d8.attrFlags = SA_IMM_ATTR_CONFIG | SA_IMM_ATTR_WRITABLE;
> d8.attrDefaultValue = NULL;
> 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
> @@ -443,7 +443,7 @@ static const std::string immSyncBatchSiz
> static const std::string immPbeBSlaveName(OPENSAF_IMM_2PBE_APPL_NAME);
> static const std::string immLongDnsAllowed(OPENSAF_IMM_LONG_DNS_ALLOWED);
> static const std::string
> immAccessControlMode(OPENSAF_IMM_ACCESS_CONTROL_MODE);
> -static const std::string immAdminGroupName(OPENSAF_IMM_ADMIN_GROUP_NAME);
> +static const std::string immAuthorizedGroup(OPENSAF_IMM_AUTHORIZED_GROUP);
>
> static const std::string immMngtClass("SaImmMngt");
> static const std::string
> immManagementDn("safRdn=immManagement,safApp=safImmService");
> @@ -907,9 +907,9 @@ immModel_accessControlMode(IMMND_CB *cb)
> }
>
> const char*
> -immModel_adminGroupName(IMMND_CB *cb)
> -{
> - return ImmModel::instance(&cb->immModel)->adminGroupName();
> +immModel_authorizedGroup(IMMND_CB *cb)
> +{
> + return ImmModel::instance(&cb->immModel)->authorizedGroup();
> }
>
> SaBoolT
> @@ -3484,7 +3484,7 @@ ImmModel::accessControlMode()
> }
>
> const char*
> -ImmModel::adminGroupName()
> +ImmModel::authorizedGroup()
> {
> TRACE_ENTER();
> ObjectMap::iterator oi = sObjectMap.find(immObjectDn);
> @@ -3495,7 +3495,7 @@ ImmModel::adminGroupName()
>
> ObjectInfo* immObject = oi->second;
> ImmAttrValueMap::iterator avi =
> - immObject->mAttrValueMap.find(immAdminGroupName);
> + immObject->mAttrValueMap.find(immAuthorizedGroup);
> if (avi == immObject->mAttrValueMap.end())
> return NULL;
> osafassert(!(avi->second->isMultiValued()));
> diff --git a/osaf/services/saf/immsv/immnd/ImmModel.hh
> b/osaf/services/saf/immsv/immnd/ImmModel.hh
> --- a/osaf/services/saf/immsv/immnd/ImmModel.hh
> +++ b/osaf/services/saf/immsv/immnd/ImmModel.hh
> @@ -103,7 +103,7 @@ public:
>
> bool nocaseCompare(const std::string& s1,
> const std::string& s2) const;
> - const char* adminGroupName();
> + const char* authorizedGroup();
> OsafImmAccessControlModeT accessControlMode();
> bool schemaChangeAllowed();
> bool protocol41Allowed();
> diff --git a/osaf/services/saf/immsv/immnd/immnd_evt.c
> b/osaf/services/saf/immsv/immnd/immnd_evt.c
> --- a/osaf/services/saf/immsv/immnd/immnd_evt.c
> +++ b/osaf/services/saf/immsv/immnd/immnd_evt.c
> @@ -753,9 +753,9 @@ static uint32_t immnd_evt_proc_imm_init(
> } else if (getgid() == sinfo->gid) {
> TRACE("same group");
> } else {
> - const char *admin_group_name =
> immModel_adminGroupName(immnd_cb);
> - if ((admin_group_name != NULL) &&
> - (osaf_user_is_member_of_group(sinfo->uid,
> admin_group_name) == true)) {
> + const char *authorized_group =
> immModel_authorizedGroup(immnd_cb);
> + if ((authorized_group != NULL) &&
> + (osaf_user_is_member_of_group(sinfo->uid,
> authorized_group) == true)) {
> TRACE("configured group");
> } else {
> if (mode == ACCESS_CONTROL_PERMISSIVE) {
> @@ -764,7 +764,7 @@ static uint32_t immnd_evt_proc_imm_init(
> syslog(LOG_AUTH, "access
> violation by %s(uid=%d)",
> pwd->pw_name,
> sinfo->uid);
> TRACE_2("access violation, uid:%d,
> pid:%d, group_name:%s",
> - sinfo->uid, sinfo->pid,
> admin_group_name);
> + sinfo->uid, sinfo->pid,
> authorized_group);
> } else {
> // mode ENFORCING
> struct passwd *pwd =
> getpwuid(sinfo->uid);
> @@ -772,7 +772,7 @@ static uint32_t immnd_evt_proc_imm_init(
> syslog(LOG_AUTH, "access denied
> for %s(uid=%d)",
> pwd->pw_name,
> sinfo->uid);
> TRACE_2("access denied, uid:%d, pid:%d,
> group_name:%s",
> - sinfo->uid, sinfo->pid,
> admin_group_name);
> + sinfo->uid, sinfo->pid,
> authorized_group);
> error = SA_AIS_ERR_ACCESS_DENIED;
> goto agent_rsp;
> }
> diff --git a/osaf/services/saf/immsv/immnd/immnd_init.h
> b/osaf/services/saf/immsv/immnd/immnd_init.h
> --- a/osaf/services/saf/immsv/immnd/immnd_init.h
> +++ b/osaf/services/saf/immsv/immnd/immnd_init.h
> @@ -298,7 +298,7 @@ extern "C" {
> SaBoolT immModel_protocol45Allowed(IMMND_CB *cb);
> SaBoolT immModel_oneSafe2PBEAllowed(IMMND_CB *cb);
> OsafImmAccessControlModeT immModel_accessControlMode(IMMND_CB *cb);
> - const char *immModel_adminGroupName(IMMND_CB *cb);
> + const char *immModel_authorizedGroup(IMMND_CB *cb);
>
> SaBoolT immModel_purgeSyncRequest(IMMND_CB *cb, SaUint32T clientId);
>
> diff --git a/samples/immsv/OpensafImm_Upgrade_4.5.xml
> b/samples/immsv/OpensafImm_Upgrade_4.5.xml
> --- a/samples/immsv/OpensafImm_Upgrade_4.5.xml
> +++ b/samples/immsv/OpensafImm_Upgrade_4.5.xml
> @@ -16,7 +16,7 @@
> <default-value>0</default-value>
> </attr>
> <attr>
> - <name>adminGroupName</name>
> + <name>authorizedGroup</name>
> <type>SA_STRING_T</type>
> <category>SA_CONFIG</category>
> <flag>SA_WRITABLE</flag>
>
------------------------------------------------------------------------------
Slashdot TV.
Video for Nerds. Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
