The branch, master has been updated
via e14fb8f... s3-spoolss: use SPOOLSS_ARCHITECTURE_ALL in driver enum
server code.
via fb3b098... spoolss: add more spoolss architectures to IDL.
from dd650ed... s4:selftest: skip SMB2-ACLS for now
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e14fb8f913e35db96d8d7985e505f96150d9ce6b
Author: Günther Deschner <g...@samba.org>
Date: Tue Dec 8 14:46:10 2009 +0100
s3-spoolss: use SPOOLSS_ARCHITECTURE_ALL in driver enum server code.
Guenther
commit fb3b0987f7f9d7026701ab8b3034ff6084ae2143
Author: Günther Deschner <g...@samba.org>
Date: Wed Dec 2 00:59:21 2009 +0100
spoolss: add more spoolss architectures to IDL.
Guenther
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/spoolss.h | 6 +++++-
librpc/idl/spoolss.idl | 6 +++++-
source3/rpc_server/srv_spoolss_nt.c | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h
index cee9a8f..2f2e8f2 100644
--- a/librpc/gen_ndr/spoolss.h
+++ b/librpc/gen_ndr/spoolss.h
@@ -21,8 +21,12 @@
#define SPL_ARCH_W32PPC ( "W32PPC" )
#define SPL_ARCH_IA64 ( "IA64" )
#define SPL_ARCH_X64 ( "x64" )
-#define SPOOLSS_ARCHITECTURE_ALL ( "all" )
+#define SPOOLSS_ARCHITECTURE_ALL ( "All" )
+#define SPOOLSS_ARCHITECTURE_ALL_CLUSTER ( "AllCluster" )
#define SPOOLSS_ARCHITECTURE_NT_X86 ( "Windows NT x86" )
+#define SPOOLSS_ARCHITECTURE_IA_64 ( "Windows IA64" )
+#define SPOOLSS_ARCHITECTURE_x64 ( "Windows x64" )
+#define SPOOLSS_ARCHITECTURE_4_0 ( "Windows 4.0" )
#define SPOOLSS_DEFAULT_SERVER_PATH ( "C:\\WINDOWS\\system32\\spool" )
#define SPOOL_PRINTERDATA_KEY ( "PrinterDriverData" )
#define SPOOL_DSSPOOLER_KEY ( "DsSpooler" )
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index f665381..64b2676 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -1498,8 +1498,12 @@ import "misc.idl", "security.idl", "winreg.idl";
const string SPL_ARCH_IA64 = "IA64";
const string SPL_ARCH_X64 = "x64";
- const string SPOOLSS_ARCHITECTURE_ALL = "all";
+ const string SPOOLSS_ARCHITECTURE_ALL = "All";
+ const string SPOOLSS_ARCHITECTURE_ALL_CLUSTER = "AllCluster";
const string SPOOLSS_ARCHITECTURE_NT_X86 = "Windows NT
x86";
+ const string SPOOLSS_ARCHITECTURE_IA_64 = "Windows
IA64";
+ const string SPOOLSS_ARCHITECTURE_x64 = "Windows x64";
+ const string SPOOLSS_ARCHITECTURE_4_0 = "Windows 4.0";
const string SPOOLSS_DEFAULT_SERVER_PATH =
"C:\\WINDOWS\\system32\\spool";
typedef [public,gensize] struct {
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index 9abed16..1e66c7c 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -6461,7 +6461,7 @@ static WERROR enumprinterdrivers_level(TALLOC_CTX
*mem_ctx,
uint32_t a,i;
WERROR result = WERR_OK;
- if (strequal(architecture, "all")) {
+ if (strequal(architecture, SPOOLSS_ARCHITECTURE_ALL)) {
for (a=0; archi_table[a].long_archi != NULL; a++) {
--
Samba Shared Repository
