AD: replace GID/UID, do not add another one

The code would call sysdb_attrs_add_uint32 which added another UID or GID
to the ID=0 we already downloaded from LDAP (0 is the default value) when
ID-mapping an entry. This led to funky behaviour later on when we wanted
to process the ID.

4 files changed, 41 insertions, 7 deletions

diff --git a/src/providers/ldap/sdap.c b/src/providers/ldap/sdap.c
index f5b1f95f0..371121b2c 100644
--- a/src/providers/ldap/sdap.c
+++ b/src/providers/ldap/sdap.c
@@ -1158,3 +1158,34 @@ int sdap_control_create(struct sdap_handle *sh, const char *oid, int iscritical,
 
     return ret;
 }
+
+int sdap_replace_id(struct sysdb_attrs *entry, const char *attr, id_t val)
+{
+    char *str;
+    errno_t ret;
+    struct ldb_message_element *el;
+
+    ret = sysdb_attrs_get_el_ext(entry, attr, false, &el);
+    if (ret == ENOENT) {
+        return sysdb_attrs_add_uint32(entry, attr, val);
+    } else if (ret) {
+        DEBUG(SSSDBG_OP_FAILURE, ("Cannot get attribute [%s]\n", attr));
+        return ret;
+    }
+
+    if (el->num_values != 1) {
+        DEBUG(SSSDBG_OP_FAILURE,
+              ("Expected 1 value for %s, got %d\n", attr, el->num_values));
+        return EINVAL;
+    }
+
+    str = talloc_asprintf(entry, "%llu", (unsigned long long) val);
+    if (!str) {
+        return ENOMEM;
+    }
+
+    el->values[0].data = (uint8_t *) str;
+    el->values[0].length = strlen(str);
+
+    return EOK;
+}
diff --git a/src/providers/ldap/sdap.h b/src/providers/ldap/sdap.h
index d844ad636..d14365799 100644
--- a/src/providers/ldap/sdap.h
+++ b/src/providers/ldap/sdap.h
@@ -488,6 +488,8 @@ int build_attrs_from_map(TALLOC_CTX *memctx,
 int sdap_control_create(struct sdap_handle *sh, const char *oid, int iscritical,
                         struct berval *value, int dupval, LDAPControl **ctrlp);
 
+int sdap_replace_id(struct sysdb_attrs *entry, const char *attr, id_t val);
+
 errno_t sdap_set_config_options_with_rootdse(struct sysdb_attrs *rootdse,
                                              struct sdap_options *opts);
 int sdap_get_server_opts_from_rootdse(TALLOC_CTX *memctx,
diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c
index 930d7fd82..05aaf93d8 100644
--- a/src/providers/ldap/sdap_async_groups.c
+++ b/src/providers/ldap/sdap_async_groups.c
@@ -398,11 +398,9 @@ static int sdap_save_group(TALLOC_CTX *memctx,
         /* Store the GID in the ldap_attrs so it doesn't get
          * treated as a missing attribute from LDAP and removed.
          */
-        ret = sysdb_attrs_add_uint32(attrs, SYSDB_GIDNUM, gid);
-        if (ret != EOK) {
-            DEBUG(SSSDBG_MINOR_FAILURE,
-                  ("Could not store GID: [%s]\n",
-                   strerror(ret)));
+        ret = sdap_replace_id(attrs, SYSDB_GIDNUM, gid);
+        if (ret) {
+            DEBUG(SSSDBG_OP_FAILURE, ("Cannot set the id-mapped GID\n"));
             goto done;
         }
     } else {
diff --git a/src/providers/ldap/sdap_async_users.c b/src/providers/ldap/sdap_async_users.c
index f640b970a..ade1d37b5 100644
--- a/src/providers/ldap/sdap_async_users.c
+++ b/src/providers/ldap/sdap_async_users.c
@@ -160,8 +160,11 @@ int sdap_save_user(TALLOC_CTX *memctx,
         /* Store the UID in the ldap_attrs so it doesn't get
          * treated as a missing attribute from LDAP and removed.
          */
-        ret = sysdb_attrs_add_uint32(attrs, SYSDB_UIDNUM, uid);
-        if (ret != EOK) goto done;
+        ret = sdap_replace_id(attrs, SYSDB_UIDNUM, uid);
+        if (ret) {
+            DEBUG(SSSDBG_OP_FAILURE, ("Cannot set the id-mapped UID\n"));
+            goto done;
+        }
     } else {
         ret = sysdb_attrs_get_uint32_t(attrs,
                                        opts->user_map[SDAP_AT_USER_UID].sys_name,