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

printing: move archi_table declarations into nt_printing.h

Browse Source 
Signed-off-by: Bjoern Jacke <bjacke@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Björn Jacke 2020-10-07 17:54:19 +02:00 committed by Ralph Boehme
parent ca1a301461
commit 62c514c29c
5 changed files with 17 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source3/include/nt_printing.h
View File

@ -191,4 +191,21 @@ void nt_printer_add(TALLOC_CTX *mem_ctx,
struct messaging_context *msg_ctx,
const char *printer);
/* The version int is used by getdrivers. Note that
all architecture strings that support mutliple
versions must be grouped together since enumdrivers
uses this property to prevent issuing multiple
enumdriver calls for the same arch */
static const struct print_architecture_table_node archi_table[]= {
{SPOOLSS_ARCHITECTURE_4_0, SPL_ARCH_WIN40, 0 },
{SPOOLSS_ARCHITECTURE_NT_X86, SPL_ARCH_W32X86, 2 },
{SPOOLSS_ARCHITECTURE_NT_X86, SPL_ARCH_W32X86, 3 },
{SPOOLSS_ARCHITECTURE_W32MIPS, SPL_ARCH_W32MIPS, 2 },
{SPOOLSS_ARCHITECTURE_W32ALPHA, SPL_ARCH_W32ALPHA, 2 },
{SPOOLSS_ARCHITECTURE_W32PPC, SPL_ARCH_W32PPC, 2 },
{SPOOLSS_ARCHITECTURE_IA_64, SPL_ARCH_IA64, 3 },
{SPOOLSS_ARCHITECTURE_x64, SPL_ARCH_X64, 3 },
{NULL, "", -1 }
};
#endif /* NT_PRINTING_H_ */

12
source3/printing/nt_printing.c
View File

@ -63,18 +63,6 @@ const struct generic_mapping job_generic_mapping = {
JOB_ALL_ACCESS
};
static const struct print_architecture_table_node archi_table[]= {
{"Windows 4.0", SPL_ARCH_WIN40, 0 },
{"Windows NT x86", SPL_ARCH_W32X86, 2 },
{"Windows NT R4000", SPL_ARCH_W32MIPS, 2 },
{"Windows NT Alpha_AXP", SPL_ARCH_W32ALPHA, 2 },
{"Windows NT PowerPC", SPL_ARCH_W32PPC, 2 },
{"Windows IA64", SPL_ARCH_IA64, 3 },
{"Windows x64", SPL_ARCH_X64, 3 },
{NULL, "", -1 }
};
static bool print_driver_directories_init(void)
{
int service, i;

12
source3/rpc_server/spoolss/srv_spoolss_nt.c
View File

@ -2003,18 +2003,6 @@ WERROR _spoolss_DeletePrinter(struct pipes_struct *p,
* long architecture string
******************************************************************/
static const struct print_architecture_table_node archi_table[]= {
{"Windows 4.0", SPL_ARCH_WIN40, 0 },
{"Windows NT x86", SPL_ARCH_W32X86, 2 },
{"Windows NT R4000", SPL_ARCH_W32MIPS, 2 },
{"Windows NT Alpha_AXP", SPL_ARCH_W32ALPHA, 2 },
{"Windows NT PowerPC", SPL_ARCH_W32PPC, 2 },
{"Windows IA64", SPL_ARCH_IA64, 3 },
{"Windows x64", SPL_ARCH_X64, 3 },
{NULL, "", -1 }
};
static const int drv_cversion[] = {SPOOLSS_DRIVER_VERSION_9X,
SPOOLSS_DRIVER_VERSION_NT35,
SPOOLSS_DRIVER_VERSION_NT4,

19
source3/rpcclient/cmd_spoolss.c
View File

@ -44,25 +44,6 @@
W_ERROR_HAVE_NO_MEMORY(_printername); \
}
/* The version int is used by getdrivers. Note that
all architecture strings that support mutliple
versions must be grouped together since enumdrivers
uses this property to prevent issuing multiple
enumdriver calls for the same arch */
static const struct print_architecture_table_node archi_table[]= {
{"Windows 4.0", "WIN40", 0 },
{"Windows NT x86", "W32X86", 2 },
{"Windows NT x86", "W32X86", 3 },
{"Windows NT R4000", "W32MIPS", 2 },
{"Windows NT Alpha_AXP", "W32ALPHA", 2 },
{"Windows NT PowerPC", "W32PPC", 2 },
{"Windows IA64", "IA64", 3 },
{"Windows x64", "x64", 3 },
{NULL, "", -1 }
};
/**
* @file

14
source3/utils/net_rpc_printer.c
View File

@ -34,20 +34,6 @@
#include "auth/credentials/credentials.h"
#include "lib/util/string_wrappers.h"
/* support itanium as well */
static const struct print_architecture_table_node archi_table[]= {
{"Windows 4.0", "WIN40", 0 },
{"Windows NT x86", "W32X86", 2 },
{"Windows NT x86", "W32X86", 3 },
{"Windows NT R4000", "W32MIPS", 2 },
{"Windows NT Alpha_AXP", "W32ALPHA", 2 },
{"Windows NT PowerPC", "W32PPC", 2 },
{"Windows IA64", "IA64", 3 },
{"Windows x64", "x64", 3 },
{NULL, "", -1 }
};
/**
* This display-printdriver-functions was borrowed from rpcclient/cmd_spoolss.c.