[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-440-g0c7af8b
Günther Deschner
gd at samba.org
Wed Mar 26 11:17:37 GMT 2008
The branch, v3-2-test has been updated
via 0c7af8bc136f45484eab3c36b761046f88653b93 (commit)
via f67632f9b244800007bfaef9cc2ab932fda78b3c (commit)
via b1b6e93aa1f1b6d80969b6e5dd8f723e21ae8ce8 (commit)
via 2201a8118c6abae3425dd5728af129bb8f71b564 (commit)
via 0d8181dab75887231a168f910203e53ec54fa4eb (commit)
via eeb7c7d9d0c9f7ac171641bc8cafe20db704fdc4 (commit)
from 6d72fc4373adff01cf6e0e18f78082d1eab90064 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 0c7af8bc136f45484eab3c36b761046f88653b93
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 26 11:45:28 2008 +0100
Strip whitespace in ntsvcs rpc server.
Guenther
commit f67632f9b244800007bfaef9cc2ab932fda78b3c
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 26 11:35:44 2008 +0100
Re-run make idl.
Guenther
commit b1b6e93aa1f1b6d80969b6e5dd8f723e21ae8ce8
Author: Günther Deschner <gd at samba.org>
Date: Mon Feb 18 02:37:26 2008 +0100
Fill in IDL for PNP_GetDeviceRegProp.
Guenther
commit 2201a8118c6abae3425dd5728af129bb8f71b564
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 26 11:32:12 2008 +0100
Comment out some svcctl headers which are now defined in IDL.
Guenther
commit 0d8181dab75887231a168f910203e53ec54fa4eb
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 26 11:36:41 2008 +0100
Re-run make idl.
Guenther
commit eeb7c7d9d0c9f7ac171641bc8cafe20db704fdc4
Author: Günther Deschner <gd at samba.org>
Date: Tue Mar 25 19:07:48 2008 +0100
Add svcctl_MgrAccessMask and svcctl_ServiceAccessMask.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/include/rpc_ntsvcs.h | 2 -
source/include/rpc_secdes.h | 10 ++-
source/librpc/gen_ndr/cli_ntsvcs.c | 17 ++++
source/librpc/gen_ndr/cli_ntsvcs.h | 7 ++
source/librpc/gen_ndr/ndr_ntsvcs.c | 153 ++++++++++++++++++++++++++++++++++++
source/librpc/gen_ndr/ndr_svcctl.c | 69 +++++++++++++++--
source/librpc/gen_ndr/ndr_svcctl.h | 2 +
source/librpc/gen_ndr/ntsvcs.h | 14 +++
source/librpc/gen_ndr/srv_ntsvcs.c | 10 +++
source/librpc/gen_ndr/svcctl.h | 19 +++++
source/librpc/idl/ntsvcs.idl | 13 +++-
source/librpc/idl/svcctl.idl | 25 ++++++-
source/rpc_server/srv_ntsvcs_nt.c | 26 +++---
13 files changed, 339 insertions(+), 28 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_ntsvcs.h b/source/include/rpc_ntsvcs.h
index 71274cc..0056d16 100644
--- a/source/include/rpc_ntsvcs.h
+++ b/source/include/rpc_ntsvcs.h
@@ -49,8 +49,6 @@ typedef struct {
/**************************/
-#define DEV_REGPROP_DESC 1
-
typedef struct {
UNISTR2 devicepath;
uint32 property;
diff --git a/source/include/rpc_secdes.h b/source/include/rpc_secdes.h
index 649e806..83103b7 100644
--- a/source/include/rpc_secdes.h
+++ b/source/include/rpc_secdes.h
@@ -394,6 +394,7 @@ struct standard_mapping {
/* Service Control Manager Bits */
+#if 0
#define SC_RIGHT_MGR_CONNECT 0x0001
#define SC_RIGHT_MGR_CREATE_SERVICE 0x0002
#define SC_RIGHT_MGR_ENUMERATE_SERVICE 0x0004
@@ -401,6 +402,8 @@ struct standard_mapping {
#define SC_RIGHT_MGR_QUERY_LOCK_STATUS 0x0010
#define SC_RIGHT_MGR_MODIFY_BOOT_CONFIG 0x0020
+#endif
+
#define SC_MANAGER_READ_ACCESS \
( STANDARD_RIGHTS_READ_ACCESS | \
SC_RIGHT_MGR_CONNECT | \
@@ -418,8 +421,9 @@ struct standard_mapping {
#define SC_MANAGER_ALL_ACCESS SC_MANAGER_WRITE_ACCESS
-/* Service Object Bits */
+/* Service Object Bits */
+#if 0
#define SC_RIGHT_SVC_QUERY_CONFIG 0x0001
#define SC_RIGHT_SVC_CHANGE_CONFIG 0x0002
#define SC_RIGHT_SVC_QUERY_STATUS 0x0004
@@ -430,6 +434,8 @@ struct standard_mapping {
#define SC_RIGHT_SVC_INTERROGATE 0x0080
#define SC_RIGHT_SVC_USER_DEFINED_CONTROL 0x0100
+#endif
+
#define SERVICE_READ_ACCESS \
( STANDARD_RIGHTS_READ_ACCESS | \
SC_RIGHT_SVC_ENUMERATE_DEPENDENTS | \
@@ -452,8 +458,6 @@ struct standard_mapping {
#define SERVICE_ALL_ACCESS SERVICE_WRITE_ACCESS
-
-
/*
* Access Bits for registry ACLS
*/
diff --git a/source/librpc/gen_ndr/cli_ntsvcs.c b/source/librpc/gen_ndr/cli_ntsvcs.c
index 615cdb6..864caef 100644
--- a/source/librpc/gen_ndr/cli_ntsvcs.c
+++ b/source/librpc/gen_ndr/cli_ntsvcs.c
@@ -566,12 +566,25 @@ NTSTATUS rpccli_PNP_GetDepth(struct rpc_pipe_client *cli,
NTSTATUS rpccli_PNP_GetDeviceRegProp(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
+ const char *devicepath /* [in] [ref,charset(UTF16)] */,
+ uint32_t property /* [in] */,
+ uint32_t *unknown1 /* [in,out] [ref] */,
+ uint8_t *buffer /* [out] [ref,length_is(*buffer_size),size_is(*buffer_size)] */,
+ uint32_t *buffer_size /* [in,out] [ref] */,
+ uint32_t *needed /* [in,out] [ref] */,
+ uint32_t unknown3 /* [in] */,
WERROR *werror)
{
struct PNP_GetDeviceRegProp r;
NTSTATUS status;
/* In parameters */
+ r.in.devicepath = devicepath;
+ r.in.property = property;
+ r.in.unknown1 = unknown1;
+ r.in.buffer_size = buffer_size;
+ r.in.needed = needed;
+ r.in.unknown3 = unknown3;
if (DEBUGLEVEL >= 10) {
NDR_PRINT_IN_DEBUG(PNP_GetDeviceRegProp, &r);
@@ -597,6 +610,10 @@ NTSTATUS rpccli_PNP_GetDeviceRegProp(struct rpc_pipe_client *cli,
}
/* Return variables */
+ *unknown1 = *r.out.unknown1;
+ memcpy(buffer, r.out.buffer, *r.in.buffer_size);
+ *buffer_size = *r.out.buffer_size;
+ *needed = *r.out.needed;
/* Return result */
if (werror) {
diff --git a/source/librpc/gen_ndr/cli_ntsvcs.h b/source/librpc/gen_ndr/cli_ntsvcs.h
index c20673f..a52a79e 100644
--- a/source/librpc/gen_ndr/cli_ntsvcs.h
+++ b/source/librpc/gen_ndr/cli_ntsvcs.h
@@ -48,6 +48,13 @@ NTSTATUS rpccli_PNP_GetDepth(struct rpc_pipe_client *cli,
WERROR *werror);
NTSTATUS rpccli_PNP_GetDeviceRegProp(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
+ const char *devicepath /* [in] [ref,charset(UTF16)] */,
+ uint32_t property /* [in] */,
+ uint32_t *unknown1 /* [in,out] [ref] */,
+ uint8_t *buffer /* [out] [ref,length_is(*buffer_size),size_is(*buffer_size)] */,
+ uint32_t *buffer_size /* [in,out] [ref] */,
+ uint32_t *needed /* [in,out] [ref] */,
+ uint32_t unknown3 /* [in] */,
WERROR *werror);
NTSTATUS rpccli_PNP_SetDeviceRegProp(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
diff --git a/source/librpc/gen_ndr/ndr_ntsvcs.c b/source/librpc/gen_ndr/ndr_ntsvcs.c
index 9a0e2bc..1ce5b15 100644
--- a/source/librpc/gen_ndr/ndr_ntsvcs.c
+++ b/source/librpc/gen_ndr/ndr_ntsvcs.c
@@ -688,8 +688,48 @@ _PUBLIC_ void ndr_print_PNP_GetDepth(struct ndr_print *ndr, const char *name, in
static enum ndr_err_code ndr_push_PNP_GetDeviceRegProp(struct ndr_push *ndr, int flags, const struct PNP_GetDeviceRegProp *r)
{
if (flags & NDR_IN) {
+ if (r->in.devicepath == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+ }
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.devicepath, CH_UTF16)));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.devicepath, CH_UTF16)));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.devicepath, ndr_charset_length(r->in.devicepath, CH_UTF16), sizeof(uint16_t), CH_UTF16));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.property));
+ if (r->in.unknown1 == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+ }
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.unknown1));
+ if (r->in.buffer_size == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+ }
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.buffer_size));
+ if (r->in.needed == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+ }
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.needed));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.unknown3));
}
if (flags & NDR_OUT) {
+ if (r->out.unknown1 == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+ }
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.unknown1));
+ if (r->out.buffer == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+ }
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.buffer_size));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.buffer_size));
+ NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->out.buffer, *r->out.buffer_size));
+ if (r->out.buffer_size == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+ }
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.buffer_size));
+ if (r->out.needed == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+ }
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.needed));
NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
}
return NDR_ERR_SUCCESS;
@@ -697,10 +737,89 @@ static enum ndr_err_code ndr_push_PNP_GetDeviceRegProp(struct ndr_push *ndr, int
static enum ndr_err_code ndr_pull_PNP_GetDeviceRegProp(struct ndr_pull *ndr, int flags, struct PNP_GetDeviceRegProp *r)
{
+ TALLOC_CTX *_mem_save_unknown1_0;
+ TALLOC_CTX *_mem_save_buffer_size_0;
+ TALLOC_CTX *_mem_save_needed_0;
if (flags & NDR_IN) {
+ ZERO_STRUCT(r->out);
+
+ NDR_CHECK(ndr_pull_array_size(ndr, &r->in.devicepath));
+ NDR_CHECK(ndr_pull_array_length(ndr, &r->in.devicepath));
+ if (ndr_get_array_length(ndr, &r->in.devicepath) > ndr_get_array_size(ndr, &r->in.devicepath)) {
+ return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->in.devicepath), ndr_get_array_length(ndr, &r->in.devicepath));
+ }
+ NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->in.devicepath), sizeof(uint16_t)));
+ NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.devicepath, ndr_get_array_length(ndr, &r->in.devicepath), sizeof(uint16_t), CH_UTF16));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.property));
+ if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+ NDR_PULL_ALLOC(ndr, r->in.unknown1);
+ }
+ _mem_save_unknown1_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->in.unknown1, LIBNDR_FLAG_REF_ALLOC);
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->in.unknown1));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_unknown1_0, LIBNDR_FLAG_REF_ALLOC);
+ if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+ NDR_PULL_ALLOC(ndr, r->in.buffer_size);
+ }
+ _mem_save_buffer_size_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->in.buffer_size, LIBNDR_FLAG_REF_ALLOC);
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->in.buffer_size));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_buffer_size_0, LIBNDR_FLAG_REF_ALLOC);
+ if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+ NDR_PULL_ALLOC(ndr, r->in.needed);
+ }
+ _mem_save_needed_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->in.needed, LIBNDR_FLAG_REF_ALLOC);
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->in.needed));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_needed_0, LIBNDR_FLAG_REF_ALLOC);
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.unknown3));
+ NDR_PULL_ALLOC(ndr, r->out.unknown1);
+ *r->out.unknown1 = *r->in.unknown1;
+ NDR_PULL_ALLOC_N(ndr, r->out.buffer, *r->in.buffer_size);
+ memset(r->out.buffer, 0, (*r->in.buffer_size) * sizeof(*r->out.buffer));
+ NDR_PULL_ALLOC(ndr, r->out.buffer_size);
+ *r->out.buffer_size = *r->in.buffer_size;
+ NDR_PULL_ALLOC(ndr, r->out.needed);
+ *r->out.needed = *r->in.needed;
}
if (flags & NDR_OUT) {
+ if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+ NDR_PULL_ALLOC(ndr, r->out.unknown1);
+ }
+ _mem_save_unknown1_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->out.unknown1, LIBNDR_FLAG_REF_ALLOC);
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.unknown1));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_unknown1_0, LIBNDR_FLAG_REF_ALLOC);
+ NDR_CHECK(ndr_pull_array_size(ndr, &r->out.buffer));
+ NDR_CHECK(ndr_pull_array_length(ndr, &r->out.buffer));
+ if (ndr_get_array_length(ndr, &r->out.buffer) > ndr_get_array_size(ndr, &r->out.buffer)) {
+ return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->out.buffer), ndr_get_array_length(ndr, &r->out.buffer));
+ }
+ if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+ NDR_PULL_ALLOC_N(ndr, r->out.buffer, ndr_get_array_size(ndr, &r->out.buffer));
+ }
+ NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->out.buffer, ndr_get_array_length(ndr, &r->out.buffer)));
+ if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+ NDR_PULL_ALLOC(ndr, r->out.buffer_size);
+ }
+ _mem_save_buffer_size_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->out.buffer_size, LIBNDR_FLAG_REF_ALLOC);
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.buffer_size));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_buffer_size_0, LIBNDR_FLAG_REF_ALLOC);
+ if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+ NDR_PULL_ALLOC(ndr, r->out.needed);
+ }
+ _mem_save_needed_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->out.needed, LIBNDR_FLAG_REF_ALLOC);
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.needed));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_needed_0, LIBNDR_FLAG_REF_ALLOC);
NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
+ if (r->out.buffer) {
+ NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->out.buffer, *r->out.buffer_size));
+ }
+ if (r->out.buffer) {
+ NDR_CHECK(ndr_check_array_length(ndr, (void*)&r->out.buffer, *r->out.buffer_size));
+ }
}
return NDR_ERR_SUCCESS;
}
@@ -715,11 +834,45 @@ _PUBLIC_ void ndr_print_PNP_GetDeviceRegProp(struct ndr_print *ndr, const char *
if (flags & NDR_IN) {
ndr_print_struct(ndr, "in", "PNP_GetDeviceRegProp");
ndr->depth++;
+ ndr_print_ptr(ndr, "devicepath", r->in.devicepath);
+ ndr->depth++;
+ ndr_print_string(ndr, "devicepath", r->in.devicepath);
+ ndr->depth--;
+ ndr_print_uint32(ndr, "property", r->in.property);
+ ndr_print_ptr(ndr, "unknown1", r->in.unknown1);
+ ndr->depth++;
+ ndr_print_uint32(ndr, "unknown1", *r->in.unknown1);
+ ndr->depth--;
+ ndr_print_ptr(ndr, "buffer_size", r->in.buffer_size);
+ ndr->depth++;
+ ndr_print_uint32(ndr, "buffer_size", *r->in.buffer_size);
+ ndr->depth--;
+ ndr_print_ptr(ndr, "needed", r->in.needed);
+ ndr->depth++;
+ ndr_print_uint32(ndr, "needed", *r->in.needed);
+ ndr->depth--;
+ ndr_print_uint32(ndr, "unknown3", r->in.unknown3);
ndr->depth--;
}
if (flags & NDR_OUT) {
ndr_print_struct(ndr, "out", "PNP_GetDeviceRegProp");
ndr->depth++;
+ ndr_print_ptr(ndr, "unknown1", r->out.unknown1);
+ ndr->depth++;
+ ndr_print_uint32(ndr, "unknown1", *r->out.unknown1);
+ ndr->depth--;
+ ndr_print_ptr(ndr, "buffer", r->out.buffer);
+ ndr->depth++;
+ ndr_print_array_uint8(ndr, "buffer", r->out.buffer, *r->out.buffer_size);
+ ndr->depth--;
+ ndr_print_ptr(ndr, "buffer_size", r->out.buffer_size);
+ ndr->depth++;
+ ndr_print_uint32(ndr, "buffer_size", *r->out.buffer_size);
+ ndr->depth--;
+ ndr_print_ptr(ndr, "needed", r->out.needed);
+ ndr->depth++;
+ ndr_print_uint32(ndr, "needed", *r->out.needed);
+ ndr->depth--;
ndr_print_WERROR(ndr, "result", r->out.result);
ndr->depth--;
}
diff --git a/source/librpc/gen_ndr/ndr_svcctl.c b/source/librpc/gen_ndr/ndr_svcctl.c
index f7e7874..bcc550b 100644
--- a/source/librpc/gen_ndr/ndr_svcctl.c
+++ b/source/librpc/gen_ndr/ndr_svcctl.c
@@ -295,6 +295,63 @@ _PUBLIC_ void ndr_print_svcctl_ServerType(struct ndr_print *ndr, const char *nam
ndr->depth--;
}
+static enum ndr_err_code ndr_push_svcctl_MgrAccessMask(struct ndr_push *ndr, int ndr_flags, uint32_t r)
+{
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+ return NDR_ERR_SUCCESS;
+}
+
+static enum ndr_err_code ndr_pull_svcctl_MgrAccessMask(struct ndr_pull *ndr, int ndr_flags, uint32_t *r)
+{
+ uint32_t v;
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+ *r = v;
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_svcctl_MgrAccessMask(struct ndr_print *ndr, const char *name, uint32_t r)
+{
+ ndr_print_uint32(ndr, name, r);
+ ndr->depth++;
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SC_RIGHT_MGR_CONNECT", SC_RIGHT_MGR_CONNECT, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SC_RIGHT_MGR_CREATE_SERVICE", SC_RIGHT_MGR_CREATE_SERVICE, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SC_RIGHT_MGR_ENUMERATE_SERVICE", SC_RIGHT_MGR_ENUMERATE_SERVICE, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SC_RIGHT_MGR_LOCK", SC_RIGHT_MGR_LOCK, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SC_RIGHT_MGR_QUERY_LOCK_STATUS", SC_RIGHT_MGR_QUERY_LOCK_STATUS, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SC_RIGHT_MGR_MODIFY_BOOT_CONFIG", SC_RIGHT_MGR_MODIFY_BOOT_CONFIG, r);
+ ndr->depth--;
+}
+
+static enum ndr_err_code ndr_push_svcctl_ServiceAccessMask(struct ndr_push *ndr, int ndr_flags, uint32_t r)
+{
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+ return NDR_ERR_SUCCESS;
+}
+
+static enum ndr_err_code ndr_pull_svcctl_ServiceAccessMask(struct ndr_pull *ndr, int ndr_flags, uint32_t *r)
+{
+ uint32_t v;
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+ *r = v;
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_svcctl_ServiceAccessMask(struct ndr_print *ndr, const char *name, uint32_t r)
+{
+ ndr_print_uint32(ndr, name, r);
+ ndr->depth++;
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SC_RIGHT_SVC_QUERY_CONFIG", SC_RIGHT_SVC_QUERY_CONFIG, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SC_RIGHT_SVC_CHANGE_CONFIG", SC_RIGHT_SVC_CHANGE_CONFIG, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SC_RIGHT_SVC_QUERY_STATUS", SC_RIGHT_SVC_QUERY_STATUS, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SC_RIGHT_SVC_ENUMERATE_DEPENDENTS", SC_RIGHT_SVC_ENUMERATE_DEPENDENTS, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SC_RIGHT_SVC_START", SC_RIGHT_SVC_START, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SC_RIGHT_SVC_STOP", SC_RIGHT_SVC_STOP, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SC_RIGHT_SVC_PAUSE_CONTINUE", SC_RIGHT_SVC_PAUSE_CONTINUE, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SC_RIGHT_SVC_INTERROGATE", SC_RIGHT_SVC_INTERROGATE, r);
+ ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SC_RIGHT_SVC_USER_DEFINED_CONTROL", SC_RIGHT_SVC_USER_DEFINED_CONTROL, r);
+ ndr->depth--;
+}
+
static enum ndr_err_code ndr_push_svcctl_CloseServiceHandle(struct ndr_push *ndr, int flags, const struct svcctl_CloseServiceHandle *r)
{
if (flags & NDR_IN) {
@@ -1987,7 +2044,7 @@ static enum ndr_err_code ndr_push_svcctl_OpenSCManagerW(struct ndr_push *ndr, in
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.DatabaseName, CH_UTF16)));
NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.DatabaseName, ndr_charset_length(r->in.DatabaseName, CH_UTF16), sizeof(uint16_t), CH_UTF16));
}
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.access_mask));
+ NDR_CHECK(ndr_push_svcctl_MgrAccessMask(ndr, NDR_SCALARS, r->in.access_mask));
}
if (flags & NDR_OUT) {
if (r->out.handle == NULL) {
@@ -2045,7 +2102,7 @@ static enum ndr_err_code ndr_pull_svcctl_OpenSCManagerW(struct ndr_pull *ndr, in
NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.DatabaseName, ndr_get_array_length(ndr, &r->in.DatabaseName), sizeof(uint16_t), CH_UTF16));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_DatabaseName_0, 0);
}
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.access_mask));
+ NDR_CHECK(ndr_pull_svcctl_MgrAccessMask(ndr, NDR_SCALARS, &r->in.access_mask));
NDR_PULL_ALLOC(ndr, r->out.handle);
ZERO_STRUCTP(r->out.handle);
}
@@ -2084,7 +2141,7 @@ _PUBLIC_ void ndr_print_svcctl_OpenSCManagerW(struct ndr_print *ndr, const char
ndr_print_string(ndr, "DatabaseName", r->in.DatabaseName);
}
ndr->depth--;
- ndr_print_uint32(ndr, "access_mask", r->in.access_mask);
+ ndr_print_svcctl_MgrAccessMask(ndr, "access_mask", r->in.access_mask);
ndr->depth--;
}
if (flags & NDR_OUT) {
@@ -2111,7 +2168,7 @@ static enum ndr_err_code ndr_push_svcctl_OpenServiceW(struct ndr_push *ndr, int
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.ServiceName, CH_UTF16)));
NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.ServiceName, ndr_charset_length(r->in.ServiceName, CH_UTF16), sizeof(uint16_t), CH_UTF16));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.access_mask));
+ NDR_CHECK(ndr_push_svcctl_ServiceAccessMask(ndr, NDR_SCALARS, r->in.access_mask));
}
if (flags & NDR_OUT) {
if (r->out.handle == NULL) {
@@ -2144,7 +2201,7 @@ static enum ndr_err_code ndr_pull_svcctl_OpenServiceW(struct ndr_pull *ndr, int
}
NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->in.ServiceName), sizeof(uint16_t)));
NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.ServiceName, ndr_get_array_length(ndr, &r->in.ServiceName), sizeof(uint16_t), CH_UTF16));
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.access_mask));
+ NDR_CHECK(ndr_pull_svcctl_ServiceAccessMask(ndr, NDR_SCALARS, &r->in.access_mask));
NDR_PULL_ALLOC(ndr, r->out.handle);
ZERO_STRUCTP(r->out.handle);
}
@@ -2176,7 +2233,7 @@ _PUBLIC_ void ndr_print_svcctl_OpenServiceW(struct ndr_print *ndr, const char *n
ndr_print_policy_handle(ndr, "scmanager_handle", r->in.scmanager_handle);
ndr->depth--;
ndr_print_string(ndr, "ServiceName", r->in.ServiceName);
- ndr_print_uint32(ndr, "access_mask", r->in.access_mask);
+ ndr_print_svcctl_ServiceAccessMask(ndr, "access_mask", r->in.access_mask);
ndr->depth--;
}
if (flags & NDR_OUT) {
diff --git a/source/librpc/gen_ndr/ndr_svcctl.h b/source/librpc/gen_ndr/ndr_svcctl.h
index 5260f11..4475b08 100644
--- a/source/librpc/gen_ndr/ndr_svcctl.h
+++ b/source/librpc/gen_ndr/ndr_svcctl.h
@@ -106,6 +106,8 @@ void ndr_print_ENUM_SERVICE_STATUS(struct ndr_print *ndr, const char *name, cons
enum ndr_err_code ndr_push_svcctl_ServerType(struct ndr_push *ndr, int ndr_flags, uint32_t r);
enum ndr_err_code ndr_pull_svcctl_ServerType(struct ndr_pull *ndr, int ndr_flags, uint32_t *r);
void ndr_print_svcctl_ServerType(struct ndr_print *ndr, const char *name, uint32_t r);
+void ndr_print_svcctl_MgrAccessMask(struct ndr_print *ndr, const char *name, uint32_t r);
+void ndr_print_svcctl_ServiceAccessMask(struct ndr_print *ndr, const char *name, uint32_t r);
void ndr_print_svcctl_CloseServiceHandle(struct ndr_print *ndr, const char *name, int flags, const struct svcctl_CloseServiceHandle *r);
void ndr_print_svcctl_ControlService(struct ndr_print *ndr, const char *name, int flags, const struct svcctl_ControlService *r);
void ndr_print_svcctl_DeleteService(struct ndr_print *ndr, const char *name, int flags, const struct svcctl_DeleteService *r);
diff --git a/source/librpc/gen_ndr/ntsvcs.h b/source/librpc/gen_ndr/ntsvcs.h
index 9cdfa65..95484e4 100644
--- a/source/librpc/gen_ndr/ntsvcs.h
+++ b/source/librpc/gen_ndr/ntsvcs.h
@@ -5,6 +5,7 @@
#ifndef _HEADER_ntsvcs
#define _HEADER_ntsvcs
+#define DEV_REGPROP_DESC ( 1 )
struct PNP_HwProfInfo {
uint32_t unknown1;
uint16_t unknown2[160];
@@ -130,6 +131,19 @@ struct PNP_GetDepth {
struct PNP_GetDeviceRegProp {
struct {
+ const char *devicepath;/* [ref,charset(UTF16)] */
+ uint32_t property;
+ uint32_t unknown3;
+ uint32_t *unknown1;/* [ref] */
+ uint32_t *buffer_size;/* [ref] */
+ uint32_t *needed;/* [ref] */
+ } in;
+
+ struct {
+ uint8_t *buffer;/* [ref,length_is(*buffer_size),size_is(*buffer_size)] */
+ uint32_t *unknown1;/* [ref] */
+ uint32_t *buffer_size;/* [ref] */
+ uint32_t *needed;/* [ref] */
WERROR result;
} out;
diff --git a/source/librpc/gen_ndr/srv_ntsvcs.c b/source/librpc/gen_ndr/srv_ntsvcs.c
index 339de6c..523b4d8 100644
--- a/source/librpc/gen_ndr/srv_ntsvcs.c
+++ b/source/librpc/gen_ndr/srv_ntsvcs.c
@@ -1007,6 +1007,16 @@ static bool api_PNP_GetDeviceRegProp(pipes_struct *p)
NDR_PRINT_IN_DEBUG(PNP_GetDeviceRegProp, r);
}
+ ZERO_STRUCT(r->out);
+ r->out.unknown1 = r->in.unknown1;
+ r->out.buffer = talloc_zero_array(r, uint8_t, *r->out.buffer_size);
+ if (r->out.buffer == NULL) {
+ talloc_free(r);
+ return false;
+ }
+
+ r->out.buffer_size = r->in.buffer_size;
+ r->out.needed = r->in.needed;
r->out.result = _PNP_GetDeviceRegProp(p, r);
if (p->rng_fault_state) {
diff --git a/source/librpc/gen_ndr/svcctl.h b/source/librpc/gen_ndr/svcctl.h
--
Samba Shared Repository
More information about the samba-cvs
mailing list