[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  6bfa21f wintest: autodetect if named supports tkey-gssapi-keytab
      from  9de6b4a wintest: put most of the main program login in wintest.py

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


- Log -----------------------------------------------------------------
commit 6bfa21f62410d1617d1d9d5208584fe9528810f5
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Dec 3 18:02:22 2010 +1100

    wintest: autodetect if named supports tkey-gssapi-keytab
    
    Autobuild-User: Andrew Tridgell <tridge at samba.org>
    Autobuild-Date: Fri Dec  3 08:48:52 CET 2010 on sn-devel-104

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

Summary of changes:
 wintest/conf/abartlet.conf |    1 +
 wintest/conf/tridge.conf   |    1 +
 wintest/test-s4-howto.py   |   28 +++++++++++++++++++++++++---
 3 files changed, 27 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/wintest/conf/abartlet.conf b/wintest/conf/abartlet.conf
index fe75408..af3c5b7 100644
--- a/wintest/conf/abartlet.conf
+++ b/wintest/conf/abartlet.conf
@@ -24,6 +24,7 @@ INTERFACE_NET         : 192.168.122.2/24
 
 # how to run bind9
 BIND9	              : /usr/sbin/named
+NAMED_CHECKCONF       : /usr/sbin/named-checkconf
 RNDC	              : /usr/sbin/rndc
 BIND_USER             : named
 
diff --git a/wintest/conf/tridge.conf b/wintest/conf/tridge.conf
index f9ab1dc..e6d6910 100644
--- a/wintest/conf/tridge.conf
+++ b/wintest/conf/tridge.conf
@@ -24,6 +24,7 @@ INTERFACE_NET	      : 10.0.0.2/24
 
 # how to run bind9
 BIND9	              : /usr/sbin/named
+NAMED_CHECKCONF       : /usr/sbin/named-checkconf
 RNDC	              : /usr/sbin/rndc
 BIND_USER	      : bind
 
diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index 5aa2e79..db699fd 100755
--- a/wintest/test-s4-howto.py
+++ b/wintest/test-s4-howto.py
@@ -3,14 +3,13 @@
 '''automated testing of the steps of the Samba4 HOWTO'''
 
 import sys, os
-import wintest, pexpect, time
+import wintest, pexpect, time, subprocess
 
 def check_prerequesites(t):
     t.info("Checking prerequesites")
     t.setvar('HOSTNAME', t.cmd_output("hostname -s").strip())
     if os.getuid() != 0:
         raise Exception("You must run this script as root")
-    t.putenv("KRB5_CONFIG", '${PREFIX}/private/krb5.conf')
     t.run_cmd('ifconfig ${INTERFACE} ${INTERFACE_NET} up')
     if t.getvar('INTERFACE_IPV6'):
         t.run_cmd('ifconfig ${INTERFACE} inet6 del ${INTERFACE_IPV6}/64', checkfail=False)
@@ -133,6 +132,16 @@ def rndc_cmd(t, cmd, checkfail=True):
     '''run a rndc command'''
     t.run_cmd("${RNDC} -c ${PREFIX}/etc/rndc.conf %s" % cmd, checkfail=checkfail)
 
+def named_supports_gssapi_keytab(t):
+    '''see if named supports tkey-gssapi-keytab'''
+    t.write_file("${PREFIX}/named.conf.test",
+                 'options { tkey-gssapi-keytab "test"; };')
+    try:
+        t.run_cmd("${NAMED_CHECKCONF} ${PREFIX}/named.conf.test")
+    except subprocess.CalledProcessError:
+        return False
+    return True
+
 
 def configure_bind(t):
     t.chdir('${PREFIX}')
@@ -148,6 +157,19 @@ def configure_bind(t):
         ipv6_listen = ''
     t.setvar('BIND_LISTEN_IPV6', ipv6_listen)
 
+    if named_supports_gssapi_keytab(t):
+        t.setvar("NAMED_TKEY_OPTION",
+                 'tkey-gssapi-keytab "${PREFIX}/private/dns.keytab";')
+    else:
+        t.info("LCREALM=${LCREALM}")
+        t.setvar("NAMED_TKEY_OPTION",
+                 '''tkey-gssapi-credential "DNS/${LCREALM}";
+                 tkey-domain "${LCREALM}";
+                 ''')
+        t.putenv("KRB5_CONFIG", '${PREFIX}/private/krb5.conf')
+        t.putenv('KEYTAB_FILE', '${PREFIX}/private/dns.keytab')
+        t.putenv('KRB5_KTNAME', '${PREFIX}/private/dns.keytab')
+
     t.write_file("etc/named.conf", '''
 options {
 	listen-on port 53 { ${INTERFACE_IP};  };
@@ -159,7 +181,7 @@ options {
         memstatistics-file "${PREFIX}/var/named/data/named_mem_stats.txt";
 	allow-query     { any; };
 	recursion yes;
-	tkey-gssapi-keytab "${PREFIX}/private/dns.keytab";
+	${NAMED_TKEY_OPTION}
         max-cache-ttl 10;
         max-ncache-ttl 10;
 


-- 
Samba Shared Repository