diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-12-18 20:51:37 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-01-02 08:16:50 +1100 |
| commit | b1db66a501e3b5e5df66e722ad849a821c667d5b (patch) | |
| tree | a34212a8933980dc7c5774e8316d7cffab569cec | |
| parent | f1b6484232cbcd31056b8f905f3b111d0c9069b0 (diff) | |
| download | samba-b1db66a501e3b5e5df66e722ad849a821c667d5b.tar.gz samba-b1db66a501e3b5e5df66e722ad849a821c667d5b.tar.bz2 samba-b1db66a501e3b5e5df66e722ad849a821c667d5b.zip | |
s4-dsdb: allow the component name to be specified in dsdb_get_extended_dn_guid()
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source4/dsdb/common/util.c | 4 | ||||
| -rw-r--r-- | source4/dsdb/schema/schema_syntax.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index 561edff94c..528c68b856 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -2797,11 +2797,11 @@ int dsdb_functional_level(struct ldb_context *ldb) /* return a GUID from a extended DN structure */ -NTSTATUS dsdb_get_extended_dn_guid(struct ldb_dn *dn, struct GUID *guid) +NTSTATUS dsdb_get_extended_dn_guid(struct ldb_dn *dn, struct GUID *guid, const char *component_name) { const struct ldb_val *v; - v = ldb_dn_get_extended_component(dn, "GUID"); + v = ldb_dn_get_extended_component(dn, component_name); if (v == NULL) { return NT_STATUS_OBJECT_NAME_NOT_FOUND; } diff --git a/source4/dsdb/schema/schema_syntax.c b/source4/dsdb/schema/schema_syntax.c index 1989db0699..e958605707 100644 --- a/source4/dsdb/schema/schema_syntax.c +++ b/source4/dsdb/schema/schema_syntax.c @@ -1183,7 +1183,7 @@ static WERROR dsdb_syntax_DN_ldb_to_drsuapi(struct ldb_context *ldb, ZERO_STRUCT(id3); - status = dsdb_get_extended_dn_guid(dn, &id3.guid); + status = dsdb_get_extended_dn_guid(dn, &id3.guid, "GUID"); if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) { talloc_free(tmp_ctx); @@ -1367,7 +1367,7 @@ static WERROR dsdb_syntax_DN_BINARY_ldb_to_drsuapi(struct ldb_context *ldb, ZERO_STRUCT(id3); - status = dsdb_get_extended_dn_guid(dsdb_dn->dn, &id3.guid); + status = dsdb_get_extended_dn_guid(dsdb_dn->dn, &id3.guid, "GUID"); if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) { talloc_free(tmp_ctx); |