s3:s3compat Override default pipe forwarding for s3compat

This allows s3compat to be run without smb.conf options being set.

diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index e0fa861781d70dbd99fb2e1c5e7f97430348ce51..8544bade8f1c0d43646f4f0953021bb4917a4787 100644 (file)
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -866,9 +866,13 @@ static struct np_proxy_state *make_external_rpc_pipe_p(TALLOC_CTX *mem_ctx,
                goto fail;
        }
 
+#ifdef ENABLE_S3COMPAT
+       socket_dir = s3compat_ncalrpc_dir();
+#else
        socket_dir = lp_parm_const_string(
                GLOBAL_SECTION_SNUM, "external_rpc_pipe", "socket_dir",
                get_dyn_NCALRPCDIR());
+#endif
        if (socket_dir == NULL) {
                DEBUG(0, ("externan_rpc_pipe:socket_dir not set\n"));
                goto fail;
@@ -949,7 +953,12 @@ NTSTATUS np_open(TALLOC_CTX *mem_ctx, const char *name,
        const char **proxy_list;
        struct fake_file_handle *handle;
 
-       proxy_list = lp_parm_string_list(-1, "np", "proxy", NULL);
+#ifdef ENABLE_S3COMPAT
+       const char **default_proxy_list = s3compat_default_pipe_list();
+#else
+       const char **default_proxy_list = NULL;
+#endif
+       proxy_list = lp_parm_string_list(-1, "np", "proxy", default_proxy_list);
 
        handle = talloc(mem_ctx, struct fake_file_handle);
        if (handle == NULL) {