python: Fix usage strings

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/auth/credentials/tests/bind.py b/auth/credentials/tests/bind.py
index a256a930a8a55ca61c45c818aba5db79c9a7699a..a38021b5ded5f7848ba50922c7ec0eae3a0cf50a 100755 (executable)
--- a/auth/credentials/tests/bind.py
+++ b/auth/credentials/tests/bind.py
@@ -26,7 +26,7 @@ def create_credential(lp, other):
     c.set_gensec_features(other.get_gensec_features())
     return c
 
-parser = optparse.OptionParser("ldap [options] <host>")
+parser = optparse.OptionParser("bind [options] <host>")
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
 

diff --git a/python/samba/tests/dns_tkey.py b/python/samba/tests/dns_tkey.py
index 07316271d567950a4203f569a657b9ac463d2f6e..42f73ba29214962dcaef7761da61eb60d25adf8b 100644 (file)
--- a/python/samba/tests/dns_tkey.py
+++ b/python/samba/tests/dns_tkey.py
@@ -23,7 +23,7 @@ from samba.dcerpc import dns
 from samba.tests.subunitrun import SubunitOptions, TestProgram
 from samba.tests.dns_base import DNSTKeyTest
 
-parser = optparse.OptionParser("dns.py <server name> <server ip> [options]")
+parser = optparse.OptionParser("dns_tkey.py <server name> <server ip> [options]")
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
 

diff --git a/source4/dsdb/tests/python/ad_dc_medley_performance.py b/source4/dsdb/tests/python/ad_dc_medley_performance.py
index ebd631366398657fcaf900f036361160fcbf8ff4..010790d0a1ac170d215fa55b2369acad449c3c7f 100644 (file)
--- a/source4/dsdb/tests/python/ad_dc_medley_performance.py
+++ b/source4/dsdb/tests/python/ad_dc_medley_performance.py
@@ -39,7 +39,7 @@ from ldb import FLAG_MOD_ADD, FLAG_MOD_REPLACE, FLAG_MOD_DELETE
 from ldb import SCOPE_BASE, SCOPE_SUBTREE, SCOPE_ONELEVEL
 from ldb import ERR_NO_SUCH_OBJECT
 
-parser = optparse.OptionParser("ad_dc_performance.py [options] <host>")
+parser = optparse.OptionParser("ad_dc_medley_performance.py [options] <host>")
 sambaopts = options.SambaOptions(parser)
 sambaopts.add_option("-p", "--use-paged-search", action="store_true",
                      help="Use paged search module")

diff --git a/source4/dsdb/tests/python/ad_dc_multi_bind.py b/source4/dsdb/tests/python/ad_dc_multi_bind.py
index 73e1a6b9ba7b876e0dbbbd509d714ae06b71d8e1..564fb9e0a85dcf6cc3890e7896b0edc43670f284 100644 (file)
--- a/source4/dsdb/tests/python/ad_dc_multi_bind.py
+++ b/source4/dsdb/tests/python/ad_dc_multi_bind.py
@@ -36,7 +36,7 @@ from ldb import Message, MessageElement, Dn, LdbError
 from ldb import FLAG_MOD_ADD, FLAG_MOD_REPLACE, FLAG_MOD_DELETE
 from ldb import SCOPE_BASE, SCOPE_SUBTREE, SCOPE_ONELEVEL
 
-parser = optparse.OptionParser("ad_dc_mulit_bind.py [options] <host>")
+parser = optparse.OptionParser("ad_dc_multi_bind.py [options] <host>")
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
 parser.add_option_group(options.VersionOptions(parser))

diff --git a/source4/dsdb/tests/python/ad_dc_search_performance.py b/source4/dsdb/tests/python/ad_dc_search_performance.py
index 27f6cb3545c9aba389d65d419476e46ca38944d7..0afd7a2582e9b3f2b9087d2ba48507d64fd00dbc 100644 (file)
--- a/source4/dsdb/tests/python/ad_dc_search_performance.py
+++ b/source4/dsdb/tests/python/ad_dc_search_performance.py
@@ -38,7 +38,7 @@ from ldb import Message, MessageElement, Dn, LdbError
 from ldb import FLAG_MOD_ADD, FLAG_MOD_REPLACE, FLAG_MOD_DELETE
 from ldb import SCOPE_BASE, SCOPE_SUBTREE, SCOPE_ONELEVEL
 
-parser = optparse.OptionParser("ad_dc_performance.py [options] <host>")
+parser = optparse.OptionParser("ad_dc_search_performance.py [options] <host>")
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
 parser.add_option_group(options.VersionOptions(parser))

diff --git a/source4/dsdb/tests/python/asq.py b/source4/dsdb/tests/python/asq.py
index 33973d66c374fa1f8d30828443fb4108cf85ebc7..72fa8bb96152385e89a289fe6440d0a06870d7ef 100644 (file)
--- a/source4/dsdb/tests/python/asq.py
+++ b/source4/dsdb/tests/python/asq.py
@@ -42,7 +42,7 @@ from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError
 from ldb import ERR_TIME_LIMIT_EXCEEDED, ERR_ADMIN_LIMIT_EXCEEDED, ERR_UNWILLING_TO_PERFORM
 from ldb import Message
 
-parser = optparse.OptionParser("large_ldap.py [options] <host>")
+parser = optparse.OptionParser("asq.py [options] <host>")
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
 parser.add_option_group(options.VersionOptions(parser))

diff --git a/source4/dsdb/tests/python/login_basics.py b/source4/dsdb/tests/python/login_basics.py
index 09f8ea36ec851154da9833004c8766fb4d4145fe..91cc3c928f79a1e19845509d98c871eff65b6cc9 100755 (executable)
--- a/source4/dsdb/tests/python/login_basics.py
+++ b/source4/dsdb/tests/python/login_basics.py
@@ -19,7 +19,7 @@ from password_lockout_base import BasePasswordTestCase
 
 sys.path.insert(0, "bin/python")
 
-parser = optparse.OptionParser("password_lockout.py [options] <host>")
+parser = optparse.OptionParser("login_basics.py [options] <host>")
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
 parser.add_option_group(options.VersionOptions(parser))

diff --git a/source4/dsdb/tests/python/subtree_rename.py b/source4/dsdb/tests/python/subtree_rename.py
index df85d05eb4bda5900d29118b721cd60af5261eda..cace780a95851a3cb33b8c4a638efcf7d9fb8876 100644 (file)
--- a/source4/dsdb/tests/python/subtree_rename.py
+++ b/source4/dsdb/tests/python/subtree_rename.py
@@ -20,7 +20,7 @@ from samba.samdb import SamDB
 from samba.dcerpc import misc
 from samba import colour
 
-parser = optparse.OptionParser("linked_attributes.py [options] <host>")
+parser = optparse.OptionParser("subtree_rename.py [options] <host>")
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
 parser.add_option_group(options.VersionOptions(parser))

diff --git a/source4/scripting/bin/findprovisionusnranges b/source4/scripting/bin/findprovisionusnranges
index 909c9a1d8fcd76be1f7be89f39b2b9b4f5b554b4..b05b5cee3e8d388f0ec6ef4a4488cd33ce40cb48 100755 (executable)
--- a/source4/scripting/bin/findprovisionusnranges
+++ b/source4/scripting/bin/findprovisionusnranges
@@ -33,7 +33,7 @@ from samba.upgradehelpers import get_paths, print_provision_ranges, findprovisio
 from samba.ndr import ndr_unpack
 from samba.dcerpc import misc
 
-parser = optparse.OptionParser("provision [options]")
+parser = optparse.OptionParser("findprovisionusnranges [options]")
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
 parser.add_option_group(options.VersionOptions(parser))

diff --git a/source4/scripting/bin/get-descriptors b/source4/scripting/bin/get-descriptors
index f9b9cd7d17030005b447ab1cd626f74a36f4abd4..6e6922282f6d467c6cb730383495899576a3a9ac 100755 (executable)
--- a/source4/scripting/bin/get-descriptors
+++ b/source4/scripting/bin/get-descriptors
@@ -42,7 +42,7 @@ from samba import Ldb
 from samba.samdb import SamDB
 from ldb import SCOPE_SUBTREE, SCOPE_BASE
 
-parser = optparse.OptionParser("get-descriptor [options]")
+parser = optparse.OptionParser("get-descriptors [options]")
 sambaopts = options.SambaOptions(parser)
 credopts = options.CredentialsOptions(parser)
 parser.add_option_group(credopts)

diff --git a/source4/scripting/bin/rebuildextendeddn b/source4/scripting/bin/rebuildextendeddn
index f5137f979d6eb2cc8e55455abab9372ee4d66299..d5c0ecb7aa11ba1f749549c5ebbce4acd683bab4 100755 (executable)
--- a/source4/scripting/bin/rebuildextendeddn
+++ b/source4/scripting/bin/rebuildextendeddn
@@ -38,7 +38,7 @@ from samba import param
 from samba.provision import ProvisionNames, provision_paths_from_lp
 from samba.schema import get_dnsyntax_attributes, get_linked_attributes
 
-parser = optparse.OptionParser("provision [options]")
+parser = optparse.OptionParser("rebuildextendeddn [options]")
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
 parser.add_option_group(options.VersionOptions(parser))

diff --git a/source4/scripting/bin/renamedc b/source4/scripting/bin/renamedc
index ef3aa75db76dba8b6c0588495a7a97a4ae8745ff..906188100393021671ec206a964163ebd4c72c74 100755 (executable)
--- a/source4/scripting/bin/renamedc
+++ b/source4/scripting/bin/renamedc
@@ -36,7 +36,7 @@ from samba.upgradehelpers import get_ldbs, get_paths
 
 __docformat__ = "restructuredText"
 
-parser = optparse.OptionParser("provision [options]")
+parser = optparse.OptionParser("renamedc [options]")
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
 parser.add_option_group(options.VersionOptions(parser))

diff --git a/source4/scripting/bin/samba_downgrade_db b/source4/scripting/bin/samba_downgrade_db
index 43a803c4e827c4ea129509360adfd25419634e8c..b9a09098a8a36f12cd8b01f85fae2a53cc86fd40 100755 (executable)
--- a/source4/scripting/bin/samba_downgrade_db
+++ b/source4/scripting/bin/samba_downgrade_db
@@ -34,7 +34,7 @@ from samba import getopt as options
 from samba.samdb import SamDB
 from samba.dbchecker import dbcheck
 from samba.credentials import Credentials
-parser = optparse.OptionParser("sambaundoguididx")
+parser = optparse.OptionParser("samba_downgrade_db")
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(options.VersionOptions(parser))
 parser.add_option("-H", "--URL", help="LDB URL for database",

diff --git a/source4/scripting/bin/samba_upgradedns b/source4/scripting/bin/samba_upgradedns
index 72e6a52e76eb3e02f604928e45a1184c764e2735..ac2fdfca5efbb2e571347be4235c230b59e37599 100755 (executable)
--- a/source4/scripting/bin/samba_upgradedns
+++ b/source4/scripting/bin/samba_upgradedns
@@ -248,7 +248,7 @@ def cleanup_obsolete_dns_files(paths):
 if __name__ == '__main__':
 
     # Setup command line parser
-    parser = optparse.OptionParser("upgradedns [options]")
+    parser = optparse.OptionParser("samba_upgradedns [options]")
     sambaopts = options.SambaOptions(parser)
     credopts = options.CredentialsOptions(parser)
 

diff --git a/source4/scripting/bin/samba_upgradeprovision b/source4/scripting/bin/samba_upgradeprovision
index da3f85c4ae942608e8c3788e9f098f19f8fb3980..c918462083d2e8e89d84833bd01b4b12fa114bc8 100755 (executable)
--- a/source4/scripting/bin/samba_upgradeprovision
+++ b/source4/scripting/bin/samba_upgradeprovision
@@ -153,7 +153,7 @@ def define_what_to_log(opts):
     return what
 
 
-parser = optparse.OptionParser("provision [options]")
+parser = optparse.OptionParser("samba_upgradeprovision [options]")
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
 parser.add_option_group(options.VersionOptions(parser))

diff --git a/source4/scripting/devel/addlotscontacts b/source4/scripting/devel/addlotscontacts
index 8e6b27802ced64f592c780e627cc06493d34f902..9ecd16b94bae0410815012202b762eeabd0a0c58 100644 (file)
--- a/source4/scripting/devel/addlotscontacts
+++ b/source4/scripting/devel/addlotscontacts
@@ -32,7 +32,7 @@ from samba.provision import find_provision_key_parameters
 from samba.upgradehelpers import (get_paths, get_ldbs)
 from ldb import SCOPE_BASE, Message, MessageElement, Dn, FLAG_MOD_ADD
 
-parser = optparse.OptionParser("chgtdcpass [options]")
+parser = optparse.OptionParser("addlotscontacts [options]")
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
 parser.add_option_group(options.VersionOptions(parser))

diff --git a/source4/scripting/devel/demodirsync.py b/source4/scripting/devel/demodirsync.py
index ec548ae2147f6da755eb4641a26509d2dbf09875..06eacf335a5197eeea87e9bcaf1c787758c5be82 100755 (executable)
--- a/source4/scripting/devel/demodirsync.py
+++ b/source4/scripting/devel/demodirsync.py
@@ -11,7 +11,7 @@ from samba.dcerpc import drsblobs, misc
 from samba.ndr import ndr_pack, ndr_unpack
 from samba import Ldb
 
-parser = optparse.OptionParser("get-descriptor [options]")
+parser = optparse.OptionParser("demodirsync [options]")
 sambaopts = options.SambaOptions(parser)
 credopts = options.CredentialsOptions(parser)
 parser.add_option_group(credopts)