diff options
| author | Fernando J V da Silva <fernandojvsilva@yahoo.com.br> | 2009-11-25 17:01:55 -0300 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-11-30 21:17:27 +1100 |
| commit | 71e29cbf56048791057ccf07b859654312f3882e (patch) | |
| tree | 7f413aa6586987f9d1a4817fd85bf66feee2e3d7 /source4/dsdb/samdb/ldb_modules/samldb.c | |
| parent | 0003b5fad1dee687bc15dfad9f71b6dfc40556d7 (diff) | |
| download | samba-71e29cbf56048791057ccf07b859654312f3882e.tar.gz samba-71e29cbf56048791057ccf07b859654312f3882e.tar.bz2 samba-71e29cbf56048791057ccf07b859654312f3882e.zip | |
s4-drs: Using dsdb_msg_add_guid() utility function
Uses the dsdb_msg_add_guid() to add any kind of GUID attribute
to a ldb_message in several places of samba4 code.
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/samldb.c')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/samldb.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c index c5161dbe41..e49b493a98 100644 --- a/source4/dsdb/samdb/ldb_modules/samldb.c +++ b/source4/dsdb/samdb/ldb_modules/samldb.c @@ -1161,21 +1161,10 @@ static int samldb_fill_object(struct samldb_ctx *ac, const char *type) } if (!ldb_msg_find_element(ac->msg, "schemaIDGUID")) { - enum ndr_err_code ndr_err; - struct ldb_val guid_value; struct GUID guid; /* a new GUID */ guid = GUID_random(); - /* generated NDR encoded values */ - ndr_err = ndr_push_struct_blob(&guid_value, ac->msg, - NULL, - &guid, - (ndr_push_flags_fn_t)ndr_push_GUID); - if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { - ldb_oom(ldb); - return LDB_ERR_OPERATIONS_ERROR; - } - ret = ldb_msg_add_value(ac->msg, "schemaIDGUID", &guid_value, NULL); + ret = dsdb_msg_add_guid(ac->msg, &guid, "schemaIDGUID"); if (ret != LDB_SUCCESS) { ldb_oom(ldb); return ret; @@ -1211,21 +1200,10 @@ static int samldb_fill_object(struct samldb_ctx *ac, const char *type) if (ret != LDB_SUCCESS) return ret; if (!ldb_msg_find_element(ac->msg, "schemaIDGUID")) { - enum ndr_err_code ndr_err; - struct ldb_val guid_value; struct GUID guid; /* a new GUID */ guid = GUID_random(); - /* generated NDR encoded values */ - ndr_err = ndr_push_struct_blob(&guid_value, ac->msg, - NULL, - &guid, - (ndr_push_flags_fn_t)ndr_push_GUID); - if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { - ldb_oom(ldb); - return LDB_ERR_OPERATIONS_ERROR; - } - ret = ldb_msg_add_value(ac->msg, "schemaIDGUID", &guid_value, NULL); + ret = dsdb_msg_add_guid(ac->msg, &guid, "schemaIDGUID"); if (ret != LDB_SUCCESS) { ldb_oom(ldb); return ret; |