From: Matthias Dieter Wallnöfer Date: Fri, 4 May 2012 06:46:29 +0000 (+0200) Subject: s4:dsdb_sort_objectClass_attr - use "data_blob_string_const" for setting values X-Git-Tag: samba-4.0.0beta7~103 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=166a7d37f7bfc7b22163e1d38a0bb0e47c2f6622;p=thirdparty%2Fsamba.git s4:dsdb_sort_objectClass_attr - use "data_blob_string_const" for setting values As shown in commit c8e6d8b487 this looks easier and in any case we can treat schema context data like global data. Signed-off-by: Andrew Bartlett --- diff --git a/source4/dsdb/schema/schema_query.c b/source4/dsdb/schema/schema_query.c index d16711ad19b..ce46fa63156 100644 --- a/source4/dsdb/schema/schema_query.c +++ b/source4/dsdb/schema/schema_query.c @@ -595,12 +595,7 @@ int dsdb_sort_objectClass_attr(struct ldb_context *ldb, if (el->values == NULL) { return ldb_oom(ldb); } - el->values[el->num_values].data = (uint8_t *)talloc_strdup(out_mem_ctx, - current->objectclass->lDAPDisplayName); - if (el->values[el->num_values].data == NULL) { - return ldb_oom(ldb); - } - el->values[el->num_values].length = strlen(current->objectclass->lDAPDisplayName); + el->values[el->num_values] = data_blob_string_const(current->objectclass->lDAPDisplayName); ++(el->num_values); }