diff options
| author | Simo Sorce <idra@samba.org> | 2005-08-18 16:18:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:33:33 -0500 |
| commit | ac90ddfdb28050912ecab0e998089b93216c5c35 (patch) | |
| tree | cb37f9654b81ec3575466689cd130dd8c92b48fd /source4/libnet | |
| parent | 3e4c4cff2177af33efdb15f03a1bbcb639505cee (diff) | |
| download | samba-ac90ddfdb28050912ecab0e998089b93216c5c35.tar.gz samba-ac90ddfdb28050912ecab0e998089b93216c5c35.tar.bz2 samba-ac90ddfdb28050912ecab0e998089b93216c5c35.zip | |
r9392: Fix ldb_dn_compose to make build farm happy
Add ldb_dn_string_compose so that you can build a dn starting from a
struct ldb_dn base and a set of parameters to be composed in a format
string with the same syntax of printf
(This used to be commit 31c69d0655752cc8ea3bc5b7ea87792291302091)
Diffstat (limited to 'source4/libnet')
| -rw-r--r-- | source4/libnet/libnet_samsync_ldb.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c index 4ec7c60715..8d06ec84b6 100644 --- a/source4/libnet/libnet_samsync_ldb.c +++ b/source4/libnet/libnet_samsync_ldb.c @@ -337,11 +337,8 @@ static NTSTATUS samsync_ldb_handle_user(TALLOC_CTX *mem_ctx, if (add) { samdb_msg_add_string(state->sam_ldb, mem_ctx, msg, "objectClass", obj_class); - msg->dn = ldb_dn_build_child(mem_ctx, - "CN", cn_name, - ldb_dn_build_child(mem_ctx, - "CN", container, - state->base_dn[database])); + msg->dn = ldb_dn_string_compose(mem_ctx, state->base_dn[database], + "CN=%s, CN=%s", cn_name, container); if (!msg->dn) { return NT_STATUS_NO_MEMORY; } @@ -477,11 +474,8 @@ static NTSTATUS samsync_ldb_handle_group(TALLOC_CTX *mem_ctx, if (add) { samdb_msg_add_string(state->sam_ldb, mem_ctx, msg, "objectClass", obj_class); - msg->dn = ldb_dn_build_child(mem_ctx, - "CN", cn_name, - ldb_dn_build_child(mem_ctx, - "CN", container, - state->base_dn[database])); + msg->dn = ldb_dn_string_compose(mem_ctx, state->base_dn[database], + "CN=%s, CN=%s", cn_name, container); if (!msg->dn) { return NT_STATUS_NO_MEMORY; } @@ -694,11 +688,8 @@ static NTSTATUS samsync_ldb_handle_alias(TALLOC_CTX *mem_ctx, if (add) { samdb_msg_add_string(state->sam_ldb, mem_ctx, msg, "objectClass", obj_class); - msg->dn = ldb_dn_build_child(mem_ctx, - "CN", cn_name, - ldb_dn_build_child(mem_ctx, - "CN", container, - state->base_dn[database])); + msg->dn = ldb_dn_string_compose(mem_ctx, state->base_dn[database], + "CN=%s, CN=%s", cn_name, container); if (!msg->dn) { return NT_STATUS_NO_MEMORY; } |