diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-12-10 14:33:13 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-12-10 17:51:29 +1100 |
| commit | 261ba40e77192d0354d332a9a72eb94f327cb4e6 (patch) | |
| tree | a942939d786efd821263da8bccae0befbf5a4a6e /source4/dsdb/samdb/ldb_modules/extended_dn_out.c | |
| parent | 215cc5a9edfbe9b50440266fba72e8f91c64066b (diff) | |
| download | samba-261ba40e77192d0354d332a9a72eb94f327cb4e6.tar.gz samba-261ba40e77192d0354d332a9a72eb94f327cb4e6.tar.bz2 samba-261ba40e77192d0354d332a9a72eb94f327cb4e6.zip | |
s4-dsdb: use GUID_to_ndr_blob()
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/extended_dn_out.c')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/extended_dn_out.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c index 1463e192e9..55dd6939e3 100644 --- a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c +++ b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c @@ -202,8 +202,6 @@ static int handle_dereference_openldap(struct ldb_dn *dn, entryUUIDblob = ldb_msg_find_ldb_val(&fake_msg, "entryUUID"); if (entryUUIDblob) { NTSTATUS status; - enum ndr_err_code ndr_err; - struct ldb_val guid_blob; struct GUID guid; @@ -212,9 +210,8 @@ static int handle_dereference_openldap(struct ldb_dn *dn, if (!NT_STATUS_IS_OK(status)) { return LDB_ERR_INVALID_DN_SYNTAX; } - ndr_err = ndr_push_struct_blob(&guid_blob, NULL, NULL, &guid, - (ndr_push_flags_fn_t)ndr_push_GUID); - if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { + status = GUID_to_ndr_blob(&guid, dn, &guid_blob); + if (!NT_STATUS_IS_OK(status)) { return LDB_ERR_INVALID_DN_SYNTAX; } @@ -259,8 +256,6 @@ static int handle_dereference_fds(struct ldb_dn *dn, nsUniqueIdBlob = ldb_msg_find_ldb_val(&fake_msg, "nsUniqueId"); if (nsUniqueIdBlob) { NTSTATUS status; - enum ndr_err_code ndr_err; - struct ldb_val guid_blob; struct GUID guid; @@ -269,9 +264,8 @@ static int handle_dereference_fds(struct ldb_dn *dn, if (!NT_STATUS_IS_OK(status)) { return LDB_ERR_INVALID_DN_SYNTAX; } - ndr_err = ndr_push_struct_blob(&guid_blob, NULL, NULL, &guid, - (ndr_push_flags_fn_t)ndr_push_GUID); - if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { + status = GUID_to_ndr_blob(&guid, dn, &guid_blob); + if (!NT_STATUS_IS_OK(status)) { return LDB_ERR_INVALID_DN_SYNTAX; } |