[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  1e949f3 provision: Simplify handling of default for --server-role.
       via  8cd7cc3 provision: Simplify handling of default for --function-level.
       via  efa5948 provision: Simplify handling of default for --dns-backend option.
       via  dd0b879 s3/selftest: Fix reference to knownfail file.
      from  8405fee build: rebuild idl if the pidl compiler is changed

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1e949f3cd173fbf86d9b14a6d6e43c81fdc9cc57
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Apr 15 23:36:54 2012 +0200

    provision: Simplify handling of default for --server-role.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Mon Apr 16 18:12:24 CEST 2012 on sn-devel-104

commit 8cd7cc33d944699ef8e9d34d31254f80035c0763
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Apr 15 23:35:41 2012 +0200

    provision: Simplify handling of default for --function-level.

commit efa594820ad8be86148b8e36f5a623f8346edea0
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Apr 15 23:35:07 2012 +0200

    provision: Simplify handling of default for --dns-backend option.

commit dd0b8792a0cb1b5f659bab8163bc1e71d9a4b3c9
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Apr 15 23:33:22 2012 +0200

    s3/selftest: Fix reference to knownfail file.

-----------------------------------------------------------------------

Summary of changes:
 source3/selftest/tests.py |    2 +-
 source4/setup/provision   |   27 +++++++++------------------
 2 files changed, 10 insertions(+), 19 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index fb1eaae..70c8fe0 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -8,7 +8,7 @@
 
 # The idea is that this script outputs all of the tests of Samba 3, not 
 # just those that are known to pass, and list those that should be skipped 
-# or are known to fail in selftest/skip or selftest/samba4-knownfail. This makes it 
+# or are known to fail in selftest/skip or selftest/samba3-knownfail. This makes it 
 # very easy to see what functionality is still missing in Samba 3 and makes 
 # it possible to run the testsuite against other servers, such as Samba 4 or 
 # Windows that have a different set of features.
diff --git a/source4/setup/provision b/source4/setup/provision
index 523b082..f254fa7 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -86,7 +86,8 @@ parser.add_option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND",
         help="The DNS server backend. SAMBA_INTERNAL is the builtin name server, " \
              "BIND9_FLATFILE uses bind9 text database to store zone information, " \
              "BIND9_DLZ uses samba4 AD to store zone information (default), " \
-             "NONE skips the DNS setup entirely (not recommended)")
+             "NONE skips the DNS setup entirely (not recommended)",
+        default="BIND9_DLZ")
 parser.add_option("--dnspass", type="string", metavar="PASSWORD",
         help="choose dns password (otherwise random)")
 parser.add_option("--ldapadminpass", type="string", metavar="PASSWORD",
@@ -107,10 +108,12 @@ parser.add_option("--ldap-backend-type", type="choice", metavar="LDAP-BACKEND-TY
         choices=["fedora-ds", "openldap"])
 parser.add_option("--server-role", type="choice", metavar="ROLE",
           choices=["domain controller", "dc", "member server", "member", "standalone"],
-        help="The server role (domain controller | dc | member server | member | standalone). Default is dc.")
+        help="The server role (domain controller | dc | member server | member | standalone). Default is dc.",
+        default="domain controller")
 parser.add_option("--function-level", type="choice", metavar="FOR-FUN-LEVEL",
           choices=["2000", "2003", "2008", "2008_R2"],
-        help="The domain and forest function level (2000 | 2003 | 2008 | 2008_R2 - always native). Default is (Windows) 2003 Native.")
+        help="The domain and forest function level (2000 | 2003 | 2008 | 2008_R2 - always native). Default is (Windows) 2003 Native.",
+        default="2003")
 parser.add_option("--next-rid", type="int", metavar="NEXTRID", default=1000,
         help="The initial nextRid value (only needed for upgrades).  Default is 1000.")
 parser.add_option("--partitions-only",
@@ -194,14 +197,7 @@ if not opts.adminpass:
 lp = sambaopts.get_loadparm()
 smbconf = lp.configfile
 
-server_role = opts.server_role
-
-if server_role is None:
-    server_role = "domain controller"
-
-if opts.function_level is None:
-    dom_for_fun_level = DS_DOMAIN_FUNCTION_2003
-elif opts.function_level == "2000":
+if opts.function_level == "2000":
     dom_for_fun_level = DS_DOMAIN_FUNCTION_2000
 elif opts.function_level == "2003":
     dom_for_fun_level = DS_DOMAIN_FUNCTION_2003
@@ -210,11 +206,6 @@ elif opts.function_level == "2008":
 elif opts.function_level == "2008_R2":
     dom_for_fun_level = DS_DOMAIN_FUNCTION_2008_R2
 
-if opts.dns_backend is None:
-    dns_backend = "BIND9_DLZ"
-else:
-    dns_backend = opts.dns_backend
-
 creds = credopts.get_credentials(lp)
 
 creds.set_kerberos_state(DONT_USE_KERBEROS)
@@ -259,10 +250,10 @@ try:
           ntdsguid=opts.ntds_guid,
           invocationid=opts.invocationid, adminpass=opts.adminpass,
           krbtgtpass=opts.krbtgtpass, machinepass=opts.machinepass,
-          dns_backend=dns_backend,
+          dns_backend=opts.dns_backend,
           dnspass=opts.dnspass, root=opts.root, nobody=opts.nobody,
           wheel=opts.wheel, users=opts.users,
-          serverrole=server_role, dom_for_fun_level=dom_for_fun_level,
+          serverrole=opts.server_role, dom_for_fun_level=dom_for_fun_level,
           backend_type=opts.ldap_backend_type,
           ldapadminpass=opts.ldapadminpass, ol_mmr_urls=opts.ol_mmr_urls,
           slapd_path=opts.slapd_path, 


-- 
Samba Shared Repository