r12728: Revive testparm.

It needs work to not dump defaults from loadparm.c, but otherwise it works.

Andrew Bartlett

source/lib/socket/access.c

@@ -249,9 +249,9 @@ static BOOL allow_access_internal(TALLOC_CTX *mem_ctx,
 }
 
 /* return true if access should be allowed */
-static BOOL allow_access(TALLOC_CTX *mem_ctx,
+BOOL allow_access(TALLOC_CTX *mem_ctx,
-			 const char **deny_list, const char **allow_list,
+		  const char **deny_list, const char **allow_list,
-			 const char *cname, const char *caddr)
+		  const char *cname, const char *caddr)
 {
 	BOOL ret;
 	char *nc_cname = talloc_strdup(mem_ctx, cname);

source/lib/socket/socket.h

@@ -136,6 +136,9 @@ int socket_get_my_port(struct socket_context *sock);
 int socket_get_fd(struct socket_context *sock);
 NTSTATUS socket_dup(struct socket_context *sock);
 const struct socket_ops *socket_getops_byname(const char *name, enum socket_type type);
+BOOL allow_access(TALLOC_CTX *mem_ctx,
+		  const char **deny_list, const char **allow_list,
+		  const char *cname, const char *caddr);
 BOOL socket_check_access(struct socket_context *sock, 
 			 const char *service_name,
 			 const char **allow_list, const char **deny_list);

source/utils/config.mk

@@ -87,3 +87,18 @@ REQUIRED_SUBSYSTEMS = \
 		POPT_SAMBA
 # End BINARY nmblookup
 #################################
+
+#################################
+# Start BINARY testparm
+[BINARY::testparm]
+INSTALLDIR = BINDIR
+OBJ_FILES = \
+		testparm.o
+REQUIRED_SUBSYSTEMS = \
+		CONFIG \
+		LIBBASIC \
+		LIBPOPT \
+		SOCKET \
+		POPT_SAMBA
+# End BINARY testparm
+#################################

source/utils/testparm.c

@@ -0,0 +1,219 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Test validity of smb.conf
+   Copyright (C) Karl Auer 1993, 1994-1998
+
+   Extensively modified by Andrew Tridgell, 1995
+   Converted to popt by Jelmer Vernooij (jelmer@nl.linux.org), 2002
+   Updated for Samba4 by Andrew Bartlett <abartlet@samba.org> 2006
+   
+   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 2 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, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+/*
+ * Testbed for loadparm.c/params.c
+ *
+ * This module simply loads a specified configuration file and
+ * if successful, dumps it's contents to stdout. Note that the
+ * operation is performed with DEBUGLEVEL at 3.
+ *
+ * Useful for a quick 'syntax check' of a configuration file.
+ *
+ */
+
+#include "includes.h"
+#include "system/filesys.h"
+#include "lib/cmdline/popt_common.h"
+#include "lib/socket/socket.h"
+
+
+/***********************************************
+ Here we do a set of 'hard coded' checks for bad
+ configuration settings.
+************************************************/
+
+static int do_global_checks(void)
+{
+	int ret = 0;
+
+	if (!directory_exist(lp_lockdir())) {
+		fprintf(stderr, "ERROR: lock directory %s does not exist\n",
+		       lp_lockdir());
+		ret = 1;
+	}
+
+	if (!directory_exist(lp_piddir())) {
+		fprintf(stderr, "ERROR: pid directory %s does not exist\n",
+		       lp_piddir());
+		ret = 1;
+	}
+
+	if (strlen(lp_winbind_separator()) != 1) {
+		fprintf(stderr,"ERROR: the 'winbind separator' parameter must be a single character.\n");
+		ret = 1;
+	}
+
+	if (*lp_winbind_separator() == '+') {
+		fprintf(stderr,"'winbind separator = +' might cause problems with group membership.\n");
+	}
+
+	return ret;
+}   
+
+ int main(int argc, const char *argv[])
+{
+	int s;
+	static BOOL silent_mode = False;
+	int ret = 0;
+	poptContext pc;
+	static const char *term_code = "";
+/*
+	static BOOL show_all_parameters = False;
+	static char *parameter_name = NULL;
+	static const char *section_name = NULL;
+	static char *new_local_machine = NULL;
+*/
+	static const char *cname;
+	static const char *caddr;
+	static int show_defaults;
+
+	struct poptOption long_options[] = {
+		POPT_AUTOHELP
+		{"suppress-prompt", 's', POPT_ARG_VAL, &silent_mode, 1, "Suppress prompt for enter"},
+		{"verbose", 'v', POPT_ARG_NONE, &show_defaults, 1, "Show default options too"},
+/*
+  We need support for smb.conf macros before this will work again 
+		{"server", 'L',POPT_ARG_STRING, &new_local_machine, 0, "Set %%L macro to servername\n"},
+*/		{"encoding", 't', POPT_ARG_STRING, &term_code, 0, "Print parameters with encoding"},
+/*
+  These are harder to do with the new code structure
+		{"show-all-parameters", '\0', POPT_ARG_VAL, &show_all_parameters, True, "Show the parameters, type, possible values" },
+		{"parameter-name", '\0', POPT_ARG_STRING, &parameter_name, 0, "Limit testparm to a named parameter" },
+		{"section-name", '\0', POPT_ARG_STRING, &section_name, 0, "Limit testparm to a named section" },
+*/
+		{"client-name", '\0', POPT_ARG_STRING, &cname, 0, "Client DNS name for 'hosts allow' checking (should match reverse lookup)"},
+		{"client-ip", '\0', POPT_ARG_STRING, &caddr, 0, "Client IP address for 'hosts allow' checking"},
+		POPT_COMMON_VERSION
+		POPT_TABLEEND
+	};
+
+	setup_logging(NULL, DEBUG_STDERR);
+
+	pc = poptGetContext(NULL, argc, argv, long_options, 
+			    POPT_CONTEXT_KEEP_FIRST);
+	poptSetOtherOptionHelp(pc, "[OPTION...] [host-name] [host-ip]");
+
+	while(poptGetNextOpt(pc) != -1);
+
+/* 
+	if (show_all_parameters) {
+		show_parameter_list();
+		exit(0);
+	}
+*/
+
+	if ( cname && ! caddr ) {
+		printf ( "ERROR: For 'hosts allow' check you must specify both a DNS name and an IP address.\n" );
+		return(1);
+	}
+/*
+  We need support for smb.conf macros before this will work again 
+
+	if (new_local_machine) {
+		set_local_machine_name(new_local_machine, True);
+	}
+*/
+	
+	/* We need this to force the output */
+	lp_set_cmdline("log level", "2");
+
+	fprintf(stderr,"Load smb config files from %s\n",lp_configfile());
+
+	if (!lp_load()) {
+		fprintf(stderr,"Error loading services.\n");
+		return(1);
+	}
+
+	fprintf(stderr,"Loaded services file OK.\n");
+
+	ret = do_global_checks();
+
+	for (s=0;s<lp_numservices();s++) {
+		if (lp_snum_ok(s))
+			if (strlen(lp_servicename(s)) > 12) {
+				fprintf(stderr, "WARNING: You have some share names that are longer than 12 characters.\n" );
+				fprintf(stderr, "These may not be accessible to some older clients.\n" );
+				fprintf(stderr, "(Eg. Windows9x, WindowsMe, and not listed in smbclient in Samba 3.0.)\n" );
+				break;
+			}
+	}
+
+	for (s=0;s<lp_numservices();s++) {
+		if (lp_snum_ok(s)) {
+			const char **deny_list = lp_hostsdeny(s);
+			const char **allow_list = lp_hostsallow(s);
+			int i;
+			if(deny_list) {
+				for (i=0; deny_list[i]; i++) {
+					char *hasstar = strchr_m(deny_list[i], '*');
+					char *hasquery = strchr_m(deny_list[i], '?');
+					if(hasstar || hasquery) {
+						fprintf(stderr,"Invalid character %c in hosts deny list (%s) for service %s.\n",
+							   hasstar ? *hasstar : *hasquery, deny_list[i], lp_servicename(s) );
+					}
+				}
+			}
+
+			if(allow_list) {
+				for (i=0; allow_list[i]; i++) {
+					char *hasstar = strchr_m(allow_list[i], '*');
+					char *hasquery = strchr_m(allow_list[i], '?');
+					if(hasstar || hasquery) {
+						fprintf(stderr,"Invalid character %c in hosts allow list (%s) for service %s.\n",
+							   hasstar ? *hasstar : *hasquery, allow_list[i], lp_servicename(s) );
+					}
+				}
+			}
+		}
+	}
+
+
+	if (!cname) {
+		if (!silent_mode) {
+			fprintf(stderr,"Press enter to see a dump of your service definitions\n");
+			fflush(stdout);
+			getc(stdin);
+		}
+		lp_dump(stdout, show_defaults, lp_numservices());
+	}
+
+	if(cname && caddr){
+		/* this is totally ugly, a real `quick' hack */
+		for (s=0;s<lp_numservices();s++) {
+			if (lp_snum_ok(s)) {
+				if (allow_access(NULL, lp_hostsdeny(-1), lp_hostsallow(-1), cname, caddr)
+				    && allow_access(NULL, lp_hostsdeny(s), lp_hostsallow(s), cname, caddr)) {
+					fprintf(stderr,"Allow connection from %s (%s) to %s\n",
+						   cname,caddr,lp_servicename(s));
+				} else {
+					fprintf(stderr,"Deny connection from %s (%s) to %s\n",
+						   cname,caddr,lp_servicename(s));
+				}
+			}
+		}
+	}
+	return(ret);
+}
+