The branch, v3-4-test has been updated
via 4a4047c3b08412cfdd8c03b1994a925e10fc4c4a (commit)
via 55fc8bb906293b5d2a2ae0a6e64bdc7ef046b230 (commit)
via e6ff89bf11c14736863057e4b4db7ec9c3c71856 (commit)
via 9beaaddb4be46960576306b055f1cbbb05d4dae7 (commit)
via f017b26f35ffeb8796f2ee97e5c29b896da1e7ac (commit)
via 895945637c7cbcf70695cb8fbabf364ebff85548 (commit)
from b8251a7e01304afce96cb0bee15a1fee2bd57490 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit 4a4047c3b08412cfdd8c03b1994a925e10fc4c4a
Author: Günther Deschner <[email protected]>
Date: Fri Apr 10 03:28:49 2009 +0200
s3-spoolss: implement dummy _spoolss_AddPort().
Guenther
(cherry picked from commit bc5cd077643bc73d93fa73970761f8d1708d14a9)
commit 55fc8bb906293b5d2a2ae0a6e64bdc7ef046b230
Author: Günther Deschner <[email protected]>
Date: Fri Apr 10 03:28:17 2009 +0200
s3-spoolss: add support for level 8 in _spoolss_GetPrinter().
Guenther
(cherry picked from commit 65ee4ae30b952841e97f54c5eaa4d43ca66a02c1)
commit e6ff89bf11c14736863057e4b4db7ec9c3c71856
Author: Günther Deschner <[email protected]>
Date: Wed Apr 8 18:32:06 2009 +0200
s3-eventlog: implement _eventlog_FlushEventLog().
Guenther
(cherry picked from commit bcd042e595d63eae8cfc9e9d51e9567a4f9ccc63)
commit 9beaaddb4be46960576306b055f1cbbb05d4dae7
Author: Günther Deschner <[email protected]>
Date: Wed Apr 8 18:31:32 2009 +0200
s3-eventlog: implement _eventlog_GetLogInformation().
Guenther
(cherry picked from commit 9b585a1282a9211ae101072361aead86d123045e)
commit f017b26f35ffeb8796f2ee97e5c29b896da1e7ac
Author: Günther Deschner <[email protected]>
Date: Wed Apr 8 20:34:24 2009 +0200
s3: re-run make samba3-idl.
Guenther
(cherry picked from commit 2b0293d42b3daecbe41c760a1ea41235d24105d3)
commit 895945637c7cbcf70695cb8fbabf364ebff85548
Author: Günther Deschner <[email protected]>
Date: Wed Apr 8 20:33:58 2009 +0200
eventlog: make EVENTLOG_FULL_INFORMATION a public struct.
Guenther
(cherry picked from commit 7f74f27d6c60d46b51372a2d5c289788038daeb5)
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/eventlog.h | 2 +-
librpc/gen_ndr/ndr_eventlog.c | 30 ++++++++++++++
librpc/gen_ndr/ndr_eventlog.h | 3 +
librpc/idl/eventlog.idl | 2 +-
source3/rpc_server/srv_eventlog_nt.c | 71 ++++++++++++++++++++++++++++------
source3/rpc_server/srv_spoolss_nt.c | 60 +++++++++++++++++++++++-----
6 files changed, 143 insertions(+), 25 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/eventlog.h b/librpc/gen_ndr/eventlog.h
index b6e792f..3895017 100644
--- a/librpc/gen_ndr/eventlog.h
+++ b/librpc/gen_ndr/eventlog.h
@@ -149,7 +149,7 @@ struct EVENTLOG_EVT_FILE {
struct EVENTLOG_FULL_INFORMATION {
uint32_t full;
-};
+}/* [public] */;
struct eventlog_ClearEventLogW {
diff --git a/librpc/gen_ndr/ndr_eventlog.c b/librpc/gen_ndr/ndr_eventlog.c
index 3f19902..33d27db 100644
--- a/librpc/gen_ndr/ndr_eventlog.c
+++ b/librpc/gen_ndr/ndr_eventlog.c
@@ -682,6 +682,36 @@ _PUBLIC_ void ndr_print_EVENTLOG_EVT_FILE(struct ndr_print
*ndr, const char *nam
ndr->depth--;
}
+_PUBLIC_ enum ndr_err_code ndr_push_EVENTLOG_FULL_INFORMATION(struct ndr_push
*ndr, int ndr_flags, const struct EVENTLOG_FULL_INFORMATION *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_push_align(ndr, 4));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->full));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_EVENTLOG_FULL_INFORMATION(struct ndr_pull
*ndr, int ndr_flags, struct EVENTLOG_FULL_INFORMATION *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_pull_align(ndr, 4));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->full));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_EVENTLOG_FULL_INFORMATION(struct ndr_print *ndr, const
char *name, const struct EVENTLOG_FULL_INFORMATION *r)
+{
+ ndr_print_struct(ndr, name, "EVENTLOG_FULL_INFORMATION");
+ ndr->depth++;
+ ndr_print_uint32(ndr, "full", r->full);
+ ndr->depth--;
+}
+
static enum ndr_err_code ndr_push_eventlog_ClearEventLogW(struct ndr_push
*ndr, int flags, const struct eventlog_ClearEventLogW *r)
{
if (flags & NDR_IN) {
diff --git a/librpc/gen_ndr/ndr_eventlog.h b/librpc/gen_ndr/ndr_eventlog.h
index 39f5f1b..6f0d2e0 100644
--- a/librpc/gen_ndr/ndr_eventlog.h
+++ b/librpc/gen_ndr/ndr_eventlog.h
@@ -84,6 +84,9 @@ void ndr_print_EVENTLOGEOF(struct ndr_print *ndr, const char
*name, const struct
enum ndr_err_code ndr_push_EVENTLOG_EVT_FILE(struct ndr_push *ndr, int
ndr_flags, const struct EVENTLOG_EVT_FILE *r);
enum ndr_err_code ndr_pull_EVENTLOG_EVT_FILE(struct ndr_pull *ndr, int
ndr_flags, struct EVENTLOG_EVT_FILE *r);
void ndr_print_EVENTLOG_EVT_FILE(struct ndr_print *ndr, const char *name,
const struct EVENTLOG_EVT_FILE *r);
+enum ndr_err_code ndr_push_EVENTLOG_FULL_INFORMATION(struct ndr_push *ndr, int
ndr_flags, const struct EVENTLOG_FULL_INFORMATION *r);
+enum ndr_err_code ndr_pull_EVENTLOG_FULL_INFORMATION(struct ndr_pull *ndr, int
ndr_flags, struct EVENTLOG_FULL_INFORMATION *r);
+void ndr_print_EVENTLOG_FULL_INFORMATION(struct ndr_print *ndr, const char
*name, const struct EVENTLOG_FULL_INFORMATION *r);
void ndr_print_eventlog_ClearEventLogW(struct ndr_print *ndr, const char
*name, int flags, const struct eventlog_ClearEventLogW *r);
void ndr_print_eventlog_BackupEventLogW(struct ndr_print *ndr, const char
*name, int flags, const struct eventlog_BackupEventLogW *r);
void ndr_print_eventlog_CloseEventLog(struct ndr_print *ndr, const char *name,
int flags, const struct eventlog_CloseEventLog *r);
diff --git a/librpc/idl/eventlog.idl b/librpc/idl/eventlog.idl
index 6b46ace..e269467 100644
--- a/librpc/idl/eventlog.idl
+++ b/librpc/idl/eventlog.idl
@@ -284,7 +284,7 @@ import "lsa.idl", "security.idl";
/*****************/
/* Function 0x16 */
- typedef struct {
+ typedef [public] struct {
boolean32 full;
} EVENTLOG_FULL_INFORMATION;
diff --git a/source3/rpc_server/srv_eventlog_nt.c
b/source3/rpc_server/srv_eventlog_nt.c
index cf07d97..7143ad6 100644
--- a/source3/rpc_server/srv_eventlog_nt.c
+++ b/source3/rpc_server/srv_eventlog_nt.c
@@ -616,6 +616,65 @@ NTSTATUS _eventlog_BackupEventLogW(pipes_struct *p, struct
eventlog_BackupEventL
return NT_STATUS_NOT_IMPLEMENTED;
}
+/********************************************************************
+_eventlog_GetLogInformation
+ ********************************************************************/
+
+NTSTATUS _eventlog_GetLogInformation(pipes_struct *p,
+ struct eventlog_GetLogInformation *r)
+{
+ EVENTLOG_INFO *info = find_eventlog_info_by_hnd(p, r->in.handle);
+ struct EVENTLOG_FULL_INFORMATION f;
+ enum ndr_err_code ndr_err;
+ DATA_BLOB blob;
+
+ if (!info) {
+ return NT_STATUS_INVALID_HANDLE;
+ }
+
+ if (r->in.level != 0) {
+ return NT_STATUS_INVALID_LEVEL;
+ }
+
+ *r->out.bytes_needed = 4;
+
+ if (r->in.buf_size < 4) {
+ return NT_STATUS_BUFFER_TOO_SMALL;
+ }
+
+ /* FIXME: this should be retrieved from the handle */
+ f.full = false;
+
+ ndr_err = ndr_push_struct_blob(&blob, p->mem_ctx, NULL, &f,
+ (ndr_push_flags_fn_t)ndr_push_EVENTLOG_FULL_INFORMATION);
+ if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+ return ndr_map_error2ntstatus(ndr_err);
+ }
+
+ if (DEBUGLEVEL >= 10) {
+ NDR_PRINT_DEBUG(EVENTLOG_FULL_INFORMATION, &f);
+ }
+
+ memcpy(r->out.buffer, blob.data, 4);
+
+ return NT_STATUS_OK;
+}
+
+/********************************************************************
+_eventlog_FlushEventLog
+ ********************************************************************/
+
+NTSTATUS _eventlog_FlushEventLog(pipes_struct *p,
+ struct eventlog_FlushEventLog *r)
+{
+ EVENTLOG_INFO *info = find_eventlog_info_by_hnd(p, r->in.handle);
+ if (!info) {
+ return NT_STATUS_INVALID_HANDLE;
+ }
+
+ return NT_STATUS_ACCESS_DENIED;
+}
+
NTSTATUS _eventlog_DeregisterEventSource(pipes_struct *p, struct
eventlog_DeregisterEventSource *r)
{
p->rng_fault_state = True;
@@ -706,18 +765,6 @@ NTSTATUS _eventlog_WriteClusterEvents(pipes_struct *p,
struct eventlog_WriteClus
return NT_STATUS_NOT_IMPLEMENTED;
}
-NTSTATUS _eventlog_GetLogInformation(pipes_struct *p, struct
eventlog_GetLogInformation *r)
-{
- p->rng_fault_state = True;
- return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-NTSTATUS _eventlog_FlushEventLog(pipes_struct *p, struct
eventlog_FlushEventLog *r)
-{
- p->rng_fault_state = True;
- return NT_STATUS_NOT_IMPLEMENTED;
-}
-
NTSTATUS _eventlog_ReportEventAndSourceW(pipes_struct *p, struct
eventlog_ReportEventAndSourceW *r)
{
p->rng_fault_state = True;
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index 098e592..718f69f 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -4085,6 +4085,39 @@ static WERROR construct_printer_info7(TALLOC_CTX
*mem_ctx,
}
/********************************************************************
+ * construct_printer_info8
+ * fill a spoolss_PrinterInfo8 struct
+ ********************************************************************/
+
+static WERROR construct_printer_info8(TALLOC_CTX *mem_ctx,
+ const NT_PRINTER_INFO_LEVEL *ntprinter,
+ struct spoolss_DeviceModeInfo *r,
+ int snum)
+{
+ struct spoolss_DeviceMode *devmode;
+ WERROR result;
+
+ if (!ntprinter->info_2->devmode) {
+ r->devmode = NULL;
+ return WERR_OK;
+ }
+
+ devmode = TALLOC_ZERO_P(mem_ctx, struct spoolss_DeviceMode);
+ W_ERROR_HAVE_NO_MEMORY(devmode);
+
+ result = convert_nt_devicemode(mem_ctx, devmode,
ntprinter->info_2->devmode);
+ if (!W_ERROR_IS_OK(result)) {
+ TALLOC_FREE(devmode);
+ return result;
+ }
+
+ r->devmode = devmode;
+
+ return WERR_OK;
+}
+
+
+/********************************************************************
* construct_printer_info1
* fill a spoolss_PrinterInfo1 struct
********************************************************************/
@@ -4636,6 +4669,10 @@ WERROR _spoolss_GetPrinter(pipes_struct *p,
result = construct_printer_info7(p->mem_ctx, Printer,
&r->out.info->info7, snum);
break;
+ case 8:
+ result = construct_printer_info8(p->mem_ctx, ntprinter,
+ &r->out.info->info8, snum);
+ break;
default:
result = WERR_UNKNOWN_LEVEL;
break;
@@ -9799,6 +9836,18 @@ WERROR _spoolss_AddPrintProcessor(pipes_struct *p,
}
/****************************************************************
+ _spoolss_AddPort
+****************************************************************/
+
+WERROR _spoolss_AddPort(pipes_struct *p,
+ struct spoolss_AddPort *r)
+{
+ /* do what w2k3 does */
+
+ return WERR_NOT_SUPPORTED;
+}
+
+/****************************************************************
_spoolss_AddPrinter
****************************************************************/
@@ -9843,17 +9892,6 @@ WERROR _spoolss_WaitForPrinterChange(pipes_struct *p,
}
/****************************************************************
- _spoolss_AddPort
-****************************************************************/
-
-WERROR _spoolss_AddPort(pipes_struct *p,
- struct spoolss_AddPort *r)
-{
- p->rng_fault_state = true;
- return WERR_NOT_SUPPORTED;
-}
-
-/****************************************************************
_spoolss_ConfigurePort
****************************************************************/
--
Samba Shared Repository
