summaryrefslogtreecommitdiffstats
path: root/source/utils/testparm.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/utils/testparm.c')
-rw-r--r--source/utils/testparm.c19
1 files changed, 18 insertions, 1 deletions
diff --git a/source/utils/testparm.c b/source/utils/testparm.c
index 9502ec9669d..664f13ab269 100644
--- a/source/utils/testparm.c
+++ b/source/utils/testparm.c
@@ -36,6 +36,7 @@
#include "smb.h"
extern BOOL AllowDebugChange;
+extern int parsed_debuglevel_class[DBGC_LAST];
/* these live in util.c */
extern FILE *dbf;
@@ -71,6 +72,12 @@ cannot be set in the smb.conf file. nmbd will abort with this setting.\n");
ret = 1;
}
+ if (!directory_exist(lp_piddir(), &st)) {
+ printf("ERROR: pid directory %s does not exist\n",
+ lp_piddir());
+ ret = 1;
+ }
+
/*
* Password server sanity checks.
*/
@@ -151,6 +158,15 @@ via the %%o substitution. With encrypted passwords this is not possible.\n", lp_
ret = 1;
}
+ if (strlen(lp_winbind_separator()) != 1) {
+ printf("ERROR: the 'winbind separator' parameter must be a single character.\n");
+ ret = 1;
+ }
+
+ if (*lp_winbind_separator() == '+') {
+ printf("'winbind separator = +' might cause problems with group membership.\n");
+ }
+
return ret;
}
@@ -281,7 +297,8 @@ Level II oplocks can only be set if oplocks are also set.\n",
fflush(stdout);
getc(stdin);
}
- lp_dump(stdout,True, lp_numservices(), _dos_to_unix);
+ memcpy(DEBUGLEVEL_CLASS,parsed_debuglevel_class,sizeof(parsed_debuglevel_class));
+ lp_dump(stdout,True, lp_numservices(), _dos_to_unix_static);
}
if (argc >= 3) {