s3-spoolss: use configurable spoolss architecture in compose_spoolss_server_path().
authorGünther Deschner <gd@samba.org>
Thu, 17 Jan 2013 15:09:15 +0000 (16:09 +0100)
committerDavid Disseldorp <ddiss@samba.org>
Thu, 17 Jan 2013 17:53:47 +0000 (18:53 +0100)
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

source3/rpc_server/spoolss/srv_spoolss_nt.c

index 6d756bdf3679c32fe38c0b883410635219b63158..ef854b1c080488100e7f64d787db73ea3be18be6 100644 (file)
@@ -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 */