[SCM] Samba Shared Repository - branch master updated

[Kai Blin]

The branch, master has been updated
       via  1dbcb61 dns: Move the dns_srv_record to the correct place in the idl file
       via  f163bd1 dns: Add support for TXT record to idl file
       via  d5dcb9e wscript: Also generate ctags for python files
       via  5c890ad s4 provision: Set server role default when called from command line to 'dc'
      from  95bb2c2 s3:registry: fix the test for a REG_SZ blob possibly being a zero terminated ucs2 string

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


- Log -----------------------------------------------------------------
commit 1dbcb61c79a0c06fdcfa36bb9304fb0fb66d7ff8
Author: Kai Blin <kai at samba.org>
Date:   Thu Sep 29 19:34:08 2011 -0700

    dns: Move the dns_srv_record to the correct place in the idl file
    
    Autobuild-User: Kai Blin <kai at samba.org>
    Autobuild-Date: Sun Oct  2 13:35:49 CEST 2011 on sn-devel-104

commit f163bd1dac691d396725ac27e4493f6d217a66ce
Author: Kai Blin <kai at samba.org>
Date:   Thu Sep 29 19:32:57 2011 -0700

    dns: Add support for TXT record to idl file

commit d5dcb9eef1aaf78ae24bca90235acc263bc04a26
Author: Kai Blin <kai at samba.org>
Date:   Wed Sep 28 12:07:27 2011 -0700

    wscript: Also generate ctags for python files

commit 5c890ad17ff84bd6ed1dfb26df3cac439fcf37c3
Author: Kai Blin <kai at samba.org>
Date:   Fri Sep 30 16:23:39 2011 -0700

    s4 provision: Set server role default when called from command line to 'dc'

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

Summary of changes:
 librpc/idl/dns.idl      |   16 +++++++++++-----
 source4/setup/provision |    3 +++
 wscript                 |    2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/idl/dns.idl b/librpc/idl/dns.idl
index 66390b8..08a1699 100644
--- a/librpc/idl/dns.idl
+++ b/librpc/idl/dns.idl
@@ -132,17 +132,22 @@ interface dns
 	} dns_soa_record;
 
 	typedef [public] struct {
+		uint16     preference;
+		dns_string exchange;
+	} dns_mx_record;
+
+	typedef [public] struct {
+		[value(strlen(txt))] uint8 length;
+		[charset(DOS)] uint8 txt[length];
+	} dns_txt_record;
+
+	typedef [public] struct {
 		uint16     priority;
 		uint16     weight;
 		uint16     port;
 		dns_string target;
 	} dns_srv_record;
 
-	typedef [public] struct {
-		uint16     preference;
-		dns_string exchange;
-	} dns_mx_record;
-
 	typedef [nodiscriminant,public,flag(NDR_NOALIGN)] union {
 		[case(DNS_QTYPE_A)]     ipv4address	 ipv4_record;
 		[case(DNS_QTYPE_NS)]    dns_string       ns_record;
@@ -150,6 +155,7 @@ interface dns
 		[case(DNS_QTYPE_SOA)]   dns_soa_record   soa_record;
 		[case(DNS_QTYPE_PTR)]   dns_string       ptr_record;
 		[case(DNS_QTYPE_MX)]    dns_mx_record    mx_record;
+		[case(DNS_QTYPE_TXT)]	dns_txt_record   txt_record;
 		[case(DNS_QTYPE_AAAA)]	ipv6address	 ipv6_record;
 		[case(DNS_QTYPE_SRV)]	dns_srv_record	 srv_record;
 		[default];
diff --git a/source4/setup/provision b/source4/setup/provision
index 315de78..d05af51 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -198,6 +198,9 @@ elif opts.server_role == "member":
 else:
     server_role = opts.server_role
 
+if server_role is None:
+    server_role = "domain controller"
+
 if opts.function_level is None:
     dom_for_fun_level = None
 elif opts.function_level == "2000":
diff --git a/wscript b/wscript
index 8454146..1b50baf 100755
--- a/wscript
+++ b/wscript
@@ -146,7 +146,7 @@ def ctags(ctx):
     "build 'tags' file using ctags"
     import Utils
     source_root = os.path.dirname(Utils.g_module.root_path)
-    cmd = 'ctags $(find %s -name "*.[ch]" | grep -v "*_proto\.h" | egrep -v \.inst\.)' % source_root
+    cmd = 'ctags --python-kinds=-i $(find %s -name "*.[ch]" | grep -v "*_proto\.h" | egrep -v \.inst\.) $(find %s -name "*.py")' % (source_root, source_root)
     print("Running: %s" % cmd)
     os.system(cmd)
 


-- 
Samba Shared Repository