diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-11-27 01:25:11 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:46:17 +0100 |
| commit | 25143a26481e735c46c61aa3673eb4858a7819be (patch) | |
| tree | ca70e475c8b3b48b328e4e0cf30c06b1fbf18eaa /source4/libnet | |
| parent | 55f333ae2ddbc8d26f6236f292a52416a35c3e0c (diff) | |
| download | samba-25143a26481e735c46c61aa3673eb4858a7819be.tar.gz samba-25143a26481e735c46c61aa3673eb4858a7819be.tar.bz2 samba-25143a26481e735c46c61aa3673eb4858a7819be.zip | |
r26135: Remove samdb_add(), samdb_delete() and samdb_modify(), which were just
wrappers to ldb_add() etc. samdb_replace() remains, as it sets flags on
all entries as 'replace'.
Andrew Bartlett
(This used to be commit 09c0faa5b7e1a560bf13b99a2584012a47377bb6)
Diffstat (limited to 'source4/libnet')
| -rw-r--r-- | source4/libnet/libnet_join.c | 2 | ||||
| -rw-r--r-- | source4/libnet/libnet_samsync_ldb.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c index 215217bfef..d80ff34d0f 100644 --- a/source4/libnet/libnet_join.c +++ b/source4/libnet/libnet_join.c @@ -1136,7 +1136,7 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx, } /* create the secret */ - ret = samdb_add(ldb, tmp_mem, msg); + ret = ldb_add(ldb, msg); if (ret != 0) { r->out.error_string = talloc_asprintf(mem_ctx, "Failed to create secret record %s", ldb_dn_get_linearized(msg->dn)); diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c index 86e5af2d6e..8ec058d845 100644 --- a/source4/libnet/libnet_samsync_ldb.c +++ b/source4/libnet/libnet_samsync_ldb.c @@ -101,7 +101,7 @@ static NTSTATUS samsync_ldb_add_foreignSecurityPrincipal(TALLOC_CTX *mem_ctx, *fsp_dn = msg->dn; /* create the alias */ - ret = samdb_add(state->sam_ldb, mem_ctx, msg); + ret = ldb_add(state->sam_ldb, msg); if (ret != 0) { *error_string = talloc_asprintf(mem_ctx, "Failed to create foreignSecurityPrincipal " "record %s: %s", @@ -429,7 +429,7 @@ static NTSTATUS samsync_ldb_handle_user(TALLOC_CTX *mem_ctx, } } - ret = samdb_add(state->sam_ldb, mem_ctx, msg); + ret = ldb_add(state->sam_ldb, msg); if (ret != 0) { struct ldb_dn *first_try_dn = msg->dn; /* Try again with the default DN */ @@ -440,7 +440,7 @@ static NTSTATUS samsync_ldb_handle_user(TALLOC_CTX *mem_ctx, return NT_STATUS_INTERNAL_DB_CORRUPTION; } else { msg->dn = talloc_steal(msg, remote_msgs[0]->dn); - ret = samdb_add(state->sam_ldb, mem_ctx, msg); + ret = ldb_add(state->sam_ldb, msg); if (ret != 0) { *error_string = talloc_asprintf(mem_ctx, "Failed to create user record. Tried both %s and %s: %s", ldb_dn_get_linearized(first_try_dn), @@ -493,7 +493,7 @@ static NTSTATUS samsync_ldb_delete_user(TALLOC_CTX *mem_ctx, return NT_STATUS_INTERNAL_DB_CORRUPTION; } - ret = samdb_delete(state->sam_ldb, mem_ctx, msgs[0]->dn); + ret = ldb_delete(state->sam_ldb, msgs[0]->dn); if (ret != 0) { *error_string = talloc_asprintf(mem_ctx, "Failed to delete user record %s: %s", ldb_dn_get_linearized(msgs[0]->dn), @@ -582,7 +582,7 @@ static NTSTATUS samsync_ldb_handle_group(TALLOC_CTX *mem_ctx, return NT_STATUS_NO_MEMORY; } - ret = samdb_add(state->sam_ldb, mem_ctx, msg); + ret = ldb_add(state->sam_ldb, msg); if (ret != 0) { *error_string = talloc_asprintf(mem_ctx, "Failed to create group record %s: %s", ldb_dn_get_linearized(msg->dn), @@ -632,7 +632,7 @@ static NTSTATUS samsync_ldb_delete_group(TALLOC_CTX *mem_ctx, return NT_STATUS_INTERNAL_DB_CORRUPTION; } - ret = samdb_delete(state->sam_ldb, mem_ctx, msgs[0]->dn); + ret = ldb_delete(state->sam_ldb, msgs[0]->dn); if (ret != 0) { *error_string = talloc_asprintf(mem_ctx, "Failed to delete group record %s: %s", ldb_dn_get_linearized(msgs[0]->dn), @@ -796,7 +796,7 @@ static NTSTATUS samsync_ldb_handle_alias(TALLOC_CTX *mem_ctx, return NT_STATUS_NO_MEMORY; } - ret = samdb_add(state->sam_ldb, mem_ctx, msg); + ret = ldb_add(state->sam_ldb, msg); if (ret != 0) { *error_string = talloc_asprintf(mem_ctx, "Failed to create alias record %s: %s", ldb_dn_get_linearized(msg->dn), @@ -841,7 +841,7 @@ static NTSTATUS samsync_ldb_delete_alias(TALLOC_CTX *mem_ctx, return NT_STATUS_INTERNAL_DB_CORRUPTION; } - ret = samdb_delete(state->sam_ldb, mem_ctx, msgs[0]->dn); + ret = ldb_delete(state->sam_ldb, msgs[0]->dn); if (ret != 0) { *error_string = talloc_asprintf(mem_ctx, "Failed to delete alias record %s: %s", ldb_dn_get_linearized(msgs[0]->dn), |