diff options
Diffstat (limited to 'server/confdb')
| -rw-r--r-- | server/confdb/confdb.c | 203 | ||||
| -rw-r--r-- | server/confdb/confdb.h | 4 |
2 files changed, 162 insertions, 45 deletions
diff --git a/server/confdb/confdb.c b/server/confdb/confdb.c index d3a2a087..1f642ca1 100644 --- a/server/confdb/confdb.c +++ b/server/confdb/confdb.c @@ -36,8 +36,8 @@ #include "ini_config.h" #define CONFDB_VERSION "1" -#define CONFDB_BASEDN "cn=config" -#define CONFDB_DOMAIN_BASEDN "cn=domains,"CONFDB_BASEDN +#define CONFDB_DOMAINS_PATH "config/domains" +#define CONFDB_DOMAIN_BASEDN "cn=domains,cn=config" #define CONFDB_DOMAIN_ATTR "cn" #define CONFDB_MPG "magicPrivateGroups" #define CONFDB_FQ "useFullyQualifiedNames" @@ -121,6 +121,110 @@ done: return ret; } +/* split a string into an allocated array of strings. + * the separator is a string, and is case-sensitive. + * optionally single values can be trimmed of of spaces and tabs */ +static int split_on_separator(TALLOC_CTX *mem_ctx, const char *str, + char *sep, bool trim, char ***_list, int *size) +{ + const char *t, *p, *n; + size_t l, s, len; + char **list, **r; + + if (!str || !*str || !sep || !*sep || !_list) return EINVAL; + + s = strlen(sep); + t = str; + + list = NULL; + l = 0; + + if (trim) + while (*t == ' ' || *t == '\t') t++; + + while (t && (p = strstr(t, sep))) { + len = p - t; + n = p + s; /* save next string starting point */ + if (trim) { + while (*t == ' ' || *t == '\t') { + t++; + len--; + if (len == 0) break; + } + p--; + while (len > 0 && (*p == ' ' || *p == '\t')) { + len--; + p--; + } + } + + r = talloc_realloc(mem_ctx, list, char *, l + 2); + if (!r) { + talloc_free(list); + return ENOMEM; + } else { + list = r; + } + + if (len == 0) { + list[l] = talloc_strdup(list, ""); + } else { + list[l] = talloc_strndup(list, t, len); + } + if (!list[l]) { + talloc_free(list); + return ENOMEM; + } + l++; + + t = n; /* move to next string */ + } + + if (t) { + r = talloc_realloc(mem_ctx, list, char *, l + 2); + if (!r) { + talloc_free(list); + return ENOMEM; + } else { + list = r; + } + + if (trim) { + len = strlen(t); + while (*t == ' ' || *t == '\t') { + t++; + len--; + if (len == 0) break; + } + p = t + len - 1; + while (len > 0 && (*p == ' ' || *p == '\t')) { + len--; + p--; + } + + if (len == 0) { + list[l] = talloc_strdup(list, ""); + } else { + list[l] = talloc_strndup(list, t, len); + } + } else { + list[l] = talloc_strdup(list, t); + } + if (!list[l]) { + talloc_free(list); + return ENOMEM; + } + l++; + } + + list[l] = NULL; /* terminate list */ + + if (size) *size = l + 1; + *_list = list; + + return EOK; +} + int confdb_add_param(struct confdb_ctx *cdb, bool replace, const char *section, @@ -496,6 +600,43 @@ failed: return ret; } +/* WARNING: Unlike other similar functions, this one does NOT take a default, + * and returns ENOENT if the attribute was not found ! */ +int confdb_get_string_as_list(struct confdb_ctx *cdb, TALLOC_CTX *ctx, + const char *section, const char *attribute, + char ***result) +{ + char **values = NULL; + int ret; + + ret = confdb_get_param(cdb, ctx, section, attribute, &values); + if (ret != EOK) { + goto done; + } + + if (values && values[0]) { + if (values[1] != NULL) { + /* too many values */ + ret = EINVAL; + goto done; + } + } else { + /* Did not return a value */ + ret = ENOENT; + goto done; + } + + ret = split_on_separator(ctx, values[0], ",", true, result, NULL); + +done: + talloc_free(values); + if (ret != EOK && ret != ENOENT) { + DEBUG(2, ("Failed to get [%s] from [%s], error [%d] (%s)", + attribute, section, ret, strerror(ret))); + } + return ret; +} + int confdb_test(struct confdb_ctx *cdb) { char **values; @@ -948,61 +1089,33 @@ int confdb_get_domains(struct confdb_ctx *cdb, struct sss_domain_info **domains) { TALLOC_CTX *tmp_ctx; - struct ldb_dn *dn; - struct ldb_result *res; struct sss_domain_info *domain, *prevdom; struct sss_domain_info *first = NULL; - const char *attrs[] = { "domains", NULL }; - const char *tmp; - char *cur, *p, *t; - int ret; + char **domlist; + int ret, i; tmp_ctx = talloc_new(mem_ctx); if (!tmp_ctx) return ENOMEM; - dn = ldb_dn_new(tmp_ctx, cdb->ldb, CONFDB_DOMAIN_BASEDN); - if (!dn) { - ret = EIO; - goto done; - } - - ret = ldb_search(cdb->ldb, tmp_ctx, &res, dn, - LDB_SCOPE_BASE, attrs, NULL); - if (ret != LDB_SUCCESS) { - ret = EIO; - goto done; - } - - if (res->count != 1) { - ret = EFAULT; + ret = confdb_get_string_as_list(cdb, tmp_ctx, + CONFDB_DOMAINS_PATH, "domains", &domlist); + if (ret == ENOENT) { + DEBUG(0, ("No domains configured, fatal error!\n")); goto done; } - - tmp = ldb_msg_find_attr_as_string(res->msgs[0], "domains", NULL); - if (!tmp) { - DEBUG(0, ("No domains configured, fatal error!\n")); - ret = EINVAL; + if (ret != EOK ) { + DEBUG(0, ("Fatal error retrieving domains list!\n")); goto done; } - cur = p = talloc_strdup(tmp_ctx, tmp); - while (p && *p) { - - for (cur = p; (*cur == ' ' || *cur == '\t'); cur++) /* trim */ ; - if (!*cur) break; - - p = strchr(cur, ','); - if (p) { - /* terminate element */ - *p = '\0'; - /* trim spaces */ - for (t = p-1; (*t == ' ' || *t == '\t'); t--) *t = '\0'; - p++; + for (i = 0; domlist[i]; i++) { + ret = confdb_get_domain(cdb, mem_ctx, domlist[i], &domain); + if (ret) { + DEBUG(0, ("Error (%d [%s]) retrieving domain %s, skipping!\n", + ret, strerror(ret), domains[i])); + continue; } - ret = confdb_get_domain(cdb, mem_ctx, cur, &domain); - if (ret) goto done; - if (first == NULL) { first = domain; prevdom = first; @@ -1014,7 +1127,7 @@ int confdb_get_domains(struct confdb_ctx *cdb, if (first == NULL) { DEBUG(0, ("No domains configured, fatal error!\n")); - ret = EINVAL; + ret = ENOENT; } *domains = first; diff --git a/server/confdb/confdb.h b/server/confdb/confdb.h index 19614fc4..76e44822 100644 --- a/server/confdb/confdb.h +++ b/server/confdb/confdb.h @@ -80,6 +80,10 @@ int confdb_get_bool(struct confdb_ctx *cdb, TALLOC_CTX *ctx, const char *section, const char *attribute, bool defval, bool *result); +int confdb_get_string_as_list(struct confdb_ctx *cdb, TALLOC_CTX *ctx, + const char *section, const char *attribute, + char ***result); + int confdb_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct confdb_ctx **cdb_ctx, |