s4:s3compat Hook the named pipe proxy configuration to s3compat

This ensures that no configuration options need to be set to proxy the
'default' set of pipes.  This can then be modified in the code,
without updates to user smb.conf files, or the need to get the socket
dir correct.

Andrew Bartlett

diff --git a/source4/s3compat/s3compat_globals.c b/source4/s3compat/s3compat_globals.c
index a926f2c368bf5c2ebd4c4803cfbc710176bbe27b..87b5398ddcd68cb8deb25b04787e8a55cc575705 100644 (file)
--- a/source4/s3compat/s3compat_globals.c
+++ b/source4/s3compat/s3compat_globals.c
@@ -111,3 +111,7 @@ int s3compat_server_role(void)
        }
 }
 
+const char *s3compat_lp_ncalrpc_dir(void)
+{
+       return lp_ncalrpc_dir(s3compat_get_lp_ctx());
+}

diff --git a/source4/s3compat/s3compat_pipes.c b/source4/s3compat/s3compat_pipes.c
new file mode 100644 (file)
index 0000000..cc8ed6e
--- /dev/null
+++ b/source4/s3compat/s3compat_pipes.c
@@ -0,0 +1,34 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   s3 compatibility routines
+
+   Copyright (C) Andrew Bartlett       2010
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "s3compat_globals.h"
+
+const char **s3compat_default_pipe_list(void) 
+{
+       static const char *list[] = {"samr", "lsarpc", "netlogon", "drsuapi", "dssetup", "epmapper", "echo", NULL };
+       return list;
+}
+
+const char *s3compat_ncalrpc_dir(void)
+{
+       return s3compat_lp_ncalrpc_dir();
+}

diff --git a/source4/s3compat/wscript_build b/source4/s3compat/wscript_build
index a76fd0ff39ea82b418acac27742786f5e43eb731..207ac322bb6ba75df3a45af5fd023bb670c2e285 100644 (file)
--- a/source4/s3compat/wscript_build
+++ b/source4/s3compat/wscript_build
@@ -856,7 +856,7 @@ bld.SAMBA_SUBSYSTEM('s3compat_wrapper',
                     hide_symbols=True)
 
 bld.SAMBA_SUBSYSTEM('s3replace',
-                    source='s3replace.c s3compat_names.c',
+                    source='s3replace.c s3compat_names.c s3compat_pipes.c',
                     autoproto='s3replace.h',
                     includes=SAMBA3_INCLUDES,
                     deps='talloc tevent tdb',