diff options
| author | Jakub Hrozek <jhrozek@redhat.com> | 2013-08-21 17:22:59 +0200 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2013-08-28 18:06:57 +0200 |
| commit | b3458bbb5315b05d7ac1abc58f1c380761756603 (patch) | |
| tree | 954cc6fffcb3141b2b5acbdffcbc5e69c290f7eb /src/db | |
| parent | 1c4144a6ce68dbd54c7c08a517d1f982ea57f19a (diff) | |
| download | sssd-b3458bbb5315b05d7ac1abc58f1c380761756603.tar.gz sssd-b3458bbb5315b05d7ac1abc58f1c380761756603.tar.xz sssd-b3458bbb5315b05d7ac1abc58f1c380761756603.zip | |
SYSDB: Store enumerate flag for subdomain
Diffstat (limited to 'src/db')
| -rw-r--r-- | src/db/sysdb.h | 3 | ||||
| -rw-r--r-- | src/db/sysdb_subdomains.c | 27 |
2 files changed, 27 insertions, 3 deletions
diff --git a/src/db/sysdb.h b/src/db/sysdb.h index 536cac7ac..c352f8983 100644 --- a/src/db/sysdb.h +++ b/src/db/sysdb.h @@ -126,6 +126,7 @@ #define SYSDB_SUBDOMAIN_FLAT "flatName" #define SYSDB_SUBDOMAIN_ID "domainID" #define SYSDB_SUBDOMAIN_MPG "mpg" +#define SYSDB_SUBDOMAIN_ENUM "enumerate" #define SYSDB_BASE_ID "baseID" #define SYSDB_ID_RANGE_SIZE "idRangeSize" @@ -371,7 +372,7 @@ errno_t sysdb_domain_create(struct sysdb_ctx *sysdb, const char *domain_name); errno_t sysdb_subdomain_store(struct sysdb_ctx *sysdb, const char *name, const char *realm, const char *flat_name, const char *domain_id, - bool mpg); + bool mpg, bool enumerate); errno_t sysdb_update_subdomains(struct sss_domain_info *domain); diff --git a/src/db/sysdb_subdomains.c b/src/db/sysdb_subdomains.c index 0e7514baa..2b80b5b9e 100644 --- a/src/db/sysdb_subdomains.c +++ b/src/db/sysdb_subdomains.c @@ -342,7 +342,7 @@ done: errno_t sysdb_subdomain_store(struct sysdb_ctx *sysdb, const char *name, const char *realm, const char *flat_name, const char *domain_id, - bool mpg) + bool mpg, bool enumerate) { TALLOC_CTX *tmp_ctx; struct ldb_message *msg; @@ -353,6 +353,7 @@ errno_t sysdb_subdomain_store(struct sysdb_ctx *sysdb, SYSDB_SUBDOMAIN_FLAT, SYSDB_SUBDOMAIN_ID, SYSDB_SUBDOMAIN_MPG, + SYSDB_SUBDOMAIN_ENUM, NULL}; const char *tmp_str; bool tmp_bool; @@ -361,6 +362,7 @@ errno_t sysdb_subdomain_store(struct sysdb_ctx *sysdb, int flat_flags = 0; int id_flags = 0; int mpg_flags = 0; + int enum_flags = 0; int ret; tmp_ctx = talloc_new(NULL); @@ -390,6 +392,7 @@ errno_t sysdb_subdomain_store(struct sysdb_ctx *sysdb, if (flat_name) flat_flags = LDB_FLAG_MOD_ADD; if (domain_id) id_flags = LDB_FLAG_MOD_ADD; mpg_flags = LDB_FLAG_MOD_ADD; + enum_flags = LDB_FLAG_MOD_ADD; } else if (res->count != 1) { ret = EINVAL; goto done; @@ -421,10 +424,15 @@ errno_t sysdb_subdomain_store(struct sysdb_ctx *sysdb, if (tmp_bool != mpg) { mpg_flags = LDB_FLAG_MOD_REPLACE; } + tmp_bool = ldb_msg_find_attr_as_bool(res->msgs[0], SYSDB_SUBDOMAIN_ENUM, + !enumerate); + if (tmp_bool != enumerate) { + enum_flags = LDB_FLAG_MOD_REPLACE; + } } if (!store && realm_flags == 0 && flat_flags == 0 && id_flags == 0 - && mpg_flags == 0) { + && mpg_flags == 0 && enum_flags == 0) { ret = EOK; goto done; } @@ -507,6 +515,21 @@ errno_t sysdb_subdomain_store(struct sysdb_ctx *sysdb, } } + if (enum_flags) { + ret = ldb_msg_add_empty(msg, SYSDB_SUBDOMAIN_ENUM, enum_flags, NULL); + if (ret != LDB_SUCCESS) { + ret = sysdb_error_to_errno(ret); + goto done; + } + + ret = ldb_msg_add_string(msg, SYSDB_SUBDOMAIN_ENUM, + enumerate ? "TRUE" : "FALSE"); + if (ret != LDB_SUCCESS) { + ret = sysdb_error_to_errno(ret); + goto done; + } + } + ret = ldb_modify(sysdb->ldb, msg); if (ret != LDB_SUCCESS) { DEBUG(SSSDBG_FATAL_FAILURE, ("Failed to add subdomain attributes to " |