[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Thu Sep 29 20:17:02 UTC 2016


The branch, master has been updated
       via  f85b233a s4-kdc: Fix Coverity ID #1373385 (OVERRUN)
       via  9ad014e s4-kdc: Fix Coverity ID #1373386 (Resource Leak)
       via  9e98ac0 autobuild: add system-mitkrb5 build environment.
      from  28eae08 gensec_krb5: Implement smb_krb5_rd_req_decoded() with MIT Kerberos

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


- Log -----------------------------------------------------------------
commit f85b233a3e71447428aef312d8d369a37653f399
Author: Günther Deschner <gd at samba.org>
Date:   Tue Sep 27 18:34:38 2016 +0200

    s4-kdc: Fix Coverity ID #1373385 (OVERRUN)
    
    Guenther
    
    Pair-Programmed-With: Volker Lendecke <vl at samba.org>
    Pair-Programmed-With: Andreas Schneider <asn at samba.org>
    
    Signed-off-by: Guenther Deschner <gd at samba.org>
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Signed-off-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Günther Deschner <gd at samba.org>
    Autobuild-Date(master): Thu Sep 29 22:16:52 CEST 2016 on sn-devel-144

commit 9ad014ea4f9e0a770e4d90815410844180e22461
Author: Günther Deschner <gd at samba.org>
Date:   Tue Sep 27 18:30:29 2016 +0200

    s4-kdc: Fix Coverity ID #1373386 (Resource Leak)
    
    Guenther
    
    Pair-Programmed-With: Volker Lendecke <vl at samba.org>
    Signed-off-by: Guenther Deschner <gd at samba.org>

commit 9e98ac05c24bac7e49821160b0b3330fb95b68c2
Author: Günther Deschner <gd at samba.org>
Date:   Mon Sep 26 02:46:56 2016 +0200

    autobuild: add system-mitkrb5 build environment.
    
    We finally need to make sure the build with MIT Kerberos does not break all the
    time.
    
    Guenther
    
    Pair-Programmed-With: Stefan Metzmacher <metze at samba.org>
    
    Signed-off-by: Guenther Deschner <gd at samba.org>
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

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

Summary of changes:
 script/autobuild.py   | 17 ++++++++++++++++-
 source4/kdc/db-glue.c |  8 ++++----
 2 files changed, 20 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/script/autobuild.py b/script/autobuild.py
index b435790..356b7fa 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -29,6 +29,7 @@ builddirs = {
     "samba-libs"  : ".",
     "samba-static"  : ".",
     "samba-test-only"  : ".",
+    "samba-systemkrb5"  : ".",
     "ldb"     : "lib/ldb",
     "tdb"     : "lib/tdb",
     "talloc"  : "lib/talloc",
@@ -40,7 +41,7 @@ builddirs = {
     "retry"   : "."
     }
 
-defaulttasks = [ "ctdb", "samba", "samba-xc", "samba-o3", "samba-ctdb", "samba-libs", "samba-static", "ldb", "tdb", "talloc", "replace", "tevent", "pidl" ]
+defaulttasks = [ "ctdb", "samba", "samba-xc", "samba-o3", "samba-ctdb", "samba-libs", "samba-static", "samba-systemkrb5", "ldb", "tdb", "talloc", "replace", "tevent", "pidl" ]
 
 if os.environ.get("AUTOBUILD_SKIP_SAMBA_O3", "0") == "1":
     defaulttasks.remove("samba-o3")
@@ -162,6 +163,20 @@ tasks = {
                       ("nonshared-configure", "./configure.developer " + samba_configure_params + " --bundled-libraries=talloc,tdb,pytdb,ldb,pyldb,tevent,pytevent --with-static-modules=ALL --nonshared-binary=smbtorture,smbd/smbd", "text/plain"),
                       ("nonshared-make", "make -j", "text/plain")],
 
+    "samba-systemkrb5" : [
+                      ("random-sleep", "script/random-sleep.sh 60 600", "text/plain"),
+                      ("configure", "./configure.developer " + samba_configure_params + " --with-system-mitkrb5 --without-ad-dc", "text/plain"),
+                      ("make", "make -j", "text/plain"),
+                      # we currently cannot run a full make test, a limited list of tests could be run
+                      # via "make test TESTS=sometests"
+                      # ("test", "make test FAIL_IMMEDIATELY=1", "text/plain"),
+                      ("install", "make install", "text/plain"),
+                      ("check-clean-tree", "script/clean-source-tree.sh", "text/plain"),
+                      ("clean", "make clean", "text/plain")
+                      ],
+
+
+
     "ldb" : [
               ("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
               ("configure", "./configure --enable-developer -C ${PREFIX} ${EXTRA_PYTHON}", "text/plain"),
diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index ef750a8..bf55bef 100644
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -236,9 +236,8 @@ static int samba_kdc_sort_encryption_keys(struct sdb_entry_ex *entry_ex)
 		for (j = 0; j < keys_size; j++) {
 			const struct sdb_key skey = keys[j];
 
-			/* Paranoia: Do not overflow the key_data array */
-			if (idx > keys_size) {
-				return -1;
+			if (idx == keys_size) {
+				break;
 			}
 
 			if (KRB5_KEY_TYPE(&skey.key) == etype_list[i]) {
@@ -249,7 +248,8 @@ static int samba_kdc_sort_encryption_keys(struct sdb_entry_ex *entry_ex)
 	}
 
 	/* Paranoia: Something went wrong during data copy */
-	if (idx < keys_size) {
+	if (idx != keys_size) {
+		free(sorted_keys);
 		return -1;
 	}
 


-- 
Samba Shared Repository



More information about the samba-cvs mailing list