s4-drs: replace manual checks with dsdb_modify_permissive()

[samba.git] / source4 / rpc_server / drsuapi / writespn.c

diff --git a/source4/rpc_server/drsuapi/writespn.c b/source4/rpc_server/drsuapi/writespn.c
index 79a6eb55f40f98c1ba003b4470ad68e78e864b14..65a7183d11a0a70b7b3a72f338d5d9b2deefe219 100644 (file)
--- a/source4/rpc_server/drsuapi/writespn.c
+++ b/source4/rpc_server/drsuapi/writespn.c
@@ -47,6 +47,8 @@ WERROR dcesrv_drsuapi_DsWriteAccountSpn(struct dcesrv_call_state *dce_call, TALL
                        struct drsuapi_DsWriteAccountSpnRequest1 *req;
                        struct ldb_message *msg;
                        int count, i, ret;
+                       unsigned spn_count=0;
+
                        req = &r->in.req->req1;
                        count = req->count;
 
@@ -63,10 +65,21 @@ WERROR dcesrv_drsuapi_DsWriteAccountSpn(struct dcesrv_call_state *dce_call, TALL
 
                        /* construct mods */
                        for (i = 0; i < count; i++) {
-                               samdb_msg_add_string(b_state->sam_ctx,
-                                                    msg, msg, "servicePrincipalName",
-                                                    req->spn_names[i].str);
+                               ret = samdb_msg_add_string(b_state->sam_ctx,
+                                                          msg, msg, "servicePrincipalName",
+                                                          req->spn_names[i].str);
+                               if (ret != LDB_SUCCESS) {
+                                       return WERR_NOMEM;
+                               }
+                               spn_count++;
+                       }
+
+                       if (msg->num_elements == 0) {
+                               DEBUG(2,("No SPNs need changing on %s\n", ldb_dn_get_linearized(msg->dn)));
+                               r->out.res->res1.status = WERR_OK;
+                               return WERR_OK;
                        }
+
                        for (i=0;i<msg->num_elements;i++) {
                                switch (req->operation) {
                                case DRSUAPI_DS_SPN_OPERATION_ADD:
@@ -82,14 +95,14 @@ WERROR dcesrv_drsuapi_DsWriteAccountSpn(struct dcesrv_call_state *dce_call, TALL
                        }
 
                        /* Apply to database */
-
-                       ret = ldb_modify(b_state->sam_ctx, msg);
+                       ret = dsdb_modify_permissive(b_state->sam_ctx, msg);
                        if (ret != 0) {
                                DEBUG(0,("Failed to modify SPNs on %s: %s\n",
                                         ldb_dn_get_linearized(msg->dn),
                                         ldb_errstring(b_state->sam_ctx)));
                                r->out.res->res1.status = WERR_ACCESS_DENIED;
                        } else {
+                               DEBUG(2,("Modified %u SPNs on %s\n", spn_count, ldb_dn_get_linearized(msg->dn)));
                                r->out.res->res1.status = WERR_OK;
                        }