sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

s4/scripting/mymachinepw: print usage with bad arguments

Browse Source 
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>
This commit is contained in:
Douglas Bagnall 2019-06-27 16:57:21 +12:00 committed by Andrew Bartlett
parent e5e4c11371
commit ffdb0ca8b0
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
selftest/knownfail.d/usage
View File

@ -1,7 +1,6 @@
samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_chgtdcpass.none. 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_demodirsync_py.none.
samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_findprovisionusnranges.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_rebuildextendeddn.none.
samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_renamedc.none. samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_renamedc.none.
samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_repl_cleartext_pwd_py.none. samba.tests.usage.samba.tests.usage.PythonScriptUsageTests.test_repl_cleartext_pwd_py.none.

9
source4/scripting/bin/mymachinepw
View File

@ -30,7 +30,8 @@ for o, v in optlist:
if o == "-s": if o == "-s":
if not conf.load(v): if not conf.load(v):
print(v + " not found") print(v + " not found")
exit(1) print("\nUsage: mymachinepw [-s SMBCONF]")
sys.exit(1)
loaded = True loaded = True
if not loaded: if not loaded:
@ -50,9 +51,11 @@ if not msg:
print("Error:") print("Error:")
print("Password for host[%s] not found in path[%s]." % (netbios, path)) 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.") 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] password=msg[0]['secret'][0]
print(password) print(password)
exit(0) sys.exit(0)