[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  0adc164 s4-auth: fixed a vagrind error when creating keytabs
       via  0111e80 autobuild: revert a bit more of the subunit changes
       via  b75c1f5 autobuild: disable the subuit changes for now - they break error checking
      from  afe78c2 autobuild: fixed the tuples in the retry_task

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


- Log -----------------------------------------------------------------
commit 0adc1645e23fedf52b10ed545eb9935df9ad7b6f
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Oct 1 13:07:42 2010 -0700

    s4-auth: fixed a vagrind error when creating keytabs
    
    Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>

commit 0111e80ea9f7a4d833771f349e5ce05025f7276c
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Oct 1 13:07:04 2010 -0700

    autobuild: revert a bit more of the subunit changes
    
    still not quite right - we can enable this again once its fully tested

commit b75c1f57c2a59bffbe4bef7ef7207758466be7bb
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Oct 1 11:31:28 2010 -0700

    autobuild: disable the subuit changes for now - they break error checking

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

Summary of changes:
 script/autobuild.py                   |    8 ++++----
 source4/auth/kerberos/kerberos_util.c |    3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/script/autobuild.py b/script/autobuild.py
index a2d2a2c..9c1520a 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -22,12 +22,12 @@ tasks = {
                   ("make basics", "make basics", "text/plain"),
                   ("make", "make -j 4 everything", "text/plain"), # don't use too many processes
                   ("install", "make install", "text/plain"),
-                  ("test", "TDB_NO_FSYNC=1 make subunit-test FAIL_IMMEDIATELY=1", "text/x-subunit") ],
+                  ("test", "TDB_NO_FSYNC=1 make test FAIL_IMMEDIATELY=1", "text/plain") ],
 
     "source4" : [ ("configure", "./configure.developer ${PREFIX}", "text/plain"),
                   ("make", "make -j", "text/plain"),
                   ("install", "make install", "text/plain"),
-                  ("test", "TDB_NO_FSYNC=1 make subunit-test FAIL_IMMEDIATELY=1", "text/x-subunit") ],
+                  ("test", "TDB_NO_FSYNC=1 make test FAIL_IMMEDIATELY=1", "text/plain") ],
 
     "source4/lib/ldb" : [ ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
                           ("make", "make -j", "text/plain"),
@@ -124,8 +124,8 @@ class builder(object):
             return
         (self.stage, self.cmd, self.output_mime_type) = self.sequence[self.next]
         self.cmd = self.cmd.replace("${PREFIX}", "--prefix=%s" % self.prefix)
-        if self.output_mime_type == "text/x-subunit":
-            self.cmd += " | %s --immediate" % (os.path.join(os.path.dirname(__file__), "selftest/format-subunit"))
+#        if self.output_mime_type == "text/x-subunit":
+#            self.cmd += " | %s --immediate" % (os.path.join(os.path.dirname(__file__), "selftest/format-subunit"))
         print '%s: [%s] Running %s' % (self.name, self.stage, self.cmd)
         cwd = os.getcwd()
         os.chdir("%s/%s" % (self.sdir, self.dir))
diff --git a/source4/auth/kerberos/kerberos_util.c b/source4/auth/kerberos/kerberos_util.c
index 76edf0d..f83fd78 100644
--- a/source4/auth/kerberos/kerberos_util.c
+++ b/source4/auth/kerberos/kerberos_util.c
@@ -530,6 +530,9 @@ static krb5_error_code keytab_add_keys(TALLOC_CTX *parent_ctx,
 
 	for (i=0; enctypes[i]; i++) {
 		krb5_keytab_entry entry;
+
+		ZERO_STRUCT(entry);
+
 		ret = create_kerberos_key_from_string(smb_krb5_context->krb5_context, 
 						      salt_princ, &password, &entry.keyblock, enctypes[i]);
 		if (ret != 0) {


-- 
Samba Shared Repository