sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

added OpenPrinter and a test function. Note that the Samba3 structure

Browse Source 
for OpenPrinter was wrong.
This commit is contained in:
Andrew Tridgell 0001-01-01 00:00:00 +00:00
parent 8301a6b6ad
commit 186ddbbf87
8 changed files with 89 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/include/cli_context.h
View File

@ -161,6 +161,10 @@ struct cli_transport {
/* a list of async requests that are pending on this connection */
struct cli_request *pending_requests;
/* remember the called name - some sub-protocols require us to
know the server name */
struct nmb_name called;
};
/* this is the context for the user */

6
source/libcli/raw/clitransport.c
View File

@ -42,6 +42,8 @@ struct cli_transport *cli_transport_init(struct cli_socket *sock)
cli_null_set_signing(transport);
transport->socket->reference_count++;
ZERO_STRUCT(transport->called);
return transport;
}
@ -71,6 +73,10 @@ BOOL cli_transport_connect(struct cli_transport *transport,
int len = NBT_HDR_SIZE;
struct cli_request *req;
if (called) {
transport->called = *called;
}
/* 445 doesn't have session request */
if (transport->socket->port == 445) {
return True;

7
source/librpc/idl/spoolss.idl
View File

@ -128,7 +128,12 @@
/******************/
/* Function: 0x01 */
NTSTATUS spoolss_01(
WERROR spoolss_OpenPrinter(
[in] unistr *server,
[in] unistr *printer,
[in] DATA_BLOB *buffer,
[in] uint32 access_mask,
[out,ref] policy_handle *handle
);
/******************/

20
source/librpc/ndr/ndr_spoolss.c
View File

@ -292,8 +292,21 @@ NTSTATUS ndr_push_spoolss_EnumPrinters(struct ndr_push *ndr, struct spoolss_Enum
return NT_STATUS_OK;
}
NTSTATUS ndr_push_spoolss_01(struct ndr_push *ndr, struct spoolss_01 *r)
NTSTATUS ndr_push_spoolss_OpenPrinter(struct ndr_push *ndr, struct spoolss_OpenPrinter *r)
{
NDR_CHECK(ndr_push_ptr(ndr, r->in.server));
if (r->in.server) {
NDR_CHECK(ndr_push_unistr(ndr, r->in.server));
}
NDR_CHECK(ndr_push_ptr(ndr, r->in.printer));
if (r->in.printer) {
NDR_CHECK(ndr_push_unistr(ndr, r->in.printer));
}
NDR_CHECK(ndr_push_ptr(ndr, r->in.buffer));
if (r->in.buffer) {
NDR_CHECK(ndr_push_DATA_BLOB(ndr, *r->in.buffer));
}
NDR_CHECK(ndr_push_uint32(ndr, r->in.access_mask));
return NT_STATUS_OK;
}
@ -1249,9 +1262,10 @@ NTSTATUS ndr_pull_spoolss_EnumPrinters(struct ndr_pull *ndr, struct spoolss_Enum
return NT_STATUS_OK;
}
NTSTATUS ndr_pull_spoolss_01(struct ndr_pull *ndr, struct spoolss_01 *r)
NTSTATUS ndr_pull_spoolss_OpenPrinter(struct ndr_pull *ndr, struct spoolss_OpenPrinter *r)
{
NDR_CHECK(ndr_pull_NTSTATUS(ndr, &r->out.result));
NDR_CHECK(ndr_pull_policy_handle(ndr, r->out.handle));
NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
return NT_STATUS_OK;
}

11
source/librpc/ndr/ndr_spoolss.h
View File

@ -124,12 +124,17 @@ struct spoolss_EnumPrinters {
};
struct spoolss_01 {
struct spoolss_OpenPrinter {
struct {
const char *server;
const char *printer;
DATA_BLOB *buffer;
uint32 access_mask;
} in;
struct {
NTSTATUS result;
struct policy_handle *handle;
WERROR result;
} out;
};
@ -1135,7 +1140,7 @@ struct spoolss_5f {
};
#define DCERPC_SPOOLSS_ENUMPRINTERS 0
#define DCERPC_SPOOLSS_01 1
#define DCERPC_SPOOLSS_OPENPRINTER 1
#define DCERPC_SPOOLSS_02 2
#define DCERPC_SPOOLSS_03 3
#define DCERPC_SPOOLSS_ENUMJOBS 4

7
source/librpc/rpc/dcerpc.c
View File

@ -814,3 +814,10 @@ failed:
}
/*
a useful function for retrieving the server name we connected to
*/
const char *dcerpc_server_name(struct dcerpc_pipe *p)
{
return p->tree->session->transport->called.name;
}

16
source/librpc/rpc/rpc_spoolss.c
View File

@ -11,18 +11,12 @@ NTSTATUS dcerpc_spoolss_EnumPrinters(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
r);
}
NTSTATUS dcerpc_spoolss_01(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_01 *r)
NTSTATUS dcerpc_spoolss_OpenPrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_OpenPrinter *r)
{
NTSTATUS status;
status = dcerpc_ndr_request(p, DCERPC_SPOOLSS_01, mem_ctx,
(ndr_push_fn_t) ndr_push_spoolss_01,
(ndr_pull_fn_t) ndr_pull_spoolss_01,
r);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
return r->out.result;
return dcerpc_ndr_request(p, DCERPC_SPOOLSS_OPENPRINTER, mem_ctx,
(ndr_push_fn_t) ndr_push_spoolss_OpenPrinter,
(ndr_pull_fn_t) ndr_pull_spoolss_OpenPrinter,
r);
}
NTSTATUS dcerpc_spoolss_02(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct spoolss_02 *r)

36
source/torture/rpc/spoolss.c
View File

@ -21,6 +21,35 @@
#include "includes.h"
static BOOL test_OpenPrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
struct spoolss_PrinterInfo1 *info1)
{
NTSTATUS status;
struct spoolss_OpenPrinter r;
struct policy_handle handle;
DATA_BLOB blob;
blob = data_blob(NULL, 0);
r.in.server = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
r.in.printer = info1->name;
r.in.buffer = &blob;
r.in.access_mask = SEC_RIGHT_MAXIMUM_ALLOWED;
r.out.handle = &handle;
printf("Testing OpenPrinter(\\\\%s\\%s)\n", r.in.server, r.in.printer);
status = dcerpc_spoolss_OpenPrinter(p, mem_ctx, &r);
if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(r.out.result)) {
printf("OpenPrinter failed - %s/%s\n",
nt_errstr(status), win_errstr(r.out.result));
return False;
}
return True;
}
static BOOL test_EnumPrinters(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
{
struct spoolss_EnumPrinters r;
@ -74,6 +103,13 @@ static BOOL test_EnumPrinters(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
printf("Printer %d\n", j);
NDR_PRINT_UNION_DEBUG(spoolss_PrinterEnum, r.in.level, &info[j]);
}
for (j=0;j<r.out.count;j++) {
if (r.in.level == 1 &&
!test_OpenPrinter(p, mem_ctx, &info[j].info1)) {
ret = False;
}
}
}
return ret;