The branch, v3-2-test has been updated
via 627688c7bac4d3afcc846164c2fefebdbbc10d68 (commit)
via 0bc389272f7ca3cfbd8f5eeeba116f68eadd4c9f (commit)
via 03a3b8b0ed504d392b7503dfe988c22c4943ace6 (commit)
via 3ef4d6b524d26f2c345321d5a8c9f7526e322ccd (commit)
from f12259d9c4c34b99f5b655cab4b210159cb0e188 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 627688c7bac4d3afcc846164c2fefebdbbc10d68
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Mon Mar 10 18:34:50 2008 +0100
Add netconnenum to rpcclient.
Guenther
commit 0bc389272f7ca3cfbd8f5eeeba116f68eadd4c9f
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Mon Mar 10 17:35:34 2008 +0100
Re-run make idl.
Guenther
commit 03a3b8b0ed504d392b7503dfe988c22c4943ace6
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Mon Mar 10 17:35:07 2008 +0100
Fix IDL for srvsvc_NetConnEnum.
Guenther
commit 3ef4d6b524d26f2c345321d5a8c9f7526e322ccd
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Mon Mar 10 17:30:22 2008 +0100
Add netdiskenum to rpcclient.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/librpc/gen_ndr/cli_srvsvc.c | 9 +--
source/librpc/gen_ndr/cli_srvsvc.h | 3 +-
source/librpc/gen_ndr/ndr_srvsvc.c | 119 ++++++++++++++++++------------------
source/librpc/gen_ndr/ndr_srvsvc.h | 1 +
source/librpc/gen_ndr/srv_srvsvc.c | 3 +-
source/librpc/gen_ndr/srvsvc.h | 11 ++-
source/librpc/idl/srvsvc.idl | 8 ++-
source/rpcclient/cmd_srvsvc.c | 109 +++++++++++++++++++++++++++++++++
8 files changed, 187 insertions(+), 76 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/cli_srvsvc.c
b/source/librpc/gen_ndr/cli_srvsvc.c
index 386b25c..0854fb8 100644
--- a/source/librpc/gen_ndr/cli_srvsvc.c
+++ b/source/librpc/gen_ndr/cli_srvsvc.c
@@ -429,8 +429,7 @@ NTSTATUS rpccli_srvsvc_NetConnEnum(struct rpc_pipe_client
*cli,
TALLOC_CTX *mem_ctx,
const char *server_unc,
const char *path,
- uint32_t *level,
- union srvsvc_NetConnCtr *ctr,
+ struct srvsvc_NetConnInfoCtr *info_ctr,
uint32_t max_buffer,
uint32_t *totalentries,
uint32_t *resume_handle,
@@ -442,8 +441,7 @@ NTSTATUS rpccli_srvsvc_NetConnEnum(struct rpc_pipe_client
*cli,
/* In parameters */
r.in.server_unc = server_unc;
r.in.path = path;
- r.in.level = level;
- r.in.ctr = ctr;
+ r.in.info_ctr = info_ctr;
r.in.max_buffer = max_buffer;
r.in.resume_handle = resume_handle;
@@ -471,8 +469,7 @@ NTSTATUS rpccli_srvsvc_NetConnEnum(struct rpc_pipe_client
*cli,
}
/* Return variables */
- *level = *r.out.level;
- *ctr = *r.out.ctr;
+ *info_ctr = *r.out.info_ctr;
*totalentries = *r.out.totalentries;
if (resume_handle && r.out.resume_handle) {
*resume_handle = *r.out.resume_handle;
diff --git a/source/librpc/gen_ndr/cli_srvsvc.h
b/source/librpc/gen_ndr/cli_srvsvc.h
index 9b5da3b..d481858 100644
--- a/source/librpc/gen_ndr/cli_srvsvc.h
+++ b/source/librpc/gen_ndr/cli_srvsvc.h
@@ -64,8 +64,7 @@ NTSTATUS rpccli_srvsvc_NetConnEnum(struct rpc_pipe_client
*cli,
TALLOC_CTX *mem_ctx,
const char *server_unc,
const char *path,
- uint32_t *level,
- union srvsvc_NetConnCtr *ctr,
+ struct srvsvc_NetConnInfoCtr *info_ctr,
uint32_t max_buffer,
uint32_t *totalentries,
uint32_t *resume_handle,
diff --git a/source/librpc/gen_ndr/ndr_srvsvc.c
b/source/librpc/gen_ndr/ndr_srvsvc.c
index 5645e36..fbf84ab 100644
--- a/source/librpc/gen_ndr/ndr_srvsvc.c
+++ b/source/librpc/gen_ndr/ndr_srvsvc.c
@@ -1664,6 +1664,44 @@ _PUBLIC_ void ndr_print_srvsvc_NetConnCtr(struct
ndr_print *ndr, const char *nam
}
}
+static enum ndr_err_code ndr_push_srvsvc_NetConnInfoCtr(struct ndr_push *ndr,
int ndr_flags, const struct srvsvc_NetConnInfoCtr *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_push_align(ndr, 4));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->level));
+ NDR_CHECK(ndr_push_set_switch_value(ndr, &r->ctr, r->level));
+ NDR_CHECK(ndr_push_srvsvc_NetConnCtr(ndr, NDR_SCALARS,
&r->ctr));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ NDR_CHECK(ndr_push_srvsvc_NetConnCtr(ndr, NDR_BUFFERS,
&r->ctr));
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+static enum ndr_err_code ndr_pull_srvsvc_NetConnInfoCtr(struct ndr_pull *ndr,
int ndr_flags, struct srvsvc_NetConnInfoCtr *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_pull_align(ndr, 4));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->level));
+ NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->ctr, r->level));
+ NDR_CHECK(ndr_pull_srvsvc_NetConnCtr(ndr, NDR_SCALARS,
&r->ctr));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ NDR_CHECK(ndr_pull_srvsvc_NetConnCtr(ndr, NDR_BUFFERS,
&r->ctr));
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_srvsvc_NetConnInfoCtr(struct ndr_print *ndr, const
char *name, const struct srvsvc_NetConnInfoCtr *r)
+{
+ ndr_print_struct(ndr, name, "srvsvc_NetConnInfoCtr");
+ ndr->depth++;
+ ndr_print_uint32(ndr, "level", r->level);
+ ndr_print_set_switch_value(ndr, &r->ctr, r->level);
+ ndr_print_srvsvc_NetConnCtr(ndr, "ctr", &r->ctr);
+ ndr->depth--;
+}
+
static enum ndr_err_code ndr_push_srvsvc_NetFileInfo2(struct ndr_push *ndr,
int ndr_flags, const struct srvsvc_NetFileInfo2 *r)
{
if (ndr_flags & NDR_SCALARS) {
@@ -14184,15 +14222,10 @@ static enum ndr_err_code
ndr_push_srvsvc_NetConnEnum(struct ndr_push *ndr, int f
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->in.path, CH_UTF16)));
NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS,
r->in.path, ndr_charset_length(r->in.path, CH_UTF16), sizeof(uint16_t),
CH_UTF16));
}
- if (r->in.level == NULL) {
- return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
- }
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.level));
- if (r->in.ctr == NULL) {
+ if (r->in.info_ctr == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
}
- NDR_CHECK(ndr_push_set_switch_value(ndr, r->in.ctr,
*r->in.level));
- NDR_CHECK(ndr_push_srvsvc_NetConnCtr(ndr,
NDR_SCALARS|NDR_BUFFERS, r->in.ctr));
+ NDR_CHECK(ndr_push_srvsvc_NetConnInfoCtr(ndr,
NDR_SCALARS|NDR_BUFFERS, r->in.info_ctr));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.max_buffer));
NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.resume_handle));
if (r->in.resume_handle) {
@@ -14200,15 +14233,10 @@ static enum ndr_err_code
ndr_push_srvsvc_NetConnEnum(struct ndr_push *ndr, int f
}
}
if (flags & NDR_OUT) {
- if (r->out.level == NULL) {
- return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
- }
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.level));
- if (r->out.ctr == NULL) {
+ if (r->out.info_ctr == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
}
- NDR_CHECK(ndr_push_set_switch_value(ndr, r->out.ctr,
*r->out.level));
- NDR_CHECK(ndr_push_srvsvc_NetConnCtr(ndr,
NDR_SCALARS|NDR_BUFFERS, r->out.ctr));
+ NDR_CHECK(ndr_push_srvsvc_NetConnInfoCtr(ndr,
NDR_SCALARS|NDR_BUFFERS, r->out.info_ctr));
if (r->out.totalentries == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
}
@@ -14229,8 +14257,7 @@ static enum ndr_err_code
ndr_pull_srvsvc_NetConnEnum(struct ndr_pull *ndr, int f
uint32_t _ptr_resume_handle;
TALLOC_CTX *_mem_save_server_unc_0;
TALLOC_CTX *_mem_save_path_0;
- TALLOC_CTX *_mem_save_level_0;
- TALLOC_CTX *_mem_save_ctr_0;
+ TALLOC_CTX *_mem_save_info_ctr_0;
TALLOC_CTX *_mem_save_totalentries_0;
TALLOC_CTX *_mem_save_resume_handle_0;
if (flags & NDR_IN) {
@@ -14273,20 +14300,12 @@ static enum ndr_err_code
ndr_pull_srvsvc_NetConnEnum(struct ndr_pull *ndr, int f
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_path_0, 0);
}
if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
- NDR_PULL_ALLOC(ndr, r->in.level);
- }
- _mem_save_level_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->in.level, LIBNDR_FLAG_REF_ALLOC);
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->in.level));
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_level_0,
LIBNDR_FLAG_REF_ALLOC);
- if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
- NDR_PULL_ALLOC(ndr, r->in.ctr);
+ NDR_PULL_ALLOC(ndr, r->in.info_ctr);
}
- _mem_save_ctr_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->in.ctr, LIBNDR_FLAG_REF_ALLOC);
- NDR_CHECK(ndr_pull_set_switch_value(ndr, r->in.ctr,
*r->in.level));
- NDR_CHECK(ndr_pull_srvsvc_NetConnCtr(ndr,
NDR_SCALARS|NDR_BUFFERS, r->in.ctr));
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_ctr_0,
LIBNDR_FLAG_REF_ALLOC);
+ _mem_save_info_ctr_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->in.info_ctr,
LIBNDR_FLAG_REF_ALLOC);
+ NDR_CHECK(ndr_pull_srvsvc_NetConnInfoCtr(ndr,
NDR_SCALARS|NDR_BUFFERS, r->in.info_ctr));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_ctr_0,
LIBNDR_FLAG_REF_ALLOC);
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.max_buffer));
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_resume_handle));
if (_ptr_resume_handle) {
@@ -14300,29 +14319,19 @@ static enum ndr_err_code
ndr_pull_srvsvc_NetConnEnum(struct ndr_pull *ndr, int f
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
r->in.resume_handle));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_resume_handle_0, 0);
}
- NDR_PULL_ALLOC(ndr, r->out.level);
- *r->out.level = *r->in.level;
- NDR_PULL_ALLOC(ndr, r->out.ctr);
- *r->out.ctr = *r->in.ctr;
+ NDR_PULL_ALLOC(ndr, r->out.info_ctr);
+ *r->out.info_ctr = *r->in.info_ctr;
NDR_PULL_ALLOC(ndr, r->out.totalentries);
ZERO_STRUCTP(r->out.totalentries);
}
if (flags & NDR_OUT) {
if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
- NDR_PULL_ALLOC(ndr, r->out.level);
- }
- _mem_save_level_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->out.level, LIBNDR_FLAG_REF_ALLOC);
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.level));
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_level_0,
LIBNDR_FLAG_REF_ALLOC);
- if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
- NDR_PULL_ALLOC(ndr, r->out.ctr);
+ NDR_PULL_ALLOC(ndr, r->out.info_ctr);
}
- _mem_save_ctr_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->out.ctr, LIBNDR_FLAG_REF_ALLOC);
- NDR_CHECK(ndr_pull_set_switch_value(ndr, r->out.ctr,
*r->out.level));
- NDR_CHECK(ndr_pull_srvsvc_NetConnCtr(ndr,
NDR_SCALARS|NDR_BUFFERS, r->out.ctr));
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_ctr_0,
LIBNDR_FLAG_REF_ALLOC);
+ _mem_save_info_ctr_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->out.info_ctr,
LIBNDR_FLAG_REF_ALLOC);
+ NDR_CHECK(ndr_pull_srvsvc_NetConnInfoCtr(ndr,
NDR_SCALARS|NDR_BUFFERS, r->out.info_ctr));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_ctr_0,
LIBNDR_FLAG_REF_ALLOC);
if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
NDR_PULL_ALLOC(ndr, r->out.totalentries);
}
@@ -14369,14 +14378,9 @@ _PUBLIC_ void ndr_print_srvsvc_NetConnEnum(struct
ndr_print *ndr, const char *na
ndr_print_string(ndr, "path", r->in.path);
}
ndr->depth--;
- ndr_print_ptr(ndr, "level", r->in.level);
- ndr->depth++;
- ndr_print_uint32(ndr, "level", *r->in.level);
- ndr->depth--;
- ndr_print_ptr(ndr, "ctr", r->in.ctr);
+ ndr_print_ptr(ndr, "info_ctr", r->in.info_ctr);
ndr->depth++;
- ndr_print_set_switch_value(ndr, r->in.ctr, *r->in.level);
- ndr_print_srvsvc_NetConnCtr(ndr, "ctr", r->in.ctr);
+ ndr_print_srvsvc_NetConnInfoCtr(ndr, "info_ctr",
r->in.info_ctr);
ndr->depth--;
ndr_print_uint32(ndr, "max_buffer", r->in.max_buffer);
ndr_print_ptr(ndr, "resume_handle", r->in.resume_handle);
@@ -14390,14 +14394,9 @@ _PUBLIC_ void ndr_print_srvsvc_NetConnEnum(struct
ndr_print *ndr, const char *na
if (flags & NDR_OUT) {
ndr_print_struct(ndr, "out", "srvsvc_NetConnEnum");
ndr->depth++;
- ndr_print_ptr(ndr, "level", r->out.level);
- ndr->depth++;
- ndr_print_uint32(ndr, "level", *r->out.level);
- ndr->depth--;
- ndr_print_ptr(ndr, "ctr", r->out.ctr);
+ ndr_print_ptr(ndr, "info_ctr", r->out.info_ctr);
ndr->depth++;
- ndr_print_set_switch_value(ndr, r->out.ctr, *r->out.level);
- ndr_print_srvsvc_NetConnCtr(ndr, "ctr", r->out.ctr);
+ ndr_print_srvsvc_NetConnInfoCtr(ndr, "info_ctr",
r->out.info_ctr);
ndr->depth--;
ndr_print_ptr(ndr, "totalentries", r->out.totalentries);
ndr->depth++;
diff --git a/source/librpc/gen_ndr/ndr_srvsvc.h
b/source/librpc/gen_ndr/ndr_srvsvc.h
index cd341fa..8a29469 100644
--- a/source/librpc/gen_ndr/ndr_srvsvc.h
+++ b/source/librpc/gen_ndr/ndr_srvsvc.h
@@ -137,6 +137,7 @@ void ndr_print_srvsvc_NetConnCtr0(struct ndr_print *ndr,
const char *name, const
void ndr_print_srvsvc_NetConnInfo1(struct ndr_print *ndr, const char *name,
const struct srvsvc_NetConnInfo1 *r);
void ndr_print_srvsvc_NetConnCtr1(struct ndr_print *ndr, const char *name,
const struct srvsvc_NetConnCtr1 *r);
void ndr_print_srvsvc_NetConnCtr(struct ndr_print *ndr, const char *name,
const union srvsvc_NetConnCtr *r);
+void ndr_print_srvsvc_NetConnInfoCtr(struct ndr_print *ndr, const char *name,
const struct srvsvc_NetConnInfoCtr *r);
void ndr_print_srvsvc_NetFileInfo2(struct ndr_print *ndr, const char *name,
const struct srvsvc_NetFileInfo2 *r);
void ndr_print_srvsvc_NetFileCtr2(struct ndr_print *ndr, const char *name,
const struct srvsvc_NetFileCtr2 *r);
void ndr_print_srvsvc_NetFileInfo3(struct ndr_print *ndr, const char *name,
const struct srvsvc_NetFileInfo3 *r);
diff --git a/source/librpc/gen_ndr/srv_srvsvc.c
b/source/librpc/gen_ndr/srv_srvsvc.c
index 100f2ca..9f4055c 100644
--- a/source/librpc/gen_ndr/srv_srvsvc.c
+++ b/source/librpc/gen_ndr/srv_srvsvc.c
@@ -665,8 +665,7 @@ static bool api_srvsvc_NetConnEnum(pipes_struct *p)
}
ZERO_STRUCT(r->out);
- r->out.level = r->in.level;
- r->out.ctr = r->in.ctr;
+ r->out.info_ctr = r->in.info_ctr;
r->out.totalentries = talloc_zero(r, uint32_t);
if (r->out.totalentries == NULL) {
talloc_free(r);
diff --git a/source/librpc/gen_ndr/srvsvc.h b/source/librpc/gen_ndr/srvsvc.h
index 6a74904..f619dba 100644
--- a/source/librpc/gen_ndr/srvsvc.h
+++ b/source/librpc/gen_ndr/srvsvc.h
@@ -103,6 +103,11 @@ union srvsvc_NetConnCtr {
struct srvsvc_NetConnCtr1 *ctr1;/* [unique,case] */
};
+struct srvsvc_NetConnInfoCtr {
+ uint32_t level;
+ union srvsvc_NetConnCtr ctr;/* [switch_is(level)] */
+};
+
struct srvsvc_NetFileInfo2 {
uint32_t fid;
};
@@ -1156,15 +1161,13 @@ struct srvsvc_NetConnEnum {
const char *server_unc;/* [unique,charset(UTF16)] */
const char *path;/* [unique,charset(UTF16)] */
uint32_t max_buffer;
- uint32_t *level;/* [ref] */
- union srvsvc_NetConnCtr *ctr;/* [ref,switch_is(*level)] */
+ struct srvsvc_NetConnInfoCtr *info_ctr;/* [ref] */
uint32_t *resume_handle;/* [unique] */
} in;
struct {
uint32_t *totalentries;/* [ref] */
- uint32_t *level;/* [ref] */
- union srvsvc_NetConnCtr *ctr;/* [ref,switch_is(*level)] */
+ struct srvsvc_NetConnInfoCtr *info_ctr;/* [ref] */
uint32_t *resume_handle;/* [unique] */
WERROR result;
} out;
diff --git a/source/librpc/idl/srvsvc.idl b/source/librpc/idl/srvsvc.idl
index d1ff0c5..98a33e2 100644
--- a/source/librpc/idl/srvsvc.idl
+++ b/source/librpc/idl/srvsvc.idl
@@ -197,13 +197,17 @@ import "security.idl", "svcctl.idl";
[default] ;
} srvsvc_NetConnCtr;
+ typedef struct {
+ uint32 level;
+ [switch_is(level)] srvsvc_NetConnCtr ctr;
+ } srvsvc_NetConnInfoCtr;
+
/******************/
/* Function: 0x08 */
WERROR srvsvc_NetConnEnum(
[in,unique] [string,charset(UTF16)] uint16 *server_unc,
[in,unique] [string,charset(UTF16)] uint16 *path,
- [in,out,ref] uint32 *level,
- [in,out,switch_is(*level),ref] srvsvc_NetConnCtr *ctr,
+ [in,out,ref] srvsvc_NetConnInfoCtr *info_ctr,
[in] uint32 max_buffer,
[out,ref] uint32 *totalentries,
[in,out,unique] uint32 *resume_handle
diff --git a/source/rpcclient/cmd_srvsvc.c b/source/rpcclient/cmd_srvsvc.c
index 1062c95..a5eb69c 100644
--- a/source/rpcclient/cmd_srvsvc.c
+++ b/source/rpcclient/cmd_srvsvc.c
@@ -755,6 +755,113 @@ static WERROR cmd_srvsvc_net_sess_enum(struct
rpc_pipe_client *cli,
return result;
}
+static WERROR cmd_srvsvc_net_disk_enum(struct rpc_pipe_client *cli,
+ TALLOC_CTX *mem_ctx,
+ int argc, const char **argv)
+{
+ struct srvsvc_NetDiskInfo info;
+ WERROR result;
+ NTSTATUS status;
+ uint32_t total_entries = 0;
+ uint32_t resume_handle = 0;
+ uint32_t level = 0;
+
+ if (argc > 2) {
+ printf("Usage: %s [level] [resume_handle]\n", argv[0]);
+ return WERR_OK;
+ }
+
+ if (argc >= 2) {
+ level = atoi(argv[1]);
+ }
+
+ if (argc >= 3) {
+ resume_handle = atoi(argv[2]);
+ }
+
+ ZERO_STRUCT(info);
+
+ status = rpccli_srvsvc_NetDiskEnum(cli, mem_ctx,
+ cli->cli->desthost,
+ level,
+ &info,
+ 0xffffffff,
+ &total_entries,
+ &resume_handle,
+ &result);
+
+ if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
+ goto done;
+ }
+
+ done:
+ return result;
+}
+
+static WERROR cmd_srvsvc_net_conn_enum(struct rpc_pipe_client *cli,
+ TALLOC_CTX *mem_ctx,
+ int argc, const char **argv)
+{
+ struct srvsvc_NetConnInfoCtr info_ctr;
+ struct srvsvc_NetConnCtr0 ctr0;
+ struct srvsvc_NetConnCtr1 ctr1;
+ WERROR result;
+ NTSTATUS status;
+ uint32_t total_entries = 0;
+ uint32_t resume_handle = 0;
+ uint32_t level = 1;
+ const char *path = "IPC$";
+
+ if (argc > 4) {
+ printf("Usage: %s [level] [path] [resume_handle]\n", argv[0]);
+ return WERR_OK;
+ }
+
+ if (argc >= 2) {
+ level = atoi(argv[1]);
+ }
+
+ if (argc >= 3) {
+ path = argv[2];
+ }
+
+ if (argc >= 4) {
+ resume_handle = atoi(argv[3]);
+ }
+
+ ZERO_STRUCT(info_ctr);
+
+ info_ctr.level = level;
+
+ switch (level) {
+ case 0:
+ ZERO_STRUCT(ctr0);
+ info_ctr.ctr.ctr0 = &ctr0;
+ break;
+ case 1:
+ ZERO_STRUCT(ctr1);
+ info_ctr.ctr.ctr1 = &ctr1;
+ break;
+ default:
+ return WERR_INVALID_PARAM;
+ }
+
+ status = rpccli_srvsvc_NetConnEnum(cli, mem_ctx,
+ cli->cli->desthost,
+ path,
+ &info_ctr,
+ 0xffffffff,
+ &total_entries,
+ &resume_handle,
+ &result);
+
+ if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(result)) {
+ goto done;
+ }
+
+ done:
+ return result;
+}
/* List of commands exported by this module */
@@ -774,6 +881,8 @@ struct cmd_set srvsvc_commands[] = {
{ "netfilegetsec", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_file_get_sec,
PI_SRVSVC, NULL, "Get File security", "" },
{ "netsessdel", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_sess_del,
PI_SRVSVC, NULL, "Delete Session", "" },
{ "netsessenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_sess_enum,
PI_SRVSVC, NULL, "Enumerate Sessions", "" },
+ { "netdiskenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_disk_enum,
PI_SRVSVC, NULL, "Enumerate Disks", "" },
+ { "netconnenum", RPC_RTYPE_WERROR, NULL, cmd_srvsvc_net_conn_enum,
PI_SRVSVC, NULL, "Enumerate Connections", "" },
{ NULL }
};
--
Samba Shared Repository
