r23239: Fill in drsuapi_QuerySitesByCost.

Guenther
(This used to be commit cf953d04813d193da5e9714ceebb7826dc7e4d0b)

diff --git a/source4/librpc/idl/drsuapi.idl b/source4/librpc/idl/drsuapi.idl
index f23914f8deba1f16ef9cf2cfb532b4bee015cf78..e8fbc85f29788d2054e342060f95dbfdf352508a 100644 (file)
--- a/source4/librpc/idl/drsuapi.idl
+++ b/source4/librpc/idl/drsuapi.idl
@@ -1457,5 +1457,37 @@ interface drsuapi
 
        /*****************/
         /* Function 0x18 */
-       WERROR DRSUAPI_QUERY_SITES_BY_COST();
+       typedef struct {
+               WERROR error_code;
+               uint32 site_cost;
+       } drsuapi_DsSiteCostInfo;
+
+       typedef struct {
+               [range(0,10000)] uint32 num_info;
+               [size_is(num_info)] drsuapi_DsSiteCostInfo *info;
+               uint32 unknown;
+       } drsuapi_QuerySitesByCostCtr1;
+
+       typedef [switch_type(int32)] union {
+               [case(1)] drsuapi_QuerySitesByCostCtr1 ctr1;
+       } drsuapi_QuerySitesByCostCtr;
+
+       typedef struct {
+               [charset(UTF16),string] uint16 *site_from;
+               [range(1,10000)] uint32 num_req;
+               [size_is(num_req)] [charset(UTF16),string] uint16 **site_to;
+               uint32 flags;
+       } drsuapi_QuerySitesByCostRequest1;
+
+       typedef [switch_type(int32)] union {
+               [case(1)] drsuapi_QuerySitesByCostRequest1 req1;
+       } drsuapi_QuerySitesByCostRequest;
+
+       WERROR drsuapi_QuerySitesByCost(
+               [in] policy_handle *bind_handle,
+               [in] int32 level,
+               [in] [switch_is(level)] drsuapi_QuerySitesByCostRequest req,
+               [out] int32 level_out,
+               [out] [switch_is(level_out)] drsuapi_QuerySitesByCostCtr ctr
+       );
 }

diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
index f1f0b4a54e1dfed4cdd93e2bc15025bb79bcd509..9bb35c06c983b1267d510af3c83ca01dc3b9e142 100644 (file)
--- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
+++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
@@ -798,10 +798,10 @@ static WERROR dcesrv_DRSUAPI_GET_OBJECT_EXISTENCE(struct dcesrv_call_state *dce_
 
 
 /* 
-  DRSUAPI_QUERY_SITES_BY_COST 
+  drsuapi_QuerySitesByCost 
 */
-static WERROR dcesrv_DRSUAPI_QUERY_SITES_BY_COST(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
-                      struct DRSUAPI_QUERY_SITES_BY_COST *r)
+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);
 }

diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c
index 338d2ad759dad1460116e811e27d2e08b243f52a..37c566020bda2fad4c52cd2e8a3dabe9b5f13c2c 100644 (file)
--- a/source4/torture/rpc/drsuapi.c
+++ b/source4/torture/rpc/drsuapi.c
@@ -646,6 +646,61 @@ static BOOL test_DsGetNCChanges(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        return ret;
 }
 
+BOOL test_QuerySitesByCost(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+                          struct DsPrivate *priv)
+{
+       NTSTATUS status;
+       struct drsuapi_QuerySitesByCost r;
+       BOOL ret = True;
+
+       const char *my_site = "Default-First-Site-Name";
+       const char *remote_site1 = "smbtorture-nonexisting-site1";
+       const char *remote_site2 = "smbtorture-nonexisting-site2";
+
+       r.in.bind_handle = &priv->bind_handle;
+       r.in.level = 1;
+       r.in.req.req1.site_from = talloc_strdup(mem_ctx, my_site);
+       r.in.req.req1.num_req = 2;
+       r.in.req.req1.site_to = talloc_zero_array(mem_ctx, const char *, r.in.req.req1.num_req);
+       r.in.req.req1.site_to[0] = talloc_strdup(mem_ctx, remote_site1);
+       r.in.req.req1.site_to[1] = talloc_strdup(mem_ctx, remote_site2);
+       r.in.req.req1.flags = 0;
+
+       status = dcerpc_drsuapi_QuerySitesByCost(p, mem_ctx, &r);
+       if (!NT_STATUS_IS_OK(status)) {
+               const char *errstr = nt_errstr(status);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
+                       errstr = dcerpc_errstr(mem_ctx, p->last_fault_code);
+               }
+               printf("drsuapi_QuerySitesByCost - %s\n", errstr);
+               ret = False;
+       } else if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("QuerySitesByCost failed - %s\n", win_errstr(r.out.result));
+               ret = False;
+       }
+
+       if (W_ERROR_IS_OK(r.out.result)) {
+
+               if (!W_ERROR_EQUAL(r.out.ctr.ctr1.info[0].error_code, WERR_DS_OBJ_NOT_FOUND) ||
+                   !W_ERROR_EQUAL(r.out.ctr.ctr1.info[1].error_code, WERR_DS_OBJ_NOT_FOUND)) { 
+                       printf("expected error_code WERR_DS_OBJ_NOT_FOUND, got %s\n", 
+                               win_errstr(r.out.ctr.ctr1.info[0].error_code));
+                       ret = False;
+               }
+
+               if ((r.out.ctr.ctr1.info[0].site_cost != (uint32_t) -1) ||
+                   (r.out.ctr.ctr1.info[1].site_cost != (uint32_t) -1)) {
+                       printf("expected site_cost %d, got %d\n", 
+                               (uint32_t) -1, r.out.ctr.ctr1.info[0].site_cost);
+                       ret = False;
+               }
+       }
+
+       return ret;
+
+
+}
+
 BOOL test_DsUnbind(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
                   struct DsPrivate *priv)
 {
@@ -705,7 +760,9 @@ BOOL torture_rpc_drsuapi(struct torture_context *torture)
        }
 
        ret &= test_DsBind(p, mem_ctx, &priv);
-
+#if 0
+       ret &= test_QuerySitesByCost(p, mem_ctx, &priv);
+#endif
        ret &= test_DsGetDomainControllerInfo(p, mem_ctx, &priv);
 
        ret &= test_DsCrackNames(p, mem_ctx, &priv);