The branch, master has been updated
via 75faf7765b30975e417e373f131c164d426db26c (commit)
via 876e926c0ceda388a9db0a90a6022e98731003fc (commit)
via e32b26931f7847f8914639ee9af325b2fc407be4 (commit)
via 88392e44827ff3e0e72845404acaa38d932df393 (commit)
via 1e54bc33ffb163b9a4c37848ad5e70585fc83f0c (commit)
via 620ac433045f9f063c2227471bbee0301e8d5301 (commit)
from 1884b928723e362250272f6986fb08fcee57ebc1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 75faf7765b30975e417e373f131c164d426db26c
Author: Günther Deschner <[email protected]>
Date: Wed Feb 11 22:34:41 2009 +0100
s3-spoolss: Fix uninitialised variable warning.
Guenther
commit 876e926c0ceda388a9db0a90a6022e98731003fc
Author: Günther Deschner <[email protected]>
Date: Wed Feb 11 22:06:45 2009 +0100
s4-spoolss: fix rpc_server stub names for opnum 0x42 and 0x43.
Guenther
commit e32b26931f7847f8914639ee9af325b2fc407be4
Author: Günther Deschner <[email protected]>
Date: Wed Feb 11 22:05:18 2009 +0100
s3-spoolss: fix rpc_server stub names for opnum 0x42 and 0x43.
Guenther
commit 88392e44827ff3e0e72845404acaa38d932df393
Author: Günther Deschner <[email protected]>
Date: Wed Feb 11 22:12:56 2009 +0100
s3: re-run make samba3-idl.
Guenther
commit 1e54bc33ffb163b9a4c37848ad5e70585fc83f0c
Author: Günther Deschner <[email protected]>
Date: Wed Feb 11 21:51:39 2009 +0100
spoolss: fix name mismatch for opnum 0x42 (66).
opnum 0x42 is spoolss_RouterReplyPrinterEx and *not*
spoolss_RouterRefreshPrinterChangeNotification.
Guenther
commit 620ac433045f9f063c2227471bbee0301e8d5301
Author: Günther Deschner <[email protected]>
Date: Wed Feb 11 21:42:19 2009 +0100
spoolss: fix name mismatch for opnum 0x43 (67).
opnum 0x43 is spoolss_RouterRefreshPrinterChangeNotify and *not*
spoolss_RemoteFindNextPrinterChangeNotifyEx
Guenther
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/cli_spoolss.c | 36 +++++++++++-----------
librpc/gen_ndr/cli_spoolss.h | 20 ++++++------
librpc/gen_ndr/ndr_spoolss.c | 44 +++++++++++++-------------
librpc/gen_ndr/ndr_spoolss.h | 12 ++++----
librpc/gen_ndr/spoolss.h | 4 +-
librpc/gen_ndr/srv_spoolss.c | 44 +++++++++++++-------------
librpc/gen_ndr/srv_spoolss.h | 8 ++--
librpc/idl/spoolss.idl | 4 +-
source3/rpc_server/srv_spoolss_nt.c | 14 +++++----
source4/rpc_server/spoolss/dcesrv_spoolss.c | 12 ++++----
10 files changed, 100 insertions(+), 98 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index 492f2c2..a9d401b 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -3107,23 +3107,23 @@ NTSTATUS
rpccli_spoolss_RemoteFindFirstPrinterChangeNotifyEx(struct rpc_pipe_cli
return werror_to_ntstatus(r.out.result);
}
-NTSTATUS rpccli_spoolss_RouterRefreshPrinterChangeNotification(struct
rpc_pipe_client *cli,
- TALLOC_CTX
*mem_ctx,
- WERROR *werror)
+NTSTATUS rpccli_spoolss_RouterReplyPrinterEx(struct rpc_pipe_client *cli,
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror)
{
- struct spoolss_RouterRefreshPrinterChangeNotification r;
+ struct spoolss_RouterReplyPrinterEx r;
NTSTATUS status;
/* In parameters */
if (DEBUGLEVEL >= 10) {
-
NDR_PRINT_IN_DEBUG(spoolss_RouterRefreshPrinterChangeNotification, &r);
+ NDR_PRINT_IN_DEBUG(spoolss_RouterReplyPrinterEx, &r);
}
status = cli->dispatch(cli,
mem_ctx,
&ndr_table_spoolss,
-
NDR_SPOOLSS_ROUTERREFRESHPRINTERCHANGENOTIFICATION,
+ NDR_SPOOLSS_ROUTERREPLYPRINTEREX,
&r);
if (!NT_STATUS_IS_OK(status)) {
@@ -3131,7 +3131,7 @@ NTSTATUS
rpccli_spoolss_RouterRefreshPrinterChangeNotification(struct rpc_pipe_c
}
if (DEBUGLEVEL >= 10) {
-
NDR_PRINT_OUT_DEBUG(spoolss_RouterRefreshPrinterChangeNotification, &r);
+ NDR_PRINT_OUT_DEBUG(spoolss_RouterReplyPrinterEx, &r);
}
if (NT_STATUS_IS_ERR(status)) {
@@ -3148,15 +3148,15 @@ NTSTATUS
rpccli_spoolss_RouterRefreshPrinterChangeNotification(struct rpc_pipe_c
return werror_to_ntstatus(r.out.result);
}
-NTSTATUS rpccli_spoolss_RemoteFindNextPrinterChangeNotifyEx(struct
rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- struct
policy_handle *handle /* [in] [ref] */,
- uint32_t change_low
/* [in] */,
- struct
spoolss_NotifyOptionsContainer *container /* [in] [unique] */,
- struct
spoolss_NotifyInfo **info /* [out] [ref] */,
- WERROR *werror)
+NTSTATUS rpccli_spoolss_RouterRefreshPrinterChangeNotify(struct
rpc_pipe_client *cli,
+ TALLOC_CTX *mem_ctx,
+ struct policy_handle
*handle /* [in] [ref] */,
+ uint32_t change_low /*
[in] */,
+ struct
spoolss_NotifyOptionsContainer *container /* [in] [unique] */,
+ struct
spoolss_NotifyInfo **info /* [out] [ref] */,
+ WERROR *werror)
{
- struct spoolss_RemoteFindNextPrinterChangeNotifyEx r;
+ struct spoolss_RouterRefreshPrinterChangeNotify r;
NTSTATUS status;
/* In parameters */
@@ -3165,13 +3165,13 @@ NTSTATUS
rpccli_spoolss_RemoteFindNextPrinterChangeNotifyEx(struct rpc_pipe_clie
r.in.container = container;
if (DEBUGLEVEL >= 10) {
- NDR_PRINT_IN_DEBUG(spoolss_RemoteFindNextPrinterChangeNotifyEx,
&r);
+ NDR_PRINT_IN_DEBUG(spoolss_RouterRefreshPrinterChangeNotify,
&r);
}
status = cli->dispatch(cli,
mem_ctx,
&ndr_table_spoolss,
- NDR_SPOOLSS_REMOTEFINDNEXTPRINTERCHANGENOTIFYEX,
+ NDR_SPOOLSS_ROUTERREFRESHPRINTERCHANGENOTIFY,
&r);
if (!NT_STATUS_IS_OK(status)) {
@@ -3179,7 +3179,7 @@ NTSTATUS
rpccli_spoolss_RemoteFindNextPrinterChangeNotifyEx(struct rpc_pipe_clie
}
if (DEBUGLEVEL >= 10) {
-
NDR_PRINT_OUT_DEBUG(spoolss_RemoteFindNextPrinterChangeNotifyEx, &r);
+ NDR_PRINT_OUT_DEBUG(spoolss_RouterRefreshPrinterChangeNotify,
&r);
}
if (NT_STATUS_IS_ERR(status)) {
diff --git a/librpc/gen_ndr/cli_spoolss.h b/librpc/gen_ndr/cli_spoolss.h
index 25000a4..4f04b93 100644
--- a/librpc/gen_ndr/cli_spoolss.h
+++ b/librpc/gen_ndr/cli_spoolss.h
@@ -382,16 +382,16 @@ NTSTATUS
rpccli_spoolss_RemoteFindFirstPrinterChangeNotifyEx(struct rpc_pipe_cli
uint32_t
printer_local /* [in] */,
struct
spoolss_NotifyOptionsContainer *t1 /* [in] [unique] */,
WERROR *werror);
-NTSTATUS rpccli_spoolss_RouterRefreshPrinterChangeNotification(struct
rpc_pipe_client *cli,
- TALLOC_CTX
*mem_ctx,
- WERROR *werror);
-NTSTATUS rpccli_spoolss_RemoteFindNextPrinterChangeNotifyEx(struct
rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- struct
policy_handle *handle /* [in] [ref] */,
- uint32_t change_low
/* [in] */,
- struct
spoolss_NotifyOptionsContainer *container /* [in] [unique] */,
- struct
spoolss_NotifyInfo **info /* [out] [ref] */,
- WERROR *werror);
+NTSTATUS rpccli_spoolss_RouterReplyPrinterEx(struct rpc_pipe_client *cli,
+ TALLOC_CTX *mem_ctx,
+ WERROR *werror);
+NTSTATUS rpccli_spoolss_RouterRefreshPrinterChangeNotify(struct
rpc_pipe_client *cli,
+ TALLOC_CTX *mem_ctx,
+ struct policy_handle
*handle /* [in] [ref] */,
+ uint32_t change_low /*
[in] */,
+ struct
spoolss_NotifyOptionsContainer *container /* [in] [unique] */,
+ struct
spoolss_NotifyInfo **info /* [out] [ref] */,
+ WERROR *werror);
NTSTATUS rpccli_spoolss_44(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
WERROR *werror);
diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index 9ef5d37..2add938 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -16638,7 +16638,7 @@ _PUBLIC_ void
ndr_print_spoolss_RemoteFindFirstPrinterChangeNotifyEx(struct ndr_
ndr->depth--;
}
-static enum ndr_err_code
ndr_push_spoolss_RouterRefreshPrinterChangeNotification(struct ndr_push *ndr,
int flags, const struct spoolss_RouterRefreshPrinterChangeNotification *r)
+static enum ndr_err_code ndr_push_spoolss_RouterReplyPrinterEx(struct ndr_push
*ndr, int flags, const struct spoolss_RouterReplyPrinterEx *r)
{
if (flags & NDR_IN) {
}
@@ -16648,7 +16648,7 @@ static enum ndr_err_code
ndr_push_spoolss_RouterRefreshPrinterChangeNotification
return NDR_ERR_SUCCESS;
}
-static enum ndr_err_code
ndr_pull_spoolss_RouterRefreshPrinterChangeNotification(struct ndr_pull *ndr,
int flags, struct spoolss_RouterRefreshPrinterChangeNotification *r)
+static enum ndr_err_code ndr_pull_spoolss_RouterReplyPrinterEx(struct ndr_pull
*ndr, int flags, struct spoolss_RouterReplyPrinterEx *r)
{
if (flags & NDR_IN) {
}
@@ -16658,20 +16658,20 @@ static enum ndr_err_code
ndr_pull_spoolss_RouterRefreshPrinterChangeNotification
return NDR_ERR_SUCCESS;
}
-_PUBLIC_ void ndr_print_spoolss_RouterRefreshPrinterChangeNotification(struct
ndr_print *ndr, const char *name, int flags, const struct
spoolss_RouterRefreshPrinterChangeNotification *r)
+_PUBLIC_ void ndr_print_spoolss_RouterReplyPrinterEx(struct ndr_print *ndr,
const char *name, int flags, const struct spoolss_RouterReplyPrinterEx *r)
{
- ndr_print_struct(ndr, name,
"spoolss_RouterRefreshPrinterChangeNotification");
+ ndr_print_struct(ndr, name, "spoolss_RouterReplyPrinterEx");
ndr->depth++;
if (flags & NDR_SET_VALUES) {
ndr->flags |= LIBNDR_PRINT_SET_VALUES;
}
if (flags & NDR_IN) {
- ndr_print_struct(ndr, "in",
"spoolss_RouterRefreshPrinterChangeNotification");
+ ndr_print_struct(ndr, "in", "spoolss_RouterReplyPrinterEx");
ndr->depth++;
ndr->depth--;
}
if (flags & NDR_OUT) {
- ndr_print_struct(ndr, "out",
"spoolss_RouterRefreshPrinterChangeNotification");
+ ndr_print_struct(ndr, "out", "spoolss_RouterReplyPrinterEx");
ndr->depth++;
ndr_print_WERROR(ndr, "result", r->out.result);
ndr->depth--;
@@ -16679,7 +16679,7 @@ _PUBLIC_ void
ndr_print_spoolss_RouterRefreshPrinterChangeNotification(struct nd
ndr->depth--;
}
-_PUBLIC_ enum ndr_err_code
ndr_push_spoolss_RemoteFindNextPrinterChangeNotifyEx(struct ndr_push *ndr, int
flags, const struct spoolss_RemoteFindNextPrinterChangeNotifyEx *r)
+_PUBLIC_ enum ndr_err_code
ndr_push_spoolss_RouterRefreshPrinterChangeNotify(struct ndr_push *ndr, int
flags, const struct spoolss_RouterRefreshPrinterChangeNotify *r)
{
if (flags & NDR_IN) {
if (r->in.handle == NULL) {
@@ -16705,7 +16705,7 @@ _PUBLIC_ enum ndr_err_code
ndr_push_spoolss_RemoteFindNextPrinterChangeNotifyEx(
return NDR_ERR_SUCCESS;
}
-_PUBLIC_ enum ndr_err_code
ndr_pull_spoolss_RemoteFindNextPrinterChangeNotifyEx(struct ndr_pull *ndr, int
flags, struct spoolss_RemoteFindNextPrinterChangeNotifyEx *r)
+_PUBLIC_ enum ndr_err_code
ndr_pull_spoolss_RouterRefreshPrinterChangeNotify(struct ndr_pull *ndr, int
flags, struct spoolss_RouterRefreshPrinterChangeNotify *r)
{
uint32_t _ptr_container;
uint32_t _ptr_info;
@@ -16763,15 +16763,15 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_spoolss_RemoteFindNextPrinterChangeNotifyEx(
return NDR_ERR_SUCCESS;
}
-_PUBLIC_ void ndr_print_spoolss_RemoteFindNextPrinterChangeNotifyEx(struct
ndr_print *ndr, const char *name, int flags, const struct
spoolss_RemoteFindNextPrinterChangeNotifyEx *r)
+_PUBLIC_ void ndr_print_spoolss_RouterRefreshPrinterChangeNotify(struct
ndr_print *ndr, const char *name, int flags, const struct
spoolss_RouterRefreshPrinterChangeNotify *r)
{
- ndr_print_struct(ndr, name,
"spoolss_RemoteFindNextPrinterChangeNotifyEx");
+ ndr_print_struct(ndr, name, "spoolss_RouterRefreshPrinterChangeNotify");
ndr->depth++;
if (flags & NDR_SET_VALUES) {
ndr->flags |= LIBNDR_PRINT_SET_VALUES;
}
if (flags & NDR_IN) {
- ndr_print_struct(ndr, "in",
"spoolss_RemoteFindNextPrinterChangeNotifyEx");
+ ndr_print_struct(ndr, "in",
"spoolss_RouterRefreshPrinterChangeNotify");
ndr->depth++;
ndr_print_ptr(ndr, "handle", r->in.handle);
ndr->depth++;
@@ -16787,7 +16787,7 @@ _PUBLIC_ void
ndr_print_spoolss_RemoteFindNextPrinterChangeNotifyEx(struct ndr_p
ndr->depth--;
}
if (flags & NDR_OUT) {
- ndr_print_struct(ndr, "out",
"spoolss_RemoteFindNextPrinterChangeNotifyEx");
+ ndr_print_struct(ndr, "out",
"spoolss_RouterRefreshPrinterChangeNotify");
ndr->depth++;
ndr_print_ptr(ndr, "info", r->out.info);
ndr->depth++;
@@ -19414,19 +19414,19 @@ static const struct ndr_interface_call
spoolss_calls[] = {
false,
},
{
- "spoolss_RouterRefreshPrinterChangeNotification",
- sizeof(struct spoolss_RouterRefreshPrinterChangeNotification),
- (ndr_push_flags_fn_t)
ndr_push_spoolss_RouterRefreshPrinterChangeNotification,
- (ndr_pull_flags_fn_t)
ndr_pull_spoolss_RouterRefreshPrinterChangeNotification,
- (ndr_print_function_t)
ndr_print_spoolss_RouterRefreshPrinterChangeNotification,
+ "spoolss_RouterReplyPrinterEx",
+ sizeof(struct spoolss_RouterReplyPrinterEx),
+ (ndr_push_flags_fn_t) ndr_push_spoolss_RouterReplyPrinterEx,
+ (ndr_pull_flags_fn_t) ndr_pull_spoolss_RouterReplyPrinterEx,
+ (ndr_print_function_t) ndr_print_spoolss_RouterReplyPrinterEx,
false,
},
{
- "spoolss_RemoteFindNextPrinterChangeNotifyEx",
- sizeof(struct spoolss_RemoteFindNextPrinterChangeNotifyEx),
- (ndr_push_flags_fn_t)
ndr_push_spoolss_RemoteFindNextPrinterChangeNotifyEx,
- (ndr_pull_flags_fn_t)
ndr_pull_spoolss_RemoteFindNextPrinterChangeNotifyEx,
- (ndr_print_function_t)
ndr_print_spoolss_RemoteFindNextPrinterChangeNotifyEx,
+ "spoolss_RouterRefreshPrinterChangeNotify",
+ sizeof(struct spoolss_RouterRefreshPrinterChangeNotify),
+ (ndr_push_flags_fn_t)
ndr_push_spoolss_RouterRefreshPrinterChangeNotify,
+ (ndr_pull_flags_fn_t)
ndr_pull_spoolss_RouterRefreshPrinterChangeNotify,
+ (ndr_print_function_t)
ndr_print_spoolss_RouterRefreshPrinterChangeNotify,
false,
},
{
diff --git a/librpc/gen_ndr/ndr_spoolss.h b/librpc/gen_ndr/ndr_spoolss.h
index 6240290..60ee538 100644
--- a/librpc/gen_ndr/ndr_spoolss.h
+++ b/librpc/gen_ndr/ndr_spoolss.h
@@ -144,9 +144,9 @@ extern const struct ndr_interface_table ndr_table_spoolss;
#define NDR_SPOOLSS_REMOTEFINDFIRSTPRINTERCHANGENOTIFYEX (0x41)
-#define NDR_SPOOLSS_ROUTERREFRESHPRINTERCHANGENOTIFICATION (0x42)
+#define NDR_SPOOLSS_ROUTERREPLYPRINTEREX (0x42)
-#define NDR_SPOOLSS_REMOTEFINDNEXTPRINTERCHANGENOTIFYEX (0x43)
+#define NDR_SPOOLSS_ROUTERREFRESHPRINTERCHANGENOTIFY (0x43)
#define NDR_SPOOLSS_44 (0x44)
@@ -473,10 +473,10 @@ void ndr_print_spoolss_ResetPrinterEx(struct ndr_print
*ndr, const char *name, i
enum ndr_err_code ndr_push_spoolss_RemoteFindFirstPrinterChangeNotifyEx(struct
ndr_push *ndr, int flags, const struct
spoolss_RemoteFindFirstPrinterChangeNotifyEx *r);
enum ndr_err_code ndr_pull_spoolss_RemoteFindFirstPrinterChangeNotifyEx(struct
ndr_pull *ndr, int flags, struct spoolss_RemoteFindFirstPrinterChangeNotifyEx
*r);
void ndr_print_spoolss_RemoteFindFirstPrinterChangeNotifyEx(struct ndr_print
*ndr, const char *name, int flags, const struct
spoolss_RemoteFindFirstPrinterChangeNotifyEx *r);
-void ndr_print_spoolss_RouterRefreshPrinterChangeNotification(struct ndr_print
*ndr, const char *name, int flags, const struct
spoolss_RouterRefreshPrinterChangeNotification *r);
-enum ndr_err_code ndr_push_spoolss_RemoteFindNextPrinterChangeNotifyEx(struct
ndr_push *ndr, int flags, const struct
spoolss_RemoteFindNextPrinterChangeNotifyEx *r);
-enum ndr_err_code ndr_pull_spoolss_RemoteFindNextPrinterChangeNotifyEx(struct
ndr_pull *ndr, int flags, struct spoolss_RemoteFindNextPrinterChangeNotifyEx
*r);
-void ndr_print_spoolss_RemoteFindNextPrinterChangeNotifyEx(struct ndr_print
*ndr, const char *name, int flags, const struct
spoolss_RemoteFindNextPrinterChangeNotifyEx *r);
+void ndr_print_spoolss_RouterReplyPrinterEx(struct ndr_print *ndr, const char
*name, int flags, const struct spoolss_RouterReplyPrinterEx *r);
+enum ndr_err_code ndr_push_spoolss_RouterRefreshPrinterChangeNotify(struct
ndr_push *ndr, int flags, const struct spoolss_RouterRefreshPrinterChangeNotify
*r);
+enum ndr_err_code ndr_pull_spoolss_RouterRefreshPrinterChangeNotify(struct
ndr_pull *ndr, int flags, struct spoolss_RouterRefreshPrinterChangeNotify *r);
+void ndr_print_spoolss_RouterRefreshPrinterChangeNotify(struct ndr_print *ndr,
const char *name, int flags, const struct
spoolss_RouterRefreshPrinterChangeNotify *r);
void ndr_print_spoolss_44(struct ndr_print *ndr, const char *name, int flags,
const struct spoolss_44 *r);
enum ndr_err_code ndr_push_spoolss_OpenPrinterEx(struct ndr_push *ndr, int
flags, const struct spoolss_OpenPrinterEx *r);
enum ndr_err_code ndr_pull_spoolss_OpenPrinterEx(struct ndr_pull *ndr, int
flags, struct spoolss_OpenPrinterEx *r);
diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h
index 4e854db..61a2367 100644
--- a/librpc/gen_ndr/spoolss.h
+++ b/librpc/gen_ndr/spoolss.h
@@ -2017,7 +2017,7 @@ struct spoolss_RemoteFindFirstPrinterChangeNotifyEx {
};
-struct spoolss_RouterRefreshPrinterChangeNotification {
+struct spoolss_RouterReplyPrinterEx {
struct {
WERROR result;
} out;
@@ -2025,7 +2025,7 @@ struct spoolss_RouterRefreshPrinterChangeNotification {
};
-struct spoolss_RemoteFindNextPrinterChangeNotifyEx {
+struct spoolss_RouterRefreshPrinterChangeNotify {
struct {
struct policy_handle *handle;/* [ref] */
uint32_t change_low;
diff --git a/librpc/gen_ndr/srv_spoolss.c b/librpc/gen_ndr/srv_spoolss.c
index c6f5d62..60dc2f0 100644
--- a/librpc/gen_ndr/srv_spoolss.c
+++ b/librpc/gen_ndr/srv_spoolss.c
@@ -5058,18 +5058,18 @@ static bool
api_spoolss_RemoteFindFirstPrinterChangeNotifyEx(pipes_struct *p)
return true;
}
-static bool api_spoolss_RouterRefreshPrinterChangeNotification(pipes_struct *p)
+static bool api_spoolss_RouterReplyPrinterEx(pipes_struct *p)
{
const struct ndr_interface_call *call;
struct ndr_pull *pull;
struct ndr_push *push;
enum ndr_err_code ndr_err;
DATA_BLOB blob;
- struct spoolss_RouterRefreshPrinterChangeNotification *r;
+ struct spoolss_RouterReplyPrinterEx *r;
- call =
&ndr_table_spoolss.calls[NDR_SPOOLSS_ROUTERREFRESHPRINTERCHANGENOTIFICATION];
+ call = &ndr_table_spoolss.calls[NDR_SPOOLSS_ROUTERREPLYPRINTEREX];
- r = talloc(talloc_tos(), struct
spoolss_RouterRefreshPrinterChangeNotification);
+ r = talloc(talloc_tos(), struct spoolss_RouterReplyPrinterEx);
if (r == NULL) {
return false;
}
@@ -5093,10 +5093,10 @@ static bool
api_spoolss_RouterRefreshPrinterChangeNotification(pipes_struct *p)
}
if (DEBUGLEVEL >= 10) {
-
NDR_PRINT_IN_DEBUG(spoolss_RouterRefreshPrinterChangeNotification, r);
+ NDR_PRINT_IN_DEBUG(spoolss_RouterReplyPrinterEx, r);
}
- r->out.result = _spoolss_RouterRefreshPrinterChangeNotification(p, r);
+ r->out.result = _spoolss_RouterReplyPrinterEx(p, r);
if (p->rng_fault_state) {
talloc_free(r);
@@ -5105,7 +5105,7 @@ static bool
api_spoolss_RouterRefreshPrinterChangeNotification(pipes_struct *p)
}
if (DEBUGLEVEL >= 10) {
-
NDR_PRINT_OUT_DEBUG(spoolss_RouterRefreshPrinterChangeNotification, r);
+ NDR_PRINT_OUT_DEBUG(spoolss_RouterReplyPrinterEx, r);
}
push = ndr_push_init_ctx(r, NULL);
@@ -5131,18 +5131,18 @@ static bool
api_spoolss_RouterRefreshPrinterChangeNotification(pipes_struct *p)
return true;
}
-static bool api_spoolss_RemoteFindNextPrinterChangeNotifyEx(pipes_struct *p)
+static bool api_spoolss_RouterRefreshPrinterChangeNotify(pipes_struct *p)
{
const struct ndr_interface_call *call;
struct ndr_pull *pull;
struct ndr_push *push;
enum ndr_err_code ndr_err;
DATA_BLOB blob;
- struct spoolss_RemoteFindNextPrinterChangeNotifyEx *r;
+ struct spoolss_RouterRefreshPrinterChangeNotify *r;
- call =
&ndr_table_spoolss.calls[NDR_SPOOLSS_REMOTEFINDNEXTPRINTERCHANGENOTIFYEX];
+ call =
&ndr_table_spoolss.calls[NDR_SPOOLSS_ROUTERREFRESHPRINTERCHANGENOTIFY];
- r = talloc(talloc_tos(), struct
spoolss_RemoteFindNextPrinterChangeNotifyEx);
+ r = talloc(talloc_tos(), struct
spoolss_RouterRefreshPrinterChangeNotify);
if (r == NULL) {
return false;
}
@@ -5166,7 +5166,7 @@ static bool
api_spoolss_RemoteFindNextPrinterChangeNotifyEx(pipes_struct *p)
}
if (DEBUGLEVEL >= 10) {
- NDR_PRINT_IN_DEBUG(spoolss_RemoteFindNextPrinterChangeNotifyEx,
r);
+ NDR_PRINT_IN_DEBUG(spoolss_RouterRefreshPrinterChangeNotify, r);
}
ZERO_STRUCT(r->out);
@@ -5176,7 +5176,7 @@ static bool
api_spoolss_RemoteFindNextPrinterChangeNotifyEx(pipes_struct *p)
return false;
}
- r->out.result = _spoolss_RemoteFindNextPrinterChangeNotifyEx(p, r);
+ r->out.result = _spoolss_RouterRefreshPrinterChangeNotify(p, r);
if (p->rng_fault_state) {
talloc_free(r);
@@ -5185,7 +5185,7 @@ static bool
api_spoolss_RemoteFindNextPrinterChangeNotifyEx(pipes_struct *p)
}
if (DEBUGLEVEL >= 10) {
-
NDR_PRINT_OUT_DEBUG(spoolss_RemoteFindNextPrinterChangeNotifyEx, r);
+ NDR_PRINT_OUT_DEBUG(spoolss_RouterRefreshPrinterChangeNotify,
r);
}
push = ndr_push_init_ctx(r, NULL);
@@ -7428,8 +7428,8 @@ static struct api_struct api_spoolss_cmds[] =
{"SPOOLSS_SPOOLERINIT", NDR_SPOOLSS_SPOOLERINIT,
api_spoolss_SpoolerInit},
{"SPOOLSS_RESETPRINTEREX", NDR_SPOOLSS_RESETPRINTEREX,
api_spoolss_ResetPrinterEx},
{"SPOOLSS_REMOTEFINDFIRSTPRINTERCHANGENOTIFYEX",
NDR_SPOOLSS_REMOTEFINDFIRSTPRINTERCHANGENOTIFYEX,
api_spoolss_RemoteFindFirstPrinterChangeNotifyEx},
- {"SPOOLSS_ROUTERREFRESHPRINTERCHANGENOTIFICATION",
NDR_SPOOLSS_ROUTERREFRESHPRINTERCHANGENOTIFICATION,
api_spoolss_RouterRefreshPrinterChangeNotification},
- {"SPOOLSS_REMOTEFINDNEXTPRINTERCHANGENOTIFYEX",
NDR_SPOOLSS_REMOTEFINDNEXTPRINTERCHANGENOTIFYEX,
api_spoolss_RemoteFindNextPrinterChangeNotifyEx},
+ {"SPOOLSS_ROUTERREPLYPRINTEREX", NDR_SPOOLSS_ROUTERREPLYPRINTEREX,
api_spoolss_RouterReplyPrinterEx},
+ {"SPOOLSS_ROUTERREFRESHPRINTERCHANGENOTIFY",
NDR_SPOOLSS_ROUTERREFRESHPRINTERCHANGENOTIFY,
api_spoolss_RouterRefreshPrinterChangeNotify},
{"SPOOLSS_44", NDR_SPOOLSS_44, api_spoolss_44},
{"SPOOLSS_OPENPRINTEREX", NDR_SPOOLSS_OPENPRINTEREX,
api_spoolss_OpenPrinterEx},
{"SPOOLSS_ADDPRINTEREX", NDR_SPOOLSS_ADDPRINTEREX,
api_spoolss_AddPrinterEx},
@@ -8069,21 +8069,21 @@ NTSTATUS rpc_spoolss_dispatch(struct rpc_pipe_client
*cli, TALLOC_CTX *mem_ctx,
return NT_STATUS_OK;
}
- case NDR_SPOOLSS_ROUTERREFRESHPRINTERCHANGENOTIFICATION: {
- struct spoolss_RouterRefreshPrinterChangeNotification
*r = (struct spoolss_RouterRefreshPrinterChangeNotification *)_r;
- r->out.result =
_spoolss_RouterRefreshPrinterChangeNotification(cli->pipes_struct, r);
+ case NDR_SPOOLSS_ROUTERREPLYPRINTEREX: {
+ struct spoolss_RouterReplyPrinterEx *r = (struct
spoolss_RouterReplyPrinterEx *)_r;
+ r->out.result =
_spoolss_RouterReplyPrinterEx(cli->pipes_struct, r);
return NT_STATUS_OK;
}
- case NDR_SPOOLSS_REMOTEFINDNEXTPRINTERCHANGENOTIFYEX: {
- struct spoolss_RemoteFindNextPrinterChangeNotifyEx *r =
(struct spoolss_RemoteFindNextPrinterChangeNotifyEx *)_r;
+ case NDR_SPOOLSS_ROUTERREFRESHPRINTERCHANGENOTIFY: {
+ struct spoolss_RouterRefreshPrinterChangeNotify *r =
(struct spoolss_RouterRefreshPrinterChangeNotify *)_r;
ZERO_STRUCT(r->out);
r->out.info = talloc_zero(mem_ctx, struct
spoolss_NotifyInfo *);
if (r->out.info == NULL) {
return NT_STATUS_NO_MEMORY;
}
- r->out.result =
_spoolss_RemoteFindNextPrinterChangeNotifyEx(cli->pipes_struct, r);
+ r->out.result =
_spoolss_RouterRefreshPrinterChangeNotify(cli->pipes_struct, r);
return NT_STATUS_OK;
}
diff --git a/librpc/gen_ndr/srv_spoolss.h b/librpc/gen_ndr/srv_spoolss.h
index 82e9faf..da31eb7 100644
--- a/librpc/gen_ndr/srv_spoolss.h
+++ b/librpc/gen_ndr/srv_spoolss.h
@@ -67,8 +67,8 @@ WERROR
_spoolss_RouterFindFirstPrinterChangeNotification(pipes_struct *p, struct
WERROR _spoolss_SpoolerInit(pipes_struct *p, struct spoolss_SpoolerInit *r);
WERROR _spoolss_ResetPrinterEx(pipes_struct *p, struct spoolss_ResetPrinterEx
*r);
WERROR _spoolss_RemoteFindFirstPrinterChangeNotifyEx(pipes_struct *p, struct
spoolss_RemoteFindFirstPrinterChangeNotifyEx *r);
-WERROR _spoolss_RouterRefreshPrinterChangeNotification(pipes_struct *p, struct
spoolss_RouterRefreshPrinterChangeNotification *r);
-WERROR _spoolss_RemoteFindNextPrinterChangeNotifyEx(pipes_struct *p, struct
spoolss_RemoteFindNextPrinterChangeNotifyEx *r);
+WERROR _spoolss_RouterReplyPrinterEx(pipes_struct *p, struct
spoolss_RouterReplyPrinterEx *r);
+WERROR _spoolss_RouterRefreshPrinterChangeNotify(pipes_struct *p, struct
spoolss_RouterRefreshPrinterChangeNotify *r);
WERROR _spoolss_44(pipes_struct *p, struct spoolss_44 *r);
WERROR _spoolss_OpenPrinterEx(pipes_struct *p, struct spoolss_OpenPrinterEx
*r);
WERROR _spoolss_AddPrinterEx(pipes_struct *p, struct spoolss_AddPrinterEx *r);
@@ -165,8 +165,8 @@ WERROR
_spoolss_RouterFindFirstPrinterChangeNotification(pipes_struct *p, struct
WERROR _spoolss_SpoolerInit(pipes_struct *p, struct spoolss_SpoolerInit *r);
WERROR _spoolss_ResetPrinterEx(pipes_struct *p, struct spoolss_ResetPrinterEx
*r);
WERROR _spoolss_RemoteFindFirstPrinterChangeNotifyEx(pipes_struct *p, struct
spoolss_RemoteFindFirstPrinterChangeNotifyEx *r);
-WERROR _spoolss_RouterRefreshPrinterChangeNotification(pipes_struct *p, struct
spoolss_RouterRefreshPrinterChangeNotification *r);
-WERROR _spoolss_RemoteFindNextPrinterChangeNotifyEx(pipes_struct *p, struct
spoolss_RemoteFindNextPrinterChangeNotifyEx *r);
+WERROR _spoolss_RouterReplyPrinterEx(pipes_struct *p, struct
spoolss_RouterReplyPrinterEx *r);
+WERROR _spoolss_RouterRefreshPrinterChangeNotify(pipes_struct *p, struct
spoolss_RouterRefreshPrinterChangeNotify *r);
WERROR _spoolss_44(pipes_struct *p, struct spoolss_44 *r);
WERROR _spoolss_OpenPrinterEx(pipes_struct *p, struct spoolss_OpenPrinterEx
*r);
WERROR _spoolss_AddPrinterEx(pipes_struct *p, struct spoolss_AddPrinterEx *r);
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index 294ab50..af3312a 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -1442,7 +1442,7 @@ import "misc.idl", "security.idl", "winreg.idl";
/******************/
/* Function: 0x42 */
- [todo] WERROR spoolss_RouterRefreshPrinterChangeNotification(
+ [todo] WERROR spoolss_RouterReplyPrinterEx(
);
typedef struct {
@@ -1489,7 +1489,7 @@ import "misc.idl", "security.idl", "winreg.idl";
/******************/
/* Function: 0x43 */
- [public] WERROR spoolss_RemoteFindNextPrinterChangeNotifyEx(
+ [public] WERROR spoolss_RouterRefreshPrinterChangeNotify(
[in,ref] policy_handle *handle,
[in] uint32 change_low,
[in,unique] spoolss_NotifyOptionsContainer *container,
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index 36984fc..204078d 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -7381,6 +7381,8 @@ WERROR _spoolss_GetForm(pipes_struct *p,
return WERR_BADFID;
}
+ ZERO_STRUCT(form_1);
+
switch (level) {
case 1:
if (foundBuiltin) {
@@ -10473,22 +10475,22 @@ WERROR
_spoolss_RemoteFindFirstPrinterChangeNotifyEx(pipes_struct *p,
}
--
Samba Shared Repository
