s4-dsdb: change samdb_replace() to dsdb_replace() and allow for dsdb_flags

[ira/wip.git] / source4 / libnet / libnet_samsync_ldb.c

diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c
index e7066ecfd2a930421854e7de4a07ab50732f9aee..e9db4a909cb97dfe15940efc13eea092a3c9fe4d 100644 (file)
--- a/source4/libnet/libnet_samsync_ldb.c
+++ b/source4/libnet/libnet_samsync_ldb.c
@@ -222,7 +222,7 @@ static NTSTATUS samsync_ldb_handle_domain(TALLOC_CTX *mem_ctx,
 
        /* TODO: Account lockout, password properties */
        
 
        /* TODO: Account lockout, password properties */
        

-       ret = samdb_replace(state->sam_ldb, mem_ctx, msg);
+       ret = dsdb_replace(state->sam_ldb, msg, 0);

 
        if (ret) {
                return NT_STATUS_INTERNAL_ERROR;
 
        if (ret) {
                return NT_STATUS_INTERNAL_ERROR;


@@ -454,7 +454,7 @@ static NTSTATUS samsync_ldb_handle_user(TALLOC_CTX *mem_ctx,
                        }
                }
        } else {
                        }
                }
        } else {

-               ret = samdb_replace(state->sam_ldb, mem_ctx, msg);
+               ret = dsdb_replace(state->sam_ldb, msg, 0);

                if (ret != 0) {
                        *error_string = talloc_asprintf(mem_ctx, "Failed to modify user record %s: %s",
                                                        ldb_dn_get_linearized(msg->dn),
                if (ret != 0) {
                        *error_string = talloc_asprintf(mem_ctx, "Failed to modify user record %s: %s",
                                                        ldb_dn_get_linearized(msg->dn),


@@ -593,7 +593,7 @@ static NTSTATUS samsync_ldb_handle_group(TALLOC_CTX *mem_ctx,
                        return NT_STATUS_INTERNAL_DB_CORRUPTION;
                }
        } else {
                        return NT_STATUS_INTERNAL_DB_CORRUPTION;
                }
        } else {

-               ret = samdb_replace(state->sam_ldb, mem_ctx, msg);
+               ret = dsdb_replace(state->sam_ldb, msg, 0);

                if (ret != 0) {
                        *error_string = talloc_asprintf(mem_ctx, "Failed to modify group record %s: %s",
                                                        ldb_dn_get_linearized(msg->dn),
                if (ret != 0) {
                        *error_string = talloc_asprintf(mem_ctx, "Failed to modify group record %s: %s",
                                                        ldb_dn_get_linearized(msg->dn),


@@ -708,7 +708,7 @@ static NTSTATUS samsync_ldb_handle_group_member(TALLOC_CTX *mem_ctx,
                talloc_free(msgs);
        }
        
                talloc_free(msgs);
        }
        

-       ret = samdb_replace(state->sam_ldb, mem_ctx, msg);
+       ret = dsdb_replace(state->sam_ldb, msg, 0);

        if (ret != 0) {
                *error_string = talloc_asprintf(mem_ctx, "Failed to modify group record %s: %s",
                                                ldb_dn_get_linearized(msg->dn),
        if (ret != 0) {
                *error_string = talloc_asprintf(mem_ctx, "Failed to modify group record %s: %s",
                                                ldb_dn_get_linearized(msg->dn),


@@ -807,7 +807,7 @@ static NTSTATUS samsync_ldb_handle_alias(TALLOC_CTX *mem_ctx,
                        return NT_STATUS_INTERNAL_DB_CORRUPTION;
                }
        } else {
                        return NT_STATUS_INTERNAL_DB_CORRUPTION;
                }
        } else {

-               ret = samdb_replace(state->sam_ldb, mem_ctx, msg);
+               ret = dsdb_replace(state->sam_ldb, msg, 0);

                if (ret != 0) {
                        *error_string = talloc_asprintf(mem_ctx, "Failed to modify alias record %s: %s",
                                                        ldb_dn_get_linearized(msg->dn),
                if (ret != 0) {
                        *error_string = talloc_asprintf(mem_ctx, "Failed to modify alias record %s: %s",
                                                        ldb_dn_get_linearized(msg->dn),


@@ -926,7 +926,7 @@ static NTSTATUS samsync_ldb_handle_alias_member(TALLOC_CTX *mem_ctx,
                talloc_free(msgs);
        }
 
                talloc_free(msgs);
        }
 

-       ret = samdb_replace(state->sam_ldb, mem_ctx, msg);
+       ret = dsdb_replace(state->sam_ldb, msg, 0);

        if (ret != 0) {
                *error_string = talloc_asprintf(mem_ctx, "Failed to modify group record %s: %s",
                                                ldb_dn_get_linearized(msg->dn),
        if (ret != 0) {
                *error_string = talloc_asprintf(mem_ctx, "Failed to modify group record %s: %s",
                                                ldb_dn_get_linearized(msg->dn),


@@ -970,7 +970,7 @@ static NTSTATUS samsync_ldb_handle_account(TALLOC_CTX *mem_ctx,
                                     account->privilege_name[i].string);
        }
 
                                     account->privilege_name[i].string);
        }
 

-       ret = samdb_replace(state->pdb, mem_ctx, msg);
+       ret = dsdb_replace(state->pdb, msg, 0);

        if (ret == LDB_ERR_NO_SUCH_OBJECT) {
                if (samdb_msg_add_dom_sid(state->pdb, msg, msg, "objectSid", sid) != LDB_SUCCESS) {
                        talloc_free(msg);
        if (ret == LDB_ERR_NO_SUCH_OBJECT) {
                if (samdb_msg_add_dom_sid(state->pdb, msg, msg, "objectSid", sid) != LDB_SUCCESS) {
                        talloc_free(msg);


@@ -1028,7 +1028,7 @@ static NTSTATUS samsync_ldb_delete_account(TALLOC_CTX *mem_ctx,
        samdb_msg_add_delete(state->sam_ldb, mem_ctx, msg,  
                             "privilege");
 
        samdb_msg_add_delete(state->sam_ldb, mem_ctx, msg,  
                             "privilege");
 

-       ret = samdb_replace(state->sam_ldb, mem_ctx, msg);
+       ret = dsdb_replace(state->sam_ldb, msg, 0);

        if (ret != 0) {
                *error_string = talloc_asprintf(mem_ctx, "Failed to modify privilege record %s",
                                                ldb_dn_get_linearized(msg->dn));
        if (ret != 0) {
                *error_string = talloc_asprintf(mem_ctx, "Failed to modify privilege record %s",
                                                ldb_dn_get_linearized(msg->dn));