s4:drsuapi RPC server - "result_site_name" - fix variable denomination
[kamenim/samba.git] / source4 / rpc_server / drsuapi / dcesrv_drsuapi.c
index 73cc8cb1efe46c97193f325f8f0eb38ace86d016..7db9bfda45a09d007ca6f47515089b8b6390d01f 100644 (file)
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "rpc_server/dcerpc_server.h"
 #include "rpc_server/common/common.h"
-#include "rpc_server/drsuapi/dcesrv_drsuapi.h"
 #include "dsdb/samdb/samdb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include "rpc_server/drsuapi/dcesrv_drsuapi.h"
+#include "libcli/security/security.h"
+#include "auth/auth.h"
 #include "param/param.h"
-#include "librpc/gen_ndr/ndr_drsblobs.h"
-#include "messaging/irpc.h"
+
+#define DRSUAPI_UNSUPPORTED(fname) do { \
+       DEBUG(1,(__location__ ": Unsupported DRS call %s\n", #fname)); \
+       if (DEBUGLVL(2)) NDR_PRINT_IN_DEBUG(fname, r); \
+       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR); \
+} while (0)
 
 /* 
   drsuapi_DsBind 
@@ -50,6 +55,8 @@ static WERROR dcesrv_drsuapi_DsBind(struct dcesrv_call_state *dce_call, TALLOC_C
        uint32_t pid;
        uint32_t repl_epoch;
        int ret;
+       struct auth_session_info *auth_info;
+       WERROR werr;
 
        r->out.bind_info = NULL;
        ZERO_STRUCTP(r->out.bind_handle);
@@ -57,10 +64,20 @@ static WERROR dcesrv_drsuapi_DsBind(struct dcesrv_call_state *dce_call, TALLOC_C
        b_state = talloc_zero(mem_ctx, struct drsuapi_bind_state);
        W_ERROR_HAVE_NO_MEMORY(b_state);
 
+       /* if this is a DC connecting, give them system level access */
+       werr = drs_security_level_check(dce_call, NULL, SECURITY_DOMAIN_CONTROLLER);
+       if (W_ERROR_IS_OK(werr)) {
+               DEBUG(3,(__location__ ": doing DsBind with system_session\n"));
+               auth_info = system_session(dce_call->conn->dce_ctx->lp_ctx);
+       } else {
+               auth_info = dce_call->conn->auth_state.session_info;
+       }
+
        /*
         * connect to the samdb
         */
-       b_state->sam_ctx = samdb_connect(b_state, dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, dce_call->conn->auth_state.session_info); 
+       b_state->sam_ctx = samdb_connect(b_state, dce_call->event_ctx, 
+                                        dce_call->conn->dce_ctx->lp_ctx, auth_info); 
        if (!b_state->sam_ctx) {
                return WERR_FOOBAR;
        }
@@ -149,10 +166,7 @@ static WERROR dcesrv_drsuapi_DsBind(struct dcesrv_call_state *dce_call, TALLOC_C
        b_state->local_info28.supported_extensions      |= DRSUAPI_SUPPORTED_EXTENSION_RESTORE_USN_OPTIMIZATION;
        b_state->local_info28.supported_extensions      |= DRSUAPI_SUPPORTED_EXTENSION_KCC_EXECUTE;
        b_state->local_info28.supported_extensions      |= DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY_V2;
-       if (0 /*domain.behavior_version == 2*/) {
-               /* TODO: find out how this is really triggered! */
-               b_state->local_info28.supported_extensions      |= DRSUAPI_SUPPORTED_EXTENSION_LINKED_VALUE_REPLICATION;
-       }
+       b_state->local_info28.supported_extensions      |= DRSUAPI_SUPPORTED_EXTENSION_LINKED_VALUE_REPLICATION;
        b_state->local_info28.supported_extensions      |= DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V2;
        b_state->local_info28.supported_extensions      |= DRSUAPI_SUPPORTED_EXTENSION_INSTANCE_TYPE_NOT_REQ_ON_MOD;
        b_state->local_info28.supported_extensions      |= DRSUAPI_SUPPORTED_EXTENSION_CRYPTO_BIND;
@@ -162,7 +176,7 @@ static WERROR dcesrv_drsuapi_DsBind(struct dcesrv_call_state *dce_call, TALLOC_C
        b_state->local_info28.supported_extensions      |= DRSUAPI_SUPPORTED_EXTENSION_TRANSITIVE_MEMBERSHIP;
        b_state->local_info28.supported_extensions      |= DRSUAPI_SUPPORTED_EXTENSION_ADD_SID_HISTORY;
        b_state->local_info28.supported_extensions      |= DRSUAPI_SUPPORTED_EXTENSION_POST_BETA3;
-       b_state->local_info28.supported_extensions      |= DRSUAPI_SUPPORTED_EXTENSION_00100000;
+       b_state->local_info28.supported_extensions      |= DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V5;
        b_state->local_info28.supported_extensions      |= DRSUAPI_SUPPORTED_EXTENSION_GET_MEMBERSHIPS2;
        b_state->local_info28.supported_extensions      |= DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V6;
        b_state->local_info28.supported_extensions      |= DRSUAPI_SUPPORTED_EXTENSION_NONDOMAIN_NCS;
@@ -231,304 +245,48 @@ static WERROR dcesrv_drsuapi_DsUnbind(struct dcesrv_call_state *dce_call, TALLOC
 static WERROR dcesrv_drsuapi_DsReplicaSync(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                                           struct drsuapi_DsReplicaSync *r)
 {
-       struct server_id *repld;
-       struct irpc_request *ireq;
-
-       if (DEBUGLVL(4)) {
-               NDR_PRINT_IN_DEBUG(drsuapi_DsReplicaSync, r);
-       }
-
-       repld = irpc_servers_byname(dce_call->msg_ctx, mem_ctx, "dreplsrv");
-       if (repld == NULL || repld[0].id == 0) {
-               DEBUG(0,("DsReplicaSync: Unable to find dreplsrv task\n"));
-               return WERR_DS_DRA_INTERNAL_ERROR;
-       }
-
-       ireq = IRPC_CALL_SEND(dce_call->msg_ctx, repld[0],
-                             drsuapi, DRSUAPI_DSREPLICASYNC,
-                             r, mem_ctx);
-       if (ireq == NULL) {
-               DEBUG(0,("DsReplicaSync: Failed to forward request to dreplsrv task\n"));
-               return WERR_DS_DRA_INTERNAL_ERROR;
-       }
-
-       /* we are not interested in a reply */
-       talloc_free(ireq);
-
-       return WERR_OK;
-}
-
-int drsuapi_search_with_extended_dn(struct ldb_context *ldb,
-                               TALLOC_CTX *mem_ctx,
-                               struct ldb_result **_res,
-                               struct ldb_dn *basedn,
-                               enum ldb_scope scope,
-                               const char * const *attrs,
-                               const char *format, ...)
-{
-       va_list ap;
-       int ret;
-       struct ldb_request *req;
-       char *filter;
-       TALLOC_CTX *tmp_ctx;
-       struct ldb_result *res;
-
-       tmp_ctx = talloc_new(mem_ctx);
-
-       res = talloc_zero(tmp_ctx, struct ldb_result);
-       if (!res) {
-               return LDB_ERR_OPERATIONS_ERROR;
-       }
-
-       va_start(ap, format);
-       filter = talloc_vasprintf(tmp_ctx, format, ap);
-       va_end(ap);
-
-       if (filter == NULL) {
-               talloc_free(tmp_ctx);
-               return LDB_ERR_OPERATIONS_ERROR;
-       }
-
-       ret = ldb_build_search_req(&req, ldb, tmp_ctx,
-                                  basedn,
-                                  scope,
-                                  filter,
-                                  attrs,
-                                  NULL,
-                                  res,
-                                  ldb_search_default_callback,
-                                  NULL);
-       if (ret != LDB_SUCCESS) {
-               talloc_free(tmp_ctx);
-               return ret;
-       }
-
-       ret = ldb_request_add_control(req, LDB_CONTROL_EXTENDED_DN_OID, true, NULL);
-       if (ret != LDB_SUCCESS) {
-               return ret;
-       }
-
-       ret = ldb_request(ldb, req);
-       if (ret == LDB_SUCCESS) {
-               ret = ldb_wait(req->handle, LDB_WAIT_ALL);
-       }
-
-       talloc_free(req);
-       *_res = res;
-       return ret;
-}
-
-
-/* 
-  drsuapi_DsGetNCChanges
-*/
-static WERROR dcesrv_drsuapi_DsGetNCChanges(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct drsuapi_DsGetNCChanges *r)
-{
-       struct ldb_result *site_res;
-       struct drsuapi_DsReplicaObjectIdentifier *ncRoot;
-       struct drsuapi_bind_state *b_state;
-       struct ldb_dn *ncRoot_dn;
-       int ret;
-       int i;
-       int j;
-       int uSN;
-       struct dsdb_schema *schema;
-       struct drsuapi_DsReplicaOIDMapping_Ctr *ctr;
-       time_t t = time(NULL);
-       NTTIME now;
-       struct drsuapi_DsReplicaObjectListItemEx *currentObject;
-       struct dom_sid *zero_sid;
-       struct ldb_dn *obj_dn;
-       enum ndr_err_code ndr_err;
-       const struct ldb_val *md_value;
-       struct replPropertyMetaDataBlob md;
-       ZERO_STRUCT(md);
-       md.version = 1;
-       b_state = talloc_zero(mem_ctx, struct drsuapi_bind_state);
-       W_ERROR_HAVE_NO_MEMORY(b_state);
-       zero_sid = talloc_zero(mem_ctx, struct dom_sid);
-       /*
-        * connect to the samdb
-        */
-       b_state->sam_ctx = samdb_connect(b_state, dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, dce_call->conn->auth_state.session_info);
-       if (!b_state->sam_ctx) {
-               return WERR_FOOBAR;
-       }
-
-       /* Check request revision. */
-       if (r->in.level != 8) {
-               return WERR_REVISION_MISMATCH;
-       }
-
-        /* Perform access checks. */
-       if (r->in.req->req8.naming_context == NULL) {
-               return WERR_DS_DRA_INVALID_PARAMETER;
-       }
-
-       ncRoot = r->in.req->req8.naming_context;
-       if (ncRoot == NULL) {
-               return WERR_DS_DRA_BAD_NC;
-       }
-
-       DEBUG(4,("DsGetNSChanges with uSHChanged >= %llu\n", 
-                (unsigned long long)r->in.req->req8.highwatermark.highest_usn));
-
-       /* Construct response. */
-       ncRoot_dn = ldb_dn_new(mem_ctx, b_state->sam_ctx, ncRoot->dn);
-       ret = drsuapi_search_with_extended_dn(b_state->sam_ctx, mem_ctx, &site_res,
-                        ncRoot_dn, LDB_SCOPE_SUBTREE, NULL,
-                        "(&(uSNChanged>=%lld)(objectClass=*))", r->in.req->req8.highwatermark.highest_usn);
-       if (ret != LDB_SUCCESS) {
-               return WERR_DS_DRA_INTERNAL_ERROR;
-       }
-
-       *r->out.level_out = 6;
-       r->out.ctr->ctr6.naming_context = talloc(mem_ctx, struct drsuapi_DsReplicaObjectIdentifier);
-       *r->out.ctr->ctr6.naming_context = *ncRoot;
-       /* TODO: linked attributes*/
-       r->out.ctr->ctr6.linked_attributes_count = 0;
-       r->out.ctr->ctr6.linked_attributes = NULL;
-
-       r->out.ctr->ctr6.object_count = 0;
-       r->out.ctr->ctr6.more_data = false;
-       r->out.ctr->ctr6.uptodateness_vector = NULL;
-
-       /* Prefix mapping */
-       schema = dsdb_get_schema(b_state->sam_ctx);
-       if (!schema) {
-               DEBUG(0,("No schema in b_state->sam_ctx"));
-       }
-
-       dsdb_get_oid_mappings_drsuapi(schema, true, mem_ctx, &ctr);
-       r->out.ctr->ctr6.mapping_ctr = *ctr;
-
-       r->out.ctr->ctr6.source_dsa_guid = *(samdb_ntds_objectGUID(b_state->sam_ctx));
-       r->out.ctr->ctr6.source_dsa_invocation_id = *(samdb_ntds_invocation_id(b_state->sam_ctx));
-
-       r->out.ctr->ctr6.old_highwatermark = r->in.req->req8.highwatermark;
-       r->out.ctr->ctr6.new_highwatermark = r->in.req->req8.highwatermark;
-
-       r->out.ctr->ctr6.first_object = talloc(mem_ctx, struct drsuapi_DsReplicaObjectListItemEx);
-       currentObject = r->out.ctr->ctr6.first_object;
-
-       for(i=0; i<site_res->count; i++) {
-               uSN = ldb_msg_find_attr_as_int(site_res->msgs[i],"uSNChanged", -1);
-               r->out.ctr->ctr6.object_count++;
-               if (uSN > r->out.ctr->ctr6.new_highwatermark.highest_usn) {
-                       r->out.ctr->ctr6.new_highwatermark.highest_usn = uSN;
-               }
-
-               if (ldb_dn_compare(ncRoot_dn, site_res->msgs[i]->dn) == 0) {
-                       currentObject->is_nc_prefix = true;
-                       currentObject->parent_object_guid = NULL;
-               } else {
-                       currentObject->is_nc_prefix = false;
-                       currentObject->parent_object_guid = talloc(mem_ctx, struct GUID);
-                       *currentObject->parent_object_guid = samdb_result_guid(site_res->msgs[i], "parentGUID");
-               }
-               currentObject->next_object = NULL;
-
-               currentObject->meta_data_ctr = talloc(mem_ctx, struct drsuapi_DsReplicaMetaDataCtr);
-               md_value = ldb_msg_find_ldb_val(site_res->msgs[i], "replPropertyMetaData");
-               if (md_value) {
-                       ndr_err = ndr_pull_struct_blob(md_value, mem_ctx,
-                                                      lp_iconv_convenience(ldb_get_opaque(b_state->sam_ctx, "loadparm")), &md,
-                                                      (ndr_pull_flags_fn_t)ndr_pull_replPropertyMetaDataBlob);
-                       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-                               return WERR_DS_DRA_INTERNAL_ERROR;
-                       }
-
-                       if (md.version != 1) {
-                               return WERR_DS_DRA_INTERNAL_ERROR;
-                       }
-
-                       currentObject->meta_data_ctr->count = md.ctr.ctr1.count;
-                       currentObject->meta_data_ctr->meta_data = talloc_array(mem_ctx, struct drsuapi_DsReplicaMetaData, md.ctr.ctr1.count);
-                       for (j=0; j<md.ctr.ctr1.count; j++) {
-                               currentObject->meta_data_ctr->meta_data[j].originating_change_time = md.ctr.ctr1.array[j].originating_change_time;
-                               currentObject->meta_data_ctr->meta_data[j].version = md.ctr.ctr1.array[j].version;
-                               currentObject->meta_data_ctr->meta_data[j].originating_invocation_id = md.ctr.ctr1.array[j].originating_invocation_id;
-                               currentObject->meta_data_ctr->meta_data[j].originating_usn = md.ctr.ctr1.array[j].originating_usn;
-                       }
-               } else {
-                       currentObject->meta_data_ctr->meta_data = talloc(mem_ctx, struct drsuapi_DsReplicaMetaData);
-                       currentObject->meta_data_ctr->count = 0;
-               }
-               currentObject->object.identifier = talloc(mem_ctx, struct drsuapi_DsReplicaObjectIdentifier);
-               obj_dn = ldb_msg_find_attr_as_dn(b_state->sam_ctx, mem_ctx, site_res->msgs[i], "distinguishedName");
-               currentObject->object.identifier->dn = ldb_dn_get_linearized(obj_dn);
-               currentObject->object.identifier->guid = GUID_zero();
-               currentObject->object.identifier->sid = *zero_sid;
-
-               currentObject->object.attribute_ctr.num_attributes = site_res->msgs[i]->num_elements;
-               /* Exclude non-replicate attributes from the responce.*/
-               for (j=0; j<site_res->msgs[i]->num_elements; j++) {
-                       const struct dsdb_attribute *sa;
-                       sa = dsdb_attribute_by_lDAPDisplayName(schema, site_res->msgs[i]->elements[j].name);
-                       if (sa && sa->systemFlags & 0x00000001) {
-                               ldb_msg_remove_attr(site_res->msgs[i], site_res->msgs[i]->elements[j].name);
-                               currentObject->object.attribute_ctr.num_attributes--;
-                       }
-               }
-               currentObject->object.attribute_ctr.attributes = talloc_array(mem_ctx, struct drsuapi_DsReplicaAttribute,
-                                                                             currentObject->object.attribute_ctr.num_attributes);
-               for (j=0; j<currentObject->object.attribute_ctr.num_attributes; j++) {
-                       dsdb_attribute_ldb_to_drsuapi(b_state->sam_ctx, schema,&site_res->msgs[i]->elements[j], mem_ctx,
-                                                     &currentObject->object.attribute_ctr.attributes[j]);
-               }
+       WERROR status;
 
-               if (i == (site_res->count-1)) {
-                       break;
-               }
-               currentObject->next_object = talloc(mem_ctx, struct drsuapi_DsReplicaObjectListItemEx);
-               currentObject = currentObject->next_object;
+       status = drs_security_level_check(dce_call, "DsReplicaSync", SECURITY_DOMAIN_CONTROLLER);
+       if (!W_ERROR_IS_OK(status)) {
+               return status;
        }
 
-       r->out.ctr->ctr6.uptodateness_vector = talloc(mem_ctx, struct drsuapi_DsReplicaCursor2CtrEx);
-
-       r->out.ctr->ctr6.uptodateness_vector->version = 2;
-       r->out.ctr->ctr6.uptodateness_vector->count = 1;
-       r->out.ctr->ctr6.uptodateness_vector->reserved1 = 0;
-       r->out.ctr->ctr6.uptodateness_vector->reserved2 = 0;
-       r->out.ctr->ctr6.uptodateness_vector->cursors = talloc(mem_ctx, struct drsuapi_DsReplicaCursor2);
-
-       r->out.ctr->ctr6.uptodateness_vector->cursors[0].source_dsa_invocation_id = *(samdb_ntds_invocation_id(b_state->sam_ctx));
-       r->out.ctr->ctr6.uptodateness_vector->cursors[0].highest_usn = r->out.ctr->ctr6.new_highwatermark.highest_usn;
-       unix_to_nt_time(&now, t);
-       r->out.ctr->ctr6.uptodateness_vector->cursors[0].last_sync_success = now;
+       dcesrv_irpc_forward_rpc_call(dce_call, mem_ctx, r, NDR_DRSUAPI_DSREPLICASYNC,
+                                    &ndr_table_drsuapi,
+                                    "dreplsrv", "DsReplicaSync");
 
        return WERR_OK;
 }
 
 
 /* 
-  DRSUAPI_REPLICA_ADD 
+  drsuapi_DsReplicaAdd 
 */
-static WERROR dcesrv_DRSUAPI_REPLICA_ADD(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct DRSUAPI_REPLICA_ADD *r)
+static WERROR dcesrv_drsuapi_DsReplicaAdd(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                                         struct drsuapi_DsReplicaAdd *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       DRSUAPI_UNSUPPORTED(drsuapi_DsReplicaAdd);
 }
 
 
 /* 
-  DRSUAPI_REPLICA_DEL 
+  drsuapi_DsReplicaDel 
 */
-static WERROR dcesrv_DRSUAPI_REPLICA_DEL(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct DRSUAPI_REPLICA_DEL *r)
+static WERROR dcesrv_drsuapi_DsReplicaDel(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                                         struct drsuapi_DsReplicaDel *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       DRSUAPI_UNSUPPORTED(drsuapi_DsReplicaDel);
 }
 
 
 /* 
-  DRSUAPI_REPLICA_MODIFY 
+  drsuapi_DsReplicaModify 
 */
-static WERROR dcesrv_DRSUAPI_REPLICA_MODIFY(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct DRSUAPI_REPLICA_MODIFY *r)
+static WERROR dcesrv_drsuapi_DsReplicaMod(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                                         struct drsuapi_DsReplicaMod *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       DRSUAPI_UNSUPPORTED(drsuapi_DsReplicaMod);
 }
 
 
@@ -538,7 +296,7 @@ static WERROR dcesrv_DRSUAPI_REPLICA_MODIFY(struct dcesrv_call_state *dce_call,
 static WERROR dcesrv_DRSUAPI_VERIFY_NAMES(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct DRSUAPI_VERIFY_NAMES *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       DRSUAPI_UNSUPPORTED(DRSUAPI_VERIFY_NAMES);
 }
 
 
@@ -548,7 +306,7 @@ static WERROR dcesrv_DRSUAPI_VERIFY_NAMES(struct dcesrv_call_state *dce_call, TA
 static WERROR dcesrv_drsuapi_DsGetMemberships(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct drsuapi_DsGetMemberships *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       DRSUAPI_UNSUPPORTED(drsuapi_DsGetMemberships);
 }
 
 
@@ -558,7 +316,7 @@ static WERROR dcesrv_drsuapi_DsGetMemberships(struct dcesrv_call_state *dce_call
 static WERROR dcesrv_DRSUAPI_INTER_DOMAIN_MOVE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct DRSUAPI_INTER_DOMAIN_MOVE *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       DRSUAPI_UNSUPPORTED(DRSUAPI_INTER_DOMAIN_MOVE);
 }
 
 
@@ -568,7 +326,7 @@ static WERROR dcesrv_DRSUAPI_INTER_DOMAIN_MOVE(struct dcesrv_call_state *dce_cal
 static WERROR dcesrv_drsuapi_DsGetNT4ChangeLog(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct drsuapi_DsGetNT4ChangeLog *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       DRSUAPI_UNSUPPORTED(drsuapi_DsGetNT4ChangeLog);
 }
 
 
@@ -594,8 +352,7 @@ static WERROR dcesrv_drsuapi_DsCrackNames(struct dcesrv_call_state *dce_call, TA
                case 1: {
                        struct drsuapi_DsNameCtr1 *ctr1;
                        struct drsuapi_DsNameInfo1 *names;
-                       int count;
-                       int i;
+                       uint32_t i, count;
 
                        ctr1 = talloc(mem_ctx, struct drsuapi_DsNameCtr1);
                        W_ERROR_HAVE_NO_MEMORY(ctr1);
@@ -627,81 +384,6 @@ static WERROR dcesrv_drsuapi_DsCrackNames(struct dcesrv_call_state *dce_call, TA
        return WERR_UNKNOWN_LEVEL;
 }
 
-/* 
-  drsuapi_DsWriteAccountSpn 
-*/
-static WERROR dcesrv_drsuapi_DsWriteAccountSpn(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct drsuapi_DsWriteAccountSpn *r)
-{
-       struct drsuapi_bind_state *b_state;
-       struct dcesrv_handle *h;
-
-       *r->out.level_out = r->in.level;
-
-       DCESRV_PULL_HANDLE_WERR(h, r->in.bind_handle, DRSUAPI_BIND_HANDLE);
-       b_state = h->data;
-
-       r->out.res = talloc(mem_ctx, union drsuapi_DsWriteAccountSpnResult);
-       W_ERROR_HAVE_NO_MEMORY(r->out.res);
-
-       switch (r->in.level) {
-               case 1: {
-                       struct drsuapi_DsWriteAccountSpnRequest1 *req;
-                       struct ldb_message *msg;
-                       int count, i, ret;
-                       req = &r->in.req->req1;
-                       count = req->count;
-
-                       msg = ldb_msg_new(mem_ctx);
-                       if (msg == NULL) {
-                               return WERR_NOMEM;
-                       }
-
-                       msg->dn = ldb_dn_new(msg, b_state->sam_ctx, req->object_dn);
-                       if ( ! ldb_dn_validate(msg->dn)) {
-                               r->out.res->res1.status = WERR_OK;
-                               return WERR_OK;
-                       }
-                       
-                       /* construct mods */
-                       for (i = 0; i < count; i++) {
-                               samdb_msg_add_string(b_state->sam_ctx, 
-                                                    msg, msg, "servicePrincipalName",
-                                                    req->spn_names[i].str);
-                       }
-                       for (i=0;i<msg->num_elements;i++) {
-                               switch (req->operation) {
-                               case DRSUAPI_DS_SPN_OPERATION_ADD:
-                                       msg->elements[i].flags = LDB_FLAG_MOD_ADD;
-                                       break;
-                               case DRSUAPI_DS_SPN_OPERATION_REPLACE:
-                                       msg->elements[i].flags = LDB_FLAG_MOD_REPLACE;
-                                       break;
-                               case DRSUAPI_DS_SPN_OPERATION_DELETE:
-                                       msg->elements[i].flags = LDB_FLAG_MOD_DELETE;
-                                       break;
-                               }
-                       }
-   
-                       /* Apply to database */
-
-                       ret = ldb_modify(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 {
-                               r->out.res->res1.status = WERR_OK;
-                       }
-
-                       return WERR_OK;
-               }
-       }
-       
-       return WERR_UNKNOWN_LEVEL;
-}
-
 
 /* 
   drsuapi_DsRemoveDSServer
@@ -714,9 +396,14 @@ static WERROR dcesrv_drsuapi_DsRemoveDSServer(struct dcesrv_call_state *dce_call
        struct ldb_dn *ntds_dn;
        int ret;
        bool ok;
+       WERROR status;
 
-       ZERO_STRUCT(r->out.res);
-       r->out.level_out = 1;
+       *r->out.level_out = 1;
+
+       status = drs_security_level_check(dce_call, "DsRemoveDSServer", SECURITY_DOMAIN_CONTROLLER);
+       if (!W_ERROR_IS_OK(status)) {
+               return status;
+       }
 
        DCESRV_PULL_HANDLE_WERR(h, r->in.bind_handle, DRSUAPI_BIND_HANDLE);
        b_state = h->data;
@@ -760,15 +447,15 @@ static WERROR dcesrv_drsuapi_DsRemoveDSServer(struct dcesrv_call_state *dce_call
 static WERROR dcesrv_DRSUAPI_REMOVE_DS_DOMAIN(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct DRSUAPI_REMOVE_DS_DOMAIN *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       DRSUAPI_UNSUPPORTED(DRSUAPI_REMOVE_DS_DOMAIN);
 }
 
 /* Obtain the site name from a server DN */
-static const char *result_site_name(struct ldb_dn *site_dn)
+static const char *result_site_name(struct ldb_dn *server_dn)
 {
        /* Format is cn=<NETBIOS name>,cn=Servers,cn=<site>,cn=sites.... */
-       const struct ldb_val *val = ldb_dn_get_component_val(site_dn, 2);
-       const char *name = ldb_dn_get_component_name(site_dn, 2);
+       const struct ldb_val *val = ldb_dn_get_component_val(server_dn, 2);
+       const char *name = ldb_dn_get_component_name(server_dn, 2);
 
        if (!name || (ldb_attr_cmp(name, "cn") != 0)) {
                /* Ensure this matches the format.  This gives us a
@@ -808,7 +495,8 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
        struct drsuapi_DsGetDCInfoCtr1 *ctr1;
        struct drsuapi_DsGetDCInfoCtr2 *ctr2;
 
-       int ret, i;
+       int ret;
+       unsigned int i;
 
        *r->out.level_out = r->in.req->req1.level;
        r->out.ctr = talloc(mem_ctx, union drsuapi_DsGetDCInfoCtr);
@@ -1028,59 +716,24 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo(struct dcesrv_call_state
        return WERR_UNKNOWN_LEVEL;
 }
 
+
+
 /* 
-  drsuapi_DsAddEntry
+  drsuapi_DsExecuteKCC 
 */
-static WERROR dcesrv_drsuapi_DsAddEntry(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct drsuapi_DsAddEntry *r)
+static WERROR dcesrv_drsuapi_DsExecuteKCC(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
+                                 struct drsuapi_DsExecuteKCC *r)
 {
        WERROR status;
-       struct drsuapi_bind_state *b_state;
-       struct dcesrv_handle *h;
-       uint32_t num = 0;
-       struct drsuapi_DsReplicaObjectIdentifier2 *ids = NULL;
-
-       /* TODO: check which out level the client supports */
-
-       ZERO_STRUCTP(r->out.ctr);
-       r->out.level_out = 3;
-       r->out.ctr->ctr3.level = 1;
-       r->out.ctr->ctr3.error = talloc_zero(mem_ctx, union drsuapi_DsAddEntryError);
-
-       DCESRV_PULL_HANDLE_WERR(h, r->in.bind_handle, DRSUAPI_BIND_HANDLE);
-       b_state = h->data;
-
-       switch (r->in.level) {
-       case 2:
-               status = dsdb_origin_objects_commit(b_state->sam_ctx,
-                                                   mem_ctx,
-                                                   &r->in.req->req2.first_object,
-                                                   &num,
-                                                   &ids);
-               if (!W_ERROR_IS_OK(status)) {
-                       r->out.ctr->ctr3.error->info1.status = status;
-                       W_ERROR_NOT_OK_RETURN(status);
-               }
-
-               r->out.ctr->ctr3.count = num;
-               r->out.ctr->ctr3.objects = ids;
+       status = drs_security_level_check(dce_call, "DsExecuteKCC", SECURITY_DOMAIN_CONTROLLER);
 
-               return WERR_OK;
-       default:
-               break;
+       if (!W_ERROR_IS_OK(status)) {
+               return status;
        }
 
-       return WERR_FOOBAR;
-}
-
-
-/* 
-  DRSUAPI_EXECUTE_KCC 
-*/
-static WERROR dcesrv_DRSUAPI_EXECUTE_KCC(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct DRSUAPI_EXECUTE_KCC *r)
-{
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       dcesrv_irpc_forward_rpc_call(dce_call, mem_ctx, r, NDR_DRSUAPI_DSEXECUTEKCC,
+                                                               &ndr_table_drsuapi, "kccsrv", "DsExecuteKCC");
+       return WERR_OK;
 }
 
 
@@ -1090,7 +743,22 @@ static WERROR dcesrv_DRSUAPI_EXECUTE_KCC(struct dcesrv_call_state *dce_call, TAL
 static WERROR dcesrv_drsuapi_DsReplicaGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct drsuapi_DsReplicaGetInfo *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       enum security_user_level level;
+
+       if (!lp_parm_bool(dce_call->conn->dce_ctx->lp_ctx, NULL,
+                        "drs", "disable_sec_check", false)) {
+               level = security_session_user_level(dce_call->conn->auth_state.session_info, NULL);
+               if (level < SECURITY_ADMINISTRATOR) {
+                       DEBUG(1,(__location__ ": Administrator access required for DsReplicaGetInfo\n"));
+                       security_token_debug(2, dce_call->conn->auth_state.session_info->security_token);
+                       return WERR_DS_DRA_ACCESS_DENIED;
+               }
+       }
+
+       dcesrv_irpc_forward_rpc_call(dce_call, mem_ctx, r, NDR_DRSUAPI_DSREPLICAGETINFO,
+                                    &ndr_table_drsuapi, "kccsrv", "DsReplicaGetInfo");
+
+       return WERR_OK;
 }
 
 
@@ -1100,7 +768,7 @@ static WERROR dcesrv_drsuapi_DsReplicaGetInfo(struct dcesrv_call_state *dce_call
 static WERROR dcesrv_DRSUAPI_ADD_SID_HISTORY(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct DRSUAPI_ADD_SID_HISTORY *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       DRSUAPI_UNSUPPORTED(DRSUAPI_ADD_SID_HISTORY);
 }
 
 /* 
@@ -1109,7 +777,7 @@ static WERROR dcesrv_DRSUAPI_ADD_SID_HISTORY(struct dcesrv_call_state *dce_call,
 static WERROR dcesrv_drsuapi_DsGetMemberships2(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct drsuapi_DsGetMemberships2 *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       DRSUAPI_UNSUPPORTED(drsuapi_DsGetMemberships2);
 }
 
 /* 
@@ -1118,7 +786,7 @@ static WERROR dcesrv_drsuapi_DsGetMemberships2(struct dcesrv_call_state *dce_cal
 static WERROR dcesrv_DRSUAPI_REPLICA_VERIFY_OBJECTS(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct DRSUAPI_REPLICA_VERIFY_OBJECTS *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       DRSUAPI_UNSUPPORTED(DRSUAPI_REPLICA_VERIFY_OBJECTS);
 }
 
 
@@ -1128,7 +796,7 @@ static WERROR dcesrv_DRSUAPI_REPLICA_VERIFY_OBJECTS(struct dcesrv_call_state *dc
 static WERROR dcesrv_DRSUAPI_GET_OBJECT_EXISTENCE(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct DRSUAPI_GET_OBJECT_EXISTENCE *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       DRSUAPI_UNSUPPORTED(DRSUAPI_GET_OBJECT_EXISTENCE);
 }
 
 
@@ -1138,7 +806,7 @@ static WERROR dcesrv_DRSUAPI_GET_OBJECT_EXISTENCE(struct dcesrv_call_state *dce_
 static WERROR dcesrv_drsuapi_QuerySitesByCost(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                       struct drsuapi_QuerySitesByCost *r)
 {
-       DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
+       DRSUAPI_UNSUPPORTED(drsuapi_QuerySitesByCost);
 }