diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/librpc/idl/mgmt.idl | 35 | ||||
| -rw-r--r-- | source4/torture/rpc/mgmt.c | 50 |
2 files changed, 44 insertions, 41 deletions
diff --git a/source4/librpc/idl/mgmt.idl b/source4/librpc/idl/mgmt.idl index 2bc752da3d..7e691d3c31 100644 --- a/source4/librpc/idl/mgmt.idl +++ b/source4/librpc/idl/mgmt.idl @@ -23,9 +23,8 @@ interface mgmt /***********************/ /* Function 0x00 */ - void mgmt_inq_if_ids ( - [out] rpc_if_id_vector_t *if_id_vector, - [out] error_status_t status + WERROR mgmt_inq_if_ids ( + [out] rpc_if_id_vector_t *if_id_vector ); @@ -33,22 +32,23 @@ interface mgmt /***********************/ /* Function 0x01 */ - const int mgmt_stats_calls_in = 0; - const int mgmt_stats_calls_out = 1; - const int mgmt_stats_pkts_in = 2; - const int mgmt_stats_pkts_out = 3; - const int mgmt_stats_array_max_size = 4; + + /* these are the array indexes in the statistics array */ + const int MGMT_STATS_CALLS_IN = 0; + const int MGMT_STATS_CALLS_OUT = 1; + const int MGMT_STATS_PKTS_IN = 2; + const int MGMT_STATS_PKTS_OUT = 3; + const int MGMT_STATS_ARRAY_MAX_SIZE = 4; typedef struct { uint32 count; [size_is(count)] uint32 statistics[*]; } mgmt_statistics; - void mgmt_inq_stats ( + WERROR mgmt_inq_stats ( [in] uint32 max_count, [in] uint32 unknown, - [out] mgmt_statistics statistics, - [out] error_status_t status + [out] mgmt_statistics statistics ); @@ -61,17 +61,14 @@ interface mgmt /***********************/ /* Function 0x03 */ - void mgmt_stop_server_listening ( - [out] error_status_t status - ); + WERROR mgmt_stop_server_listening (); /***********************/ /* Function 0x04 */ - void mgmt_inq_princ_name ( - [in] unsigned32 authn_proto, - [in] unsigned32 princ_name_size, - [out] ascstr2 princ_name, - [out] error_status_t status + WERROR mgmt_inq_princ_name ( + [in] uint32 authn_proto, + [in] uint32 princ_name_size, + [out] ascstr princ_name ); } diff --git a/source4/torture/rpc/mgmt.c b/source4/torture/rpc/mgmt.c index 693703eb82..e3a8146e64 100644 --- a/source4/torture/rpc/mgmt.c +++ b/source4/torture/rpc/mgmt.c @@ -35,8 +35,8 @@ static BOOL test_inq_if_ids(struct dcerpc_pipe *p, return False; } - if (r.out.status != 0) { - printf("inq_if_ids gave error code 0x%x\n", r.out.status); + if (!W_ERROR_IS_OK(r.out.result)) { + printf("inq_if_ids gave error code %s\n", win_errstr(r.out.result)); return False; } @@ -62,7 +62,7 @@ static BOOL test_inq_stats(struct dcerpc_pipe *p, NTSTATUS status; struct mgmt_inq_stats r; - r.in.max_count = mgmt_stats_array_max_size; + r.in.max_count = MGMT_STATS_ARRAY_MAX_SIZE; r.in.unknown = 0; status = dcerpc_mgmt_inq_stats(p, mem_ctx, &r); @@ -71,16 +71,16 @@ static BOOL test_inq_stats(struct dcerpc_pipe *p, return False; } - if (r.out.statistics.count != mgmt_stats_array_max_size) { + if (r.out.statistics.count != MGMT_STATS_ARRAY_MAX_SIZE) { printf("Unexpected array size %d\n", r.out.statistics.count); return False; } printf("\tcalls_in %6d calls_out %6d\n\tpkts_in %6d pkts_out %6d\n", - r.out.statistics.statistics[mgmt_stats_calls_in], - r.out.statistics.statistics[mgmt_stats_calls_out], - r.out.statistics.statistics[mgmt_stats_pkts_in], - r.out.statistics.statistics[mgmt_stats_pkts_out]); + r.out.statistics.statistics[MGMT_STATS_CALLS_IN], + r.out.statistics.statistics[MGMT_STATS_CALLS_OUT], + r.out.statistics.statistics[MGMT_STATS_PKTS_IN], + r.out.statistics.statistics[MGMT_STATS_PKTS_OUT]); return True; } @@ -88,25 +88,31 @@ static BOOL test_inq_stats(struct dcerpc_pipe *p, static BOOL test_inq_princ_name(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx) { -#if 0 NTSTATUS status; struct mgmt_inq_princ_name r; + int i; + BOOL ret = False; - r.in.authn_proto = 1; - r.in.princ_name_size = 1000; + for (i=0;i<30;i++) { + r.in.authn_proto = i; /* DCERPC_AUTH_TYPE_* */ + r.in.princ_name_size = 100; - status = dcerpc_mgmt_inq_princ_name(p, mem_ctx, &r); - if (!NT_STATUS_IS_OK(status)) { - printf("inq_princ_name failed - %s\n", nt_errstr(status)); - return False; + status = dcerpc_mgmt_inq_princ_name(p, mem_ctx, &r); + if (!NT_STATUS_IS_OK(status)) { + continue; + } + if (W_ERROR_IS_OK(r.out.result)) { + ret = True; + printf("\tprinciple name for proto %u is '%s'\n", + i, r.out.princ_name); + } + } + + if (!ret) { + printf("\tno principle names?\n"); } return True; -#else - /* this is broken */ - printf("\tnot doing inq_princ_name\n"); - return True; -#endif } static BOOL test_is_server_listening(struct dcerpc_pipe *p, @@ -142,8 +148,8 @@ static BOOL test_stop_server_listening(struct dcerpc_pipe *p, return False; } - if (r.out.status != 0) { - printf("\tserver refused to stop listening\n"); + if (!W_ERROR_IS_OK(r.out.result)) { + printf("\tserver refused to stop listening - %s\n", win_errstr(r.out.result)); } else { printf("\tserver allowed a stop_server_listening request\n"); return False; |