More info in commit messages.
From 927e0c3ac3f070f730fdfaa7b819c974d5011815 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrez...@redhat.com>
Date: Tue, 7 Aug 2012 13:32:44 +0200
Subject: [PATCH 1/2] Rename SYSDB_SUDO_CACHE_AT_OC to SYSDB_SUDO_CACHE_OC
It does not contain name of the object class attribute but the value
itself. I renamed it to avoid confusion.
---
src/db/sysdb_sudo.c | 6 +++---
src/db/sysdb_sudo.h | 2 +-
src/providers/ldap/ldap_opts.h | 2 +-
src/providers/ldap/sdap_sudo.c | 4 ++--
src/responder/sudo/sudosrv_get_sudorules.c | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/db/sysdb_sudo.c b/src/db/sysdb_sudo.c
index be101d8b335ec472e7b71ae9beacc76878434d67..e10d18be89d4b673cfc5f2fcb82f6db93e9d936e 100644
--- a/src/db/sysdb_sudo.c
+++ b/src/db/sysdb_sudo.c
@@ -257,7 +257,7 @@ sysdb_get_sudo_filter(TALLOC_CTX *mem_ctx, const char *username,
/* build global filter */
filter = talloc_asprintf(tmp_ctx, "(&(%s=%s)",
- SYSDB_OBJECTCLASS, SYSDB_SUDO_CACHE_AT_OC);
+ SYSDB_OBJECTCLASS, SYSDB_SUDO_CACHE_OC);
NULL_CHECK(filter, ret, done);
if (specific_filter[0] != '\0') {
@@ -367,7 +367,7 @@ sysdb_save_sudorule(struct sysdb_ctx *sysdb_ctx,
DEBUG(SSSDBG_TRACE_FUNC, ("Adding sudo rule %s\n", rule_name));
ret = sysdb_attrs_add_string(attrs, SYSDB_OBJECTCLASS,
- SYSDB_SUDO_CACHE_AT_OC);
+ SYSDB_SUDO_CACHE_OC);
if (ret != EOK) {
DEBUG(SSSDBG_OP_FAILURE, ("Could not set rule object class [%d]: %s\n",
ret, strerror(ret)));
@@ -581,7 +581,7 @@ errno_t sysdb_sudo_purge_byfilter(struct sysdb_ctx *sysdb,
bool in_transaction = false;
const char *attrs[] = { SYSDB_OBJECTCLASS,
SYSDB_NAME,
- SYSDB_SUDO_CACHE_AT_OC,
+ SYSDB_SUDO_CACHE_OC,
SYSDB_SUDO_CACHE_AT_CN,
NULL };
diff --git a/src/db/sysdb_sudo.h b/src/db/sysdb_sudo.h
index 0d11b110ee76ffd7c63a84f1e715e36b434c89e4..35b350c6370b0f199064766b2a789a0c2fffa6ca 100644
--- a/src/db/sysdb_sudo.h
+++ b/src/db/sysdb_sudo.h
@@ -33,7 +33,7 @@
#define SYSDB_SUDO_AT_LAST_FULL_REFRESH "sudoLastFullRefreshTime"
/* sysdb attributes */
-#define SYSDB_SUDO_CACHE_AT_OC "sudoRule"
+#define SYSDB_SUDO_CACHE_OC "sudoRule"
#define SYSDB_SUDO_CACHE_AT_CN "cn"
#define SYSDB_SUDO_CACHE_AT_USER "sudoUser"
#define SYSDB_SUDO_CACHE_AT_HOST "sudoHost"
diff --git a/src/providers/ldap/ldap_opts.h b/src/providers/ldap/ldap_opts.h
index 4e876bdcc55b001fa62c861a94e7721f1e7ff357..2868bb4a6a06665be43b79dd2e41c290a0d835b4 100644
--- a/src/providers/ldap/ldap_opts.h
+++ b/src/providers/ldap/ldap_opts.h
@@ -303,7 +303,7 @@ struct sdap_attr_map netgroup_map[] = {
};
struct sdap_attr_map native_sudorule_map[] = {
- { "ldap_sudorule_object_class", "sudoRole", SYSDB_SUDO_CACHE_AT_OC, NULL },
+ { "ldap_sudorule_object_class", "sudoRole", SYSDB_SUDO_CACHE_OC, NULL },
{ "ldap_sudorule_name", "cn", SYSDB_SUDO_CACHE_AT_CN, NULL },
{ "ldap_sudorule_command", "sudoCommand", SYSDB_SUDO_CACHE_AT_COMMAND, NULL },
{ "ldap_sudorule_host", "sudoHost", SYSDB_SUDO_CACHE_AT_HOST, NULL },
diff --git a/src/providers/ldap/sdap_sudo.c b/src/providers/ldap/sdap_sudo.c
index ca41fca9eb5e9427c9f8dc90db1563675d08377f..bfab32a0fc320ff5c20140fc4faf013d2c089e0c 100644
--- a/src/providers/ldap/sdap_sudo.c
+++ b/src/providers/ldap/sdap_sudo.c
@@ -552,7 +552,7 @@ static struct tevent_req *sdap_sudo_full_refresh_send(TALLOC_CTX *mem_ctx,
/* Remove all rules from cache */
sysdb_filter = talloc_asprintf(state, "(%s=%s)",
- SYSDB_OBJECTCLASS, SYSDB_SUDO_CACHE_AT_OC);
+ SYSDB_OBJECTCLASS, SYSDB_SUDO_CACHE_OC);
if (sysdb_filter == NULL) {
ret = ENOMEM;
goto immediately;
@@ -724,7 +724,7 @@ static struct tevent_req *sdap_sudo_rules_refresh_send(TALLOC_CTX *mem_ctx,
}
sysdb_filter = talloc_asprintf(tmp_ctx, "(&(%s=%s)(|%s))",
- SYSDB_OBJECTCLASS, SYSDB_SUDO_CACHE_AT_OC,
+ SYSDB_OBJECTCLASS, SYSDB_SUDO_CACHE_OC,
sysdb_filter);
if (sysdb_filter == NULL) {
ret = ENOMEM;
diff --git a/src/responder/sudo/sudosrv_get_sudorules.c b/src/responder/sudo/sudosrv_get_sudorules.c
index 10cef552f094584e6dc5642c808fd25f0520764a..033084665575c37cd0610cd9834aa38b861ed142 100644
--- a/src/responder/sudo/sudosrv_get_sudorules.c
+++ b/src/responder/sudo/sudosrv_get_sudorules.c
@@ -534,7 +534,7 @@ static errno_t sudosrv_get_sudorules_from_cache(struct sudo_cmd_ctx *cmd_ctx,
const char *debug_name = NULL;
unsigned int flags = SYSDB_SUDO_FILTER_NONE;
const char *attrs[] = { SYSDB_OBJECTCLASS
- SYSDB_SUDO_CACHE_AT_OC,
+ SYSDB_SUDO_CACHE_OC,
SYSDB_SUDO_CACHE_AT_CN,
SYSDB_SUDO_CACHE_AT_USER,
SYSDB_SUDO_CACHE_AT_HOST,
--
1.7.6.5
From adda1a27a44972d608f6cb77d91ad9d2aea174a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrez...@redhat.com>
Date: Tue, 7 Aug 2012 13:35:09 +0200
Subject: [PATCH 2/2] Remove SYSDB_SUDO_CACHE_OC from attribute lists
It is not an attribute.
---
src/db/sysdb_sudo.c | 1 -
src/responder/sudo/sudosrv_get_sudorules.c | 1 -
2 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/src/db/sysdb_sudo.c b/src/db/sysdb_sudo.c
index e10d18be89d4b673cfc5f2fcb82f6db93e9d936e..8a95394920b052c82bd8d615e8fc8fcab9423ee5 100644
--- a/src/db/sysdb_sudo.c
+++ b/src/db/sysdb_sudo.c
@@ -581,7 +581,6 @@ errno_t sysdb_sudo_purge_byfilter(struct sysdb_ctx *sysdb,
bool in_transaction = false;
const char *attrs[] = { SYSDB_OBJECTCLASS,
SYSDB_NAME,
- SYSDB_SUDO_CACHE_OC,
SYSDB_SUDO_CACHE_AT_CN,
NULL };
diff --git a/src/responder/sudo/sudosrv_get_sudorules.c b/src/responder/sudo/sudosrv_get_sudorules.c
index 033084665575c37cd0610cd9834aa38b861ed142..b6e016c73cba6c86b9f20af63357c6fcc2b5508b 100644
--- a/src/responder/sudo/sudosrv_get_sudorules.c
+++ b/src/responder/sudo/sudosrv_get_sudorules.c
@@ -534,7 +534,6 @@ static errno_t sudosrv_get_sudorules_from_cache(struct sudo_cmd_ctx *cmd_ctx,
const char *debug_name = NULL;
unsigned int flags = SYSDB_SUDO_FILTER_NONE;
const char *attrs[] = { SYSDB_OBJECTCLASS
- SYSDB_SUDO_CACHE_OC,
SYSDB_SUDO_CACHE_AT_CN,
SYSDB_SUDO_CACHE_AT_USER,
SYSDB_SUDO_CACHE_AT_HOST,
--
1.7.6.5
_______________________________________________
sssd-devel mailing list
sssd-devel@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
