s4:scripts - Cleans also the rest under the "setup" directory up

- I removed also the "-H" parameter since those scripts are all thought for the
  use on a local s4 domain controller. Another reason is also the bind as SYSTEM
  account which itself is only possible on local binds.

3 files changed, 43 insertions, 30 deletions

diff --git a/source4/setup/domainlevel b/source4/setup/domainlevel
index dcc26a29c9..811e29cb2d 100755
--- a/source4/setup/domainlevel
+++ b/source4/setup/domainlevel
@@ -1,13 +1,27 @@
 #!/usr/bin/python
 #
-#	Raises domain and forest function levels
+# Raises domain and forest function levels
 #
-#	Copyright Matthias Dieter Wallnoefer 2009
-#	Released under the GNU GPL version 3 or later
+# Copyright Matthias Dieter Wallnoefer 2009
 #
-import os, sys
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import sys
 
-sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]), "../bin/python"))
+# Find right directory when running from source tree
+sys.path.insert(0, "bin/python")
 
 import samba.getopt as options
 import optparse
@@ -25,7 +39,6 @@ parser.add_option_group(options.VersionOptions(parser))
 credopts = options.CredentialsOptions(parser)
 parser.add_option_group(credopts)
 parser.add_option("--quiet", help="Be quiet", action="store_true")
-parser.add_option("-H", help="LDB URL for database or target server", type=str)
 parser.add_option("--forest",
   help="The forest function level (2000 | 2003 | 2008 | 2008_R2). We don't support mixed/interim (NT4 DC support) levels.", type=str)
 parser.add_option("--domain",
@@ -44,15 +57,9 @@ if len(args) == 0:
 	sys.exit(1)
 
 lp = sambaopts.get_loadparm()
-
 creds = credopts.get_credentials(lp)
 
-if opts.H is not None:
-	url = opts.H
-else:
-	url = lp.get("sam database")
-
-samdb = SamDB(url=url, session_info=system_session(),
+samdb = SamDB(url=lp.get("sam database"), session_info=system_session(),
               credentials=creds, lp=lp)
 
 domain_dn = SamDB.domain_dn(samdb)
diff --git a/source4/setup/pwsettings b/source4/setup/pwsettings
index 521a58e008..6a5e18ef59 100755
--- a/source4/setup/pwsettings
+++ b/source4/setup/pwsettings
@@ -1,17 +1,29 @@
 #!/usr/bin/python
 #
-#	Sets password settings (Password complexity, history length,
-#	minimum password length, the minimum and maximum password age) on a
-#	Samba4 server
+# Sets password settings (Password complexity, history length, minimum password
+# length, the minimum and maximum password age) on a Samba4 server
 #
-#	Copyright Jelmer Vernooij 2008
-#	Copyright Matthias Dieter Wallnoefer 2009
-#	Copyright Andrew Kroeger 2009
-#	Released under the GNU GPL version 3 or later
+# Copyright Matthias Dieter Wallnoefer 2009
+# Copyright Andrew Kroeger 2009
 #
-import os, sys
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import sys
 
-sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]), "../bin/python"))
+# Find right directory when running from source tree
+sys.path.insert(0, "bin/python")
 
 import samba.getopt as options
 import optparse
@@ -28,7 +40,6 @@ parser.add_option_group(options.VersionOptions(parser))
 credopts = options.CredentialsOptions(parser)
 parser.add_option_group(credopts)
 parser.add_option("--quiet", help="Be quiet", action="store_true")
-parser.add_option("-H", help="LDB URL for database or target server", type=str)
 parser.add_option("--complexity",
   help="The password complexity (on | off | default). Default is 'on'", type=str)
 parser.add_option("--history-length",
@@ -54,15 +65,9 @@ if len(args) == 0:
 	sys.exit(1)
 
 lp = sambaopts.get_loadparm()
-
 creds = credopts.get_credentials(lp)
 
-if opts.H is not None:
-	url = opts.H
-else:
-	url = lp.get("sam database")
-
-samdb = SamDB(url=url, session_info=system_session(),
+samdb = SamDB(url=lp.get("sam database"), session_info=system_session(),
               credentials=creds, lp=lp)
 
 domain_dn = SamDB.domain_dn(samdb)
diff --git a/source4/setup/setpassword b/source4/setup/setpassword
index 5fbba03c2b..d8a2a1144a 100755
--- a/source4/setup/setpassword
+++ b/source4/setup/setpassword
@@ -22,6 +22,7 @@
 
 import sys
 
+# Find right directory when running from source tree
 sys.path.insert(0, "bin/python")
 
 import samba.getopt as options