[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  06809f4 s4:provision: ask the admin about the desired DNS implementation
      from  e3b6b46 Force cast to long as on some platform tv_usec is 32bit long

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


- Log -----------------------------------------------------------------
commit 06809f4ba9b41e51d444806304a40b719f8c768a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Sep 10 09:44:07 2012 +0200

    s4:provision: ask the admin about the desired DNS implementation
    
    In interactive mode we should let the admin confirm which
    implementation he wants.
    
    metze
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Mon Sep 10 11:45:08 CEST 2012 on sn-devel-104

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

Summary of changes:
 source4/setup/provision |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/setup/provision b/source4/setup/provision
index 2df718e..6cb4674 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -167,6 +167,12 @@ if opts.interactive:
         sys.exit(1)
 
     opts.server_role = ask("Server Role (dc, member, standalone)", "dc")
+
+    opts.dns_backend = ask("DNS backend (SAMBA_INTERNAL, BIND9_FLATFILE, BIND9_DLZ, NONE)", "BIND9_DLZ")
+    if opts.dns_backend in (None, ''):
+        print >> sys.stderr, "No DNS backend set!"
+        sys.exit(1)
+
     while True:
         adminpass = getpass("Administrator password: ")
         if not adminpass:


-- 
Samba Shared Repository