summaryrefslogtreecommitdiffstats
path: root/src/db
diff options
context:
space:
mode:
authorMichal Židek <mzidek@redhat.com>2015-06-24 18:03:49 +0200
committerJakub Hrozek <jhrozek@redhat.com>2015-07-02 13:37:38 +0200
commit9ac2a33f4cdc4941fa63118dcffe8058854f33c4 (patch)
tree1bd6b931f0f7938dddb78cf43a93efca41a7fe6a /src/db
parentb08b6a994dcca108bb571458da092e0e320ce9c2 (diff)
downloadsssd-9ac2a33f4cdc4941fa63118dcffe8058854f33c4.tar.gz
sssd-9ac2a33f4cdc4941fa63118dcffe8058854f33c4.tar.xz
sssd-9ac2a33f4cdc4941fa63118dcffe8058854f33c4.zip
views: Add is_default_view helper function
Ticket: https://fedorahosted.org/sssd/ticket/2641 Reviewed-by: Pavel Reichl <preichl@redhat.com>
Diffstat (limited to 'src/db')
-rw-r--r--src/db/sysdb.h11
-rw-r--r--src/db/sysdb_subdomains.c3
2 files changed, 12 insertions, 2 deletions
diff --git a/src/db/sysdb.h b/src/db/sysdb.h
index 4dc382f6f..fbc01851e 100644
--- a/src/db/sysdb.h
+++ b/src/db/sysdb.h
@@ -461,6 +461,17 @@ errno_t sysdb_update_view_name(struct sysdb_ctx *sysdb, const char *view_name);
errno_t sysdb_get_view_name(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb,
char **view_name);
+static inline bool is_default_view(const char *view_name)
+{
+ /* NULL is treated as default */
+ if (view_name == NULL
+ || strcmp(view_name, SYSDB_DEFAULT_VIEW_NAME) == 0) {
+ return true;
+ } else {
+ return false;
+ }
+}
+
errno_t sysdb_delete_view_tree(struct sysdb_ctx *sysdb, const char *view_name);
errno_t sysdb_invalidate_overrides(struct sysdb_ctx *sysdb);
diff --git a/src/db/sysdb_subdomains.c b/src/db/sysdb_subdomains.c
index 6d9e9e5ea..142520c18 100644
--- a/src/db/sysdb_subdomains.c
+++ b/src/db/sysdb_subdomains.c
@@ -552,8 +552,7 @@ errno_t sysdb_master_domain_update(struct sss_domain_info *domain)
* Currently changing the view is not supported hence we have to check for
* changes and error out accordingly.
*/
- if (ret == ENOENT || view_name == NULL
- || strcmp(view_name, SYSDB_DEFAULT_VIEW_NAME) == 0) {
+ if (ret == ENOENT || is_default_view(view_name)) {
/* handle default view */
if (domain->has_views) {
DEBUG(SSSDBG_CRIT_FAILURE,