From: Günther Deschner <gd@samba.org>
Date: Thu, 17 Jan 2013 15:09:15 +0000 (+0100)
Subject: s3-spoolss: use configurable spoolss architecture in compose_spoolss_server_path().
X-Git-Tag: ldb-1.1.15~97
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=79fa78e2851009bc992d5b1bb447cb91d8b68900;p=thirdparty%2Fsamba.git

s3-spoolss: use configurable spoolss architecture in compose_spoolss_server_path().

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>

Autobuild-User(master): David Disseldorp <ddiss@samba.org>
Autobuild-Date(master): Thu Jan 17 18:53:47 CET 2013 on sn-devel-104
---

diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 6d756bdf367..ef854b1c080 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -8319,7 +8319,7 @@ static WERROR compose_spoolss_server_path(TALLOC_CTX *mem_ctx,
 					  char **path)
 {
 	const char *pservername = NULL;
-	const char *long_archi = SPOOLSS_ARCHITECTURE_NT_X86;
+	const char *long_archi;
 	const char *short_archi;
 
 	*path = NULL;
@@ -8327,6 +8327,10 @@ static WERROR compose_spoolss_server_path(TALLOC_CTX *mem_ctx,
 	/* environment may be empty */
 	if (environment && strlen(environment)) {
 		long_archi = environment;
+	} else {
+		long_archi = lp_parm_const_string(GLOBAL_SECTION_SNUM,
+						  "spoolss", "architecture",
+						  SPOOLSS_ARCHITECTURE_NT_X86);
 	}
 
 	/* servername may be empty */