diff options
Diffstat (limited to 'src/db')
| -rw-r--r-- | src/db/sysdb.c | 22 | ||||
| -rw-r--r-- | src/db/sysdb.h | 7 | ||||
| -rw-r--r-- | src/db/sysdb_ops.c | 40 |
3 files changed, 50 insertions, 19 deletions
diff --git a/src/db/sysdb.c b/src/db/sysdb.c index b23bac145..40b7c26c6 100644 --- a/src/db/sysdb.c +++ b/src/db/sysdb.c @@ -333,6 +333,28 @@ int sysdb_attrs_get_uint32_t(struct sysdb_attrs *attrs, const char *name, return EOK; } +errno_t sysdb_attrs_get_bool(struct sysdb_attrs *attrs, const char *name, + bool *value) +{ + struct ldb_message_element *el; + int ret; + + ret = sysdb_attrs_get_el_int(attrs, name, false, &el); + if (ret) { + return ret; + } + + if (el->num_values != 1) { + return ERANGE; + } + + if (strcmp((const char *)el->values[0].data, "TRUE") == 0) + *value = true; + else + *value = false; + return EOK; +} + int sysdb_attrs_get_string_array(struct sysdb_attrs *attrs, const char *name, TALLOC_CTX *mem_ctx, const char ***string) { diff --git a/src/db/sysdb.h b/src/db/sysdb.h index b7256911a..68d3021ee 100644 --- a/src/db/sysdb.h +++ b/src/db/sysdb.h @@ -62,6 +62,7 @@ #define SYSDB_MEMBER "member" #define SYSDB_MEMBERUID "memberUid" +#define SYSDB_POSIX "isPosix" #define SYSDB_DEFAULTGROUP "defaultGroup" #define SYSDB_GECOS "gecos" @@ -153,7 +154,7 @@ NULL} #define SYSDB_INITGR_ATTR SYSDB_MEMBEROF -#define SYSDB_INITGR_ATTRS {SYSDB_GIDNUM, \ +#define SYSDB_INITGR_ATTRS {SYSDB_GIDNUM, SYSDB_POSIX, \ SYSDB_DEFAULT_ATTRS, \ NULL} @@ -200,6 +201,8 @@ int sysdb_attrs_get_string(struct sysdb_attrs *attrs, const char *name, const char **string); int sysdb_attrs_get_string_array(struct sysdb_attrs *attrs, const char *name, TALLOC_CTX *mem_ctx, const char ***string); +errno_t sysdb_attrs_get_bool(struct sysdb_attrs *attrs, const char *name, + bool *value); int sysdb_attrs_get_uint32_t(struct sysdb_attrs *attrs, const char *name, uint32_t *value); @@ -503,7 +506,7 @@ int sysdb_add_incomplete_group(struct sysdb_ctx *ctx, struct sss_domain_info *domain, const char *name, gid_t gid, - const char *original_dn); + const char *original_dn, bool posix); /* Add netgroup (only basic attrs and w/o checks) */ int sysdb_add_basic_netgroup(struct sysdb_ctx *ctx, diff --git a/src/db/sysdb_ops.c b/src/db/sysdb_ops.c index ba1f6672c..08437f6dd 100644 --- a/src/db/sysdb_ops.c +++ b/src/db/sysdb_ops.c @@ -1047,6 +1047,7 @@ int sysdb_add_group(TALLOC_CTX *mem_ctx, uint32_t id; time_t now; int ret; + bool posix; if (domain->id_max != 0 && gid != 0 && (gid < domain->id_min || gid > domain->id_max)) { @@ -1095,22 +1096,6 @@ int sysdb_add_group(TALLOC_CTX *mem_ctx, ret = sysdb_add_basic_group(tmpctx, ctx, domain, name, gid); if (ret) goto done; - if (gid == 0) { - ret = sysdb_get_new_id(tmpctx, ctx, domain, &id); - if (ret) goto done; - - if (!attrs) { - attrs = sysdb_new_attrs(tmpctx); - if (!attrs) { - ret = ENOMEM; - goto done; - } - } - - ret = sysdb_attrs_add_uint32(attrs, SYSDB_GIDNUM, id); - if (ret) goto done; - } - if (!attrs) { attrs = sysdb_new_attrs(tmpctx); if (!attrs) { @@ -1119,6 +1104,23 @@ int sysdb_add_group(TALLOC_CTX *mem_ctx, } } + ret = sysdb_attrs_get_bool(attrs, SYSDB_POSIX, &posix); + if (ret == ENOENT) { + posix = true; + ret = sysdb_attrs_add_bool(attrs, SYSDB_POSIX, true); + if (ret) goto done; + } else if (ret != EOK) { + goto done; + } + + if (posix && gid == 0) { + ret = sysdb_get_new_id(tmpctx, ctx, domain, &id); + if (ret) goto done; + + ret = sysdb_attrs_add_uint32(attrs, SYSDB_GIDNUM, id); + if (ret) goto done; + } + now = time(NULL); ret = sysdb_attrs_add_time_t(attrs, SYSDB_LAST_UPDATE, now); @@ -1148,7 +1150,8 @@ int sysdb_add_incomplete_group(struct sysdb_ctx *ctx, struct sss_domain_info *domain, const char *name, gid_t gid, - const char *original_dn) + const char *original_dn, + bool posix) { TALLOC_CTX *tmpctx; time_t now; @@ -1179,6 +1182,9 @@ int sysdb_add_incomplete_group(struct sysdb_ctx *ctx, now-1); if (ret) goto done; + ret = sysdb_attrs_add_bool(attrs, SYSDB_POSIX, posix); + if (ret) goto done; + if (original_dn) { ret = sysdb_attrs_add_string(attrs, SYSDB_ORIG_DN, original_dn); if (ret) goto done; |