The branch, master has been updated
via 9bfca0bea0521b41c7bbf1ccbd35ce2e4cbb31ef (commit)
via 2f44170836a2011e65c069109f7153568834bc12 (commit)
from 6b19c396970f527fc0527c736acdce22de2917ae (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9bfca0bea0521b41c7bbf1ccbd35ce2e4cbb31ef
Author: Günther Deschner <[email protected]>
Date: Sat Feb 7 01:49:55 2009 +0100
s4-spoolss: try to fix dcesrv_spoolss_GetPrinterData.
Guenther
commit 2f44170836a2011e65c069109f7153568834bc12
Author: Günther Deschner <[email protected]>
Date: Sat Feb 7 00:51:05 2009 +0100
spoolss: fix ndr_pull_spoolss_GetPrinterData.
Guenther
-----------------------------------------------------------------------
Summary of changes:
librpc/ndr/ndr_spoolss_buf.c | 2 +-
source4/rpc_server/spoolss/dcesrv_spoolss.c | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/ndr/ndr_spoolss_buf.c b/librpc/ndr/ndr_spoolss_buf.c
index c18f31a..0ab017e 100644
--- a/librpc/ndr/ndr_spoolss_buf.c
+++ b/librpc/ndr/ndr_spoolss_buf.c
@@ -481,7 +481,7 @@ enum ndr_err_code ndr_pull_spoolss_GetPrinterData(struct
ndr_pull *ndr, int flag
NDR_CHECK(ndr_pull___spoolss_GetPrinterData(_ndr_data,
flags, &__r));
r->out.data = __r.out.data;
} else {
- r->out.type = SPOOLSS_PRINTER_DATA_TYPE_NULL;
+ *r->out.type = SPOOLSS_PRINTER_DATA_TYPE_NULL;
}
}
return NDR_ERR_SUCCESS;
diff --git a/source4/rpc_server/spoolss/dcesrv_spoolss.c
b/source4/rpc_server/spoolss/dcesrv_spoolss.c
index 2ba1a65..e137497 100644
--- a/source4/rpc_server/spoolss/dcesrv_spoolss.c
+++ b/source4/rpc_server/spoolss/dcesrv_spoolss.c
@@ -564,6 +564,9 @@ static WERROR dcesrv_spoolss_GetPrinterData(struct
dcesrv_call_state *dce_call,
if (!handle)
return WERR_BADFID;
+ r->out.type = talloc_zero(mem_ctx, enum spoolss_PrinterDataType);
+ W_ERROR_HAVE_NO_MEMORY(r->out.type);
+
switch (handle->type) {
case NTPTR_HANDLE_SERVER:
status = ntptr_GetPrintServerData(handle, mem_ctx, r);
--
Samba Shared Repository
