summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2013-01-17 16:09:15 +0100
committerDavid Disseldorp <ddiss@samba.org>2013-01-17 18:53:47 +0100
commit79fa78e2851009bc992d5b1bb447cb91d8b68900 (patch)
treec089e2ddf868c9595f6b04e89e6030828aee414d
parent3b94b64481a811482dbd01fd55c145a89f2c8c96 (diff)
downloadsamba-79fa78e2851009bc992d5b1bb447cb91d8b68900.tar.gz
samba-79fa78e2851009bc992d5b1bb447cb91d8b68900.tar.bz2
samba-79fa78e2851009bc992d5b1bb447cb91d8b68900.zip
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
-rw-r--r--source3/rpc_server/spoolss/srv_spoolss_nt.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 6d756bdf36..ef854b1c08 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 */