s4:dsdb_sort_objectClass_attr - use "data_blob_string_const" for setting values
authorMatthias Dieter Wallnöfer <mdw@samba.org>
Fri, 4 May 2012 06:46:29 +0000 (08:46 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 21 Aug 2012 23:31:55 +0000 (01:31 +0200)
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 <abartlet@samba.org>
source4/dsdb/schema/schema_query.c

index d16711ad19b019299c9014b4a34c0b67617840f5..ce46fa6315692a5d9310c9b7896c4d32c66f9854 100644 (file)
@@ -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);
        }