summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/scripting/bin/testparm4
-rwxr-xr-xsource4/setup/provision3
2 files changed, 4 insertions, 3 deletions
diff --git a/source4/scripting/bin/testparm b/source4/scripting/bin/testparm
index 95adcf3f16..c2f8bc853f 100755
--- a/source4/scripting/bin/testparm
+++ b/source4/scripting/bin/testparm
@@ -57,7 +57,7 @@ def do_global_checks(lp, logger):
piddir = lp.get("pid directory")
- if os.path.isdir(piddir):
+ if not os.path.isdir(piddir):
logger.error("pid directory %s does not exist", piddir)
valid = False
@@ -125,7 +125,7 @@ if __name__ == '__main__':
help="Client IP address for 'hosts allow' checking")
parser.add_option("--suppress-prompt", action="store_true", default=False,
help="Suppress prompt for enter")
- parser.add_option("--verbose", action="store_true",
+ parser.add_option("-v", "--verbose", action="store_true",
default=False, help="Show default options too")
parser.add_option_group(options.VersionOptions(parser))
# We need support for smb.conf macros before this will work again
diff --git a/source4/setup/provision b/source4/setup/provision
index 58bf804ab0..264245a72c 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -252,7 +252,8 @@ try:
backend_type=opts.ldap_backend_type,
ldapadminpass=opts.ldapadminpass, ol_mmr_urls=opts.ol_mmr_urls,
slapd_path=opts.slapd_path, setup_ds_path=opts.setup_ds_path,
- nosync=opts.nosync,ldap_dryrun_mode=opts.ldap_dryrun_mode,useeadb=eadb)
+ nosync=opts.nosync, ldap_dryrun_mode=opts.ldap_dryrun_mode,
+ useeadb=eadb)
except ProvisioningError, e:
print str(e)
exit(1)