diff options
| author | Simo Sorce <idra@samba.org> | 2010-04-26 18:33:20 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2010-07-27 10:27:10 -0400 |
| commit | fdf669d37744487a7671b1d90541dbc21a41aeb6 (patch) | |
| tree | e5aefa040c773b1b1f6336a7f3b03a074ea45306 /source3 | |
| parent | 44bc6714b0c5f40eb73def532b3074a4b19f6df4 (diff) | |
| download | samba-fdf669d37744487a7671b1d90541dbc21a41aeb6.tar.gz samba-fdf669d37744487a7671b1d90541dbc21a41aeb6.tar.bz2 samba-fdf669d37744487a7671b1d90541dbc21a41aeb6.zip | |
s3-spoolss: Get rid of get_server_name.
This function was useless the structure is public and used everywhere.
Signed-off-by: Jim McDonough <jmcd@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/printing/nt_printing.c | 9 | ||||
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 5 |
3 files changed, 1 insertions, 14 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 738559b748..95d9411927 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4795,7 +4795,6 @@ bool print_access_check(struct auth_serversupplied_info *server_info, int snum, int access_type); bool print_time_access_check(struct auth_serversupplied_info *server_info, const char *servicename); -char* get_server_name( Printer_entry *printer ); /* The following definitions come from printing/pcap.c */ diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index e4694ebd96..a3b5c7f1dc 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -5238,13 +5238,4 @@ bool print_time_access_check(struct auth_serversupplied_info *server_info, return ok; } -/**************************************************************************** - Fill in the servername sent in the _spoolss_open_printer_ex() call -****************************************************************************/ - -char* get_server_name( Printer_entry *printer ) -{ - return printer->servername; -} - diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 6c1eab4168..07e541d37f 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -4937,7 +4937,6 @@ WERROR _spoolss_GetPrinterDriver2(pipes_struct *p, Printer_entry *printer; WERROR result; - const char *servername; int snum; /* that's an [in out] buffer */ @@ -4957,15 +4956,13 @@ WERROR _spoolss_GetPrinterDriver2(pipes_struct *p, *r->out.server_major_version = 0; *r->out.server_minor_version = 0; - servername = get_server_name(printer); - if (!get_printer_snum(p, r->in.handle, &snum, NULL)) { return WERR_BADFID; } result = construct_printer_driver_info_level(p->mem_ctx, p->server_info, r->in.level, r->out.info, - snum, servername, + snum, printer->servername, r->in.architecture, r->in.client_major_version); if (!W_ERROR_IS_OK(result)) { |