diff options
| -rw-r--r-- | src/db/sysdb.c | 10 | ||||
| -rw-r--r-- | src/db/sysdb.h | 2 | ||||
| -rw-r--r-- | src/providers/ldap/sdap.c | 8 | ||||
| -rw-r--r-- | src/providers/ldap/sdap_async.c | 4 |
4 files changed, 17 insertions, 7 deletions
diff --git a/src/db/sysdb.c b/src/db/sysdb.c index 7b3757e74..fe508818b 100644 --- a/src/db/sysdb.c +++ b/src/db/sysdb.c @@ -508,6 +508,16 @@ int sysdb_attrs_add_string(struct sysdb_attrs *attrs, return sysdb_attrs_add_val(attrs, name, &v); } +int sysdb_attrs_add_mem(struct sysdb_attrs *attrs, const char *name, + const void *mem, size_t size) +{ + struct ldb_val v; + + v.data = discard_const(mem); + v.length = size; + return sysdb_attrs_add_val(attrs, name, &v); +} + int sysdb_attrs_add_bool(struct sysdb_attrs *attrs, const char *name, bool value) { diff --git a/src/db/sysdb.h b/src/db/sysdb.h index 879196a5d..ddf531bb2 100644 --- a/src/db/sysdb.h +++ b/src/db/sysdb.h @@ -208,6 +208,8 @@ int sysdb_attrs_add_val(struct sysdb_attrs *attrs, const char *name, const struct ldb_val *val); int sysdb_attrs_add_string(struct sysdb_attrs *attrs, const char *name, const char *str); +int sysdb_attrs_add_mem(struct sysdb_attrs *, const char *, + const void *, size_t); int sysdb_attrs_add_bool(struct sysdb_attrs *attrs, const char *name, bool value); int sysdb_attrs_add_long(struct sysdb_attrs *attrs, diff --git a/src/providers/ldap/sdap.c b/src/providers/ldap/sdap.c index 01c6bcfd8..895f46d53 100644 --- a/src/providers/ldap/sdap.c +++ b/src/providers/ldap/sdap.c @@ -312,7 +312,6 @@ errno_t sdap_parse_deref(TALLOC_CTX *mem_ctx, const char **ocs; struct sdap_attr_map *map; int num_attrs; - struct ldb_val v; int ret, i, a, mi; const char *name; size_t len; @@ -443,10 +442,9 @@ errno_t sdap_parse_deref(TALLOC_CTX *mem_ctx, for (i=0; dval->vals[i].bv_val; i++) { DEBUG(9, ("Dereferenced attribute value: %s\n", dval->vals[i].bv_val)); - v.data = (uint8_t *) dval->vals[i].bv_val; - v.length = dval->vals[i].bv_len; - - ret = sysdb_attrs_add_val(res[mi]->attrs, name, &v); + ret = sysdb_attrs_add_mem(res[mi]->attrs, name, + dval->vals[i].bv_val, + dval->vals[i].bv_len); if (ret) goto done; } } diff --git a/src/providers/ldap/sdap_async.c b/src/providers/ldap/sdap_async.c index f65b41a33..464bf03b0 100644 --- a/src/providers/ldap/sdap_async.c +++ b/src/providers/ldap/sdap_async.c @@ -2214,8 +2214,8 @@ sdap_attrs_add_ldap_attr(struct sysdb_attrs *ldap_attrs, DEBUG(SSSDBG_TRACE_INTERNAL, ("Adding %s [%s] to attributes " "of [%s].\n", desc, el->values[i].data, objname)); - ret = sysdb_attrs_add_string(attrs, attr_name, - (const char *) el->values[i].data); + ret = sysdb_attrs_add_mem(attrs, attr_name, el->values[i].data, + el->values[i].length); if (ret) { return ret; } |