s4/scripting/mymachinepw: print usage with bad arguments

Also, use sys.exit() function, not exit(), because sys.exit() reliably
exists.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/selftest/knownfail.d/usage b/selftest/knownfail.d/usage
index 193e1bbb7c50569ba5cdc77951cabcd3347928b4..c5028e1d31f69943e5de5a5cfdcac9b6e9408231 100644 (file)
--- a/selftest/knownfail.d/usage
+++ b/selftest/knownfail.d/usage
@@ -1,7 +1,6 @@
 samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_chgtdcpass.none.
 samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_demodirsync_py.none.
 samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_findprovisionusnranges.none.
-samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_mymachinepw.none.
 samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_rebuildextendeddn.none.
 samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_renamedc.none.
 samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_repl_cleartext_pwd_py.none.

diff --git a/source4/scripting/bin/mymachinepw b/source4/scripting/bin/mymachinepw
index 921cd53bffc85f55eca212e62ed0f85051de58db..5ad9c7e96dc0302027b1aff295f713add75a850d 100755 (executable)
--- a/source4/scripting/bin/mymachinepw
+++ b/source4/scripting/bin/mymachinepw
@@ -30,7 +30,8 @@ for o, v in optlist:
     if o == "-s":
         if not conf.load(v):
             print(v + " not found")
-            exit(1)
+            print("\nUsage: mymachinepw [-s SMBCONF]")
+            sys.exit(1)
         loaded = True
 
 if not loaded:
@@ -50,9 +51,11 @@ if not msg:
     print("Error:")
     print("Password for host[%s] not found in path[%s]." % (netbios, path))
     print("You may want to pass the smb.conf location via the -s option.")
-    exit(1)
+    print()
+    print("Usage: mymachinepw [-s SMBCONF]")
+    sys.exit(1)
 
 password=msg[0]['secret'][0]
 
 print(password)
-exit(0)
+sys.exit(0)