summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-01-09 17:42:59 +1100
committerAndrew Tridgell <tridge@samba.org>2010-01-09 18:56:30 +1100
commitba745a43567062e48fe8e5b316f390b99868c309 (patch)
tree750786ccbc41502e479080099892d2d43b026895
parent8c2d7ae19e5a14ffa37af60ff4eec4d79f70040b (diff)
downloadsamba-ba745a43567062e48fe8e5b316f390b99868c309.tar.gz
samba-ba745a43567062e48fe8e5b316f390b99868c309.tar.bz2
samba-ba745a43567062e48fe8e5b316f390b99868c309.zip
s4-drs: fixed writespn to ignore add/delete errors
When a SPN is added and already exists, it is ignored. Similarly, when a SPN is deleted and doesn't exist, it is ignored.
-rw-r--r--source4/rpc_server/drsuapi/writespn.c43
1 files changed, 40 insertions, 3 deletions
diff --git a/source4/rpc_server/drsuapi/writespn.c b/source4/rpc_server/drsuapi/writespn.c
index 79a6eb55f4..7c8ff3332b 100644
--- a/source4/rpc_server/drsuapi/writespn.c
+++ b/source4/rpc_server/drsuapi/writespn.c
@@ -47,6 +47,11 @@ WERROR dcesrv_drsuapi_DsWriteAccountSpn(struct dcesrv_call_state *dce_call, TALL
struct drsuapi_DsWriteAccountSpnRequest1 *req;
struct ldb_message *msg;
int count, i, ret;
+ struct ldb_result *res;
+ const char *attrs[] = { "servicePrincipalName", NULL };
+ struct ldb_message_element *el;
+ unsigned spn_count=0;
+
req = &r->in.req->req1;
count = req->count;
@@ -61,11 +66,42 @@ WERROR dcesrv_drsuapi_DsWriteAccountSpn(struct dcesrv_call_state *dce_call, TALL
return WERR_OK;
}
+ /* load the existing SPNs, as these are
+ * ignored for adds and deletes (see MS-DRSR
+ * section 4.1.28.3)
+ */
+ ret = ldb_search(b_state->sam_ctx, msg, &res, msg->dn, LDB_SCOPE_BASE,
+ attrs, NULL);
+ if (ret != LDB_SUCCESS) {
+ DEBUG(0,("Failed to load existing SPNs on %s: %s\n",
+ ldb_dn_get_linearized(msg->dn),
+ ldb_errstring(b_state->sam_ctx)));
+ r->out.res->res1.status = WERR_DS_OBJ_NOT_FOUND;
+ return WERR_OK;
+ }
+ el = ldb_msg_find_element(res->msgs[0], "servicePrincipalName");
+
/* construct mods */
for (i = 0; i < count; i++) {
- samdb_msg_add_string(b_state->sam_ctx,
- msg, msg, "servicePrincipalName",
- req->spn_names[i].str);
+ bool found = false;
+ int j;
+ for (j=0; el && j<el->num_values; j++) {
+ if (samdb_ldb_val_case_cmp(req->spn_names[i].str, &el->values[j]) == 0) {
+ found = true;
+ break;
+ }
+ }
+ if ((req->operation == DRSUAPI_DS_SPN_OPERATION_ADD && found) ||
+ (req->operation == DRSUAPI_DS_SPN_OPERATION_DELETE && !found)) {
+ continue;
+ }
+ 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++;
}
for (i=0;i<msg->num_elements;i++) {
switch (req->operation) {
@@ -90,6 +126,7 @@ WERROR dcesrv_drsuapi_DsWriteAccountSpn(struct dcesrv_call_state *dce_call, TALL
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;
}