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>

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 738559b7482aafd880d653e68d75532840a3f298..95d94119275b5712a1f044c1e9ecef65a5bcf28d 100644 (file)
--- 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 e4694ebd968efadc6634fe76a7cc9b3ba0401e78..a3b5c7f1dc9c082f87d479006452e401e18af844 100644 (file)
--- 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 6c1eab4168b05460b61b36c639973a423df559ac..07e541d37f1087af257a36b6ce5c44cdc5886600 100644 (file)
--- 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)) {