Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at 2012-02-28 14:15:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/samba (Old) and /work/SRC/openSUSE:Factory/.samba.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "samba", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/samba/samba.changes 2012-02-15 16:17:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.samba.new/samba.changes 2012-02-28 14:15:51.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Feb 17 13:34:23 CET 2012 - [email protected] + +- Add SERVERID_UNIQUE_ID_NOT_TO_VERIFY; (bso#8760); (bnc#741854). + +------------------------------------------------------------------- +Thu Feb 16 11:00:37 CET 2012 - [email protected] + +- s3-printing: fix crash in printer_list_set_printer(); (bso#8762); + (bnc#746825). + +------------------------------------------------------------------- @@ -60 +71,2 @@ -- Fix memory leak in parent smbd on connection; CVE-2012-0817; (bso#8724); +- Update to 3.6.3. + + Fix memory leak in parent smbd on connection; CVE-2012-0817; (bso#8724); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.zd7sBG/_old 2012-02-28 14:15:53.000000000 +0100 +++ /var/tmp/diff_new_pack.zd7sBG/_new 2012-02-28 14:15:53.000000000 +0100 @@ -437,7 +437,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %changelog ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.zd7sBG/_old 2012-02-28 14:15:53.000000000 +0100 +++ /var/tmp/diff_new_pack.zd7sBG/_new 2012-02-28 14:15:53.000000000 +0100 @@ -208,7 +208,7 @@ The Samba Team <[email protected]> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %package client @@ -252,7 +252,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -278,7 +278,7 @@ The Samba Team <[email protected]> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %endif @@ -308,7 +308,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %endif @@ -335,7 +335,7 @@ -------- Jeremy Allison <jra at samba dot org> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %if %{make_utils} @@ -356,7 +356,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %endif @@ -391,7 +391,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -417,14 +417,14 @@ %description -n libsmbclient -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %else %description -n libsmbclient0 -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %endif @@ -472,7 +472,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %package -n libnetapi0 @@ -490,7 +490,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %package -n libnetapi-devel @@ -514,7 +514,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -535,14 +535,14 @@ %description -n libsmbsharemodes -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %else %description -n libsmbsharemodes0 -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %endif @@ -578,7 +578,7 @@ The Samba Team <[email protected]> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %package -n libwbclient0 @@ -596,7 +596,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %package -n libwbclient-devel @@ -620,7 +620,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %package -n libtalloc2 @@ -640,7 +640,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %package -n libtalloc-devel @@ -666,7 +666,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %package -n libtdb1 @@ -686,7 +686,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %package -n libtdb-devel @@ -708,7 +708,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %package -n libtevent0 @@ -728,7 +728,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %package -n libtevent-devel @@ -756,7 +756,7 @@ The Samba Team <[email protected]> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %package -n libldb1 @@ -778,7 +778,7 @@ The Samba Team <[email protected]> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %package -n libldb-devel @@ -805,7 +805,7 @@ -------- The Samba Team <[email protected]> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %if %{make_ldapsmb} @@ -828,7 +828,7 @@ -------- Guenther Deschner <guenther at deschner dot de> -Source Timestamp: 2757 +Source Timestamp: 2761 Branch : trunk %endif ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.zd7sBG/_old 2012-02-28 14:15:53.000000000 +0100 +++ /var/tmp/diff_new_pack.zd7sBG/_new 2012-02-28 14:15:53.000000000 +0100 @@ -1,2 +1,2 @@ -2757 +2761 Branch : trunk ++++++ patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/a6bd7f3d574998419cac01b1f7b4fa2e1067bb7c new/patches/samba.org/a6bd7f3d574998419cac01b1f7b4fa2e1067bb7c --- old/patches/samba.org/a6bd7f3d574998419cac01b1f7b4fa2e1067bb7c 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/a6bd7f3d574998419cac01b1f7b4fa2e1067bb7c 2012-02-16 10:58:35.000000000 +0100 @@ -0,0 +1,38 @@ +From a6bd7f3d574998419cac01b1f7b4fa2e1067bb7c Mon Sep 17 00:00:00 2001 +From: David Disseldorp <[email protected]> +Date: Wed, 15 Feb 2012 16:30:27 +0100 +Subject: [PATCH] s3-printing: fix crash in printer_list_set_printer() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The printer list database format was recently changed to accommodate for +the printcap location field. +One of the tdb_pack calls is not provided with a location string +argument, this causes a crash on some platforms. + +https://bugzilla.samba.org/show_bug.cgi?id=8762 + +Signed-off-by: Günther Deschner <[email protected]> +Signed-off-by: Jim McDonough <[email protected]> +Signed-off-by: Lars Müller <[email protected]> + +Autobuild-User: David Disseldorp <[email protected]> +Autobuild-Date: Wed Feb 15 19:34:38 CET 2012 on sn-devel-104 +--- + source3/printing/printer_list.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +Index: source3/printing/printer_list.c +=================================================================== +--- source3/printing/printer_list.c.orig ++++ source3/printing/printer_list.c +@@ -191,7 +191,7 @@ NTSTATUS printer_list_set_printer(TALLOC + data.dsize = len; + + len = tdb_pack(data.dptr, data.dsize, +- PL_DATA_FORMAT, time_h, time_l, name, str); ++ PL_DATA_FORMAT, time_h, time_l, name, str, str2); + + status = dbwrap_store_bystring_upper(db, key, data, TDB_REPLACE); + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/dd5868d41eeaa304a471822d7783526d9f4c37f5 new/patches/samba.org/dd5868d41eeaa304a471822d7783526d9f4c37f5 --- old/patches/samba.org/dd5868d41eeaa304a471822d7783526d9f4c37f5 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/dd5868d41eeaa304a471822d7783526d9f4c37f5 2012-02-17 13:26:25.000000000 +0100 @@ -0,0 +1,100 @@ +From a2d10f1367620ae080da48baee0c0a8d1648d42b Mon Sep 17 00:00:00 2001 +From: Volker Lendecke <[email protected]> +Date: Thu, 16 Feb 2012 14:22:42 -0800 +Subject: [PATCH] s3: Add SERVERID_UNIQUE_ID_NOT_TO_VERIFY, bug 8760 + +Back-port of commit dd5868d41eeaa304a471822d7783526d9f4c37f5 +from master. Back-port done by Manoj Dahal <[email protected]>. +--- + source3/include/serverid.h | 9 +++++++++ + source3/lib/serverid.c | 16 ++++++++++++++++ + source3/smbd/server.c | 6 ++---- + 3 files changed, 27 insertions(+), 4 deletions(-) + +Index: source3/include/serverid.h +=================================================================== +--- source3/include/serverid.h.orig ++++ source3/include/serverid.h +@@ -22,6 +22,9 @@ + + #include "includes.h" + ++/** Don't verify this unique id */ ++#define SERVERID_UNIQUE_ID_NOT_TO_VERIFY 0xFFFFFFFFFFFFFFFFULL ++ + /* + * Register a server with its unique id + */ +@@ -64,4 +67,10 @@ bool serverid_traverse_read(int (*fn)(co + */ + bool serverid_parent_init(TALLOC_CTX *mem_ctx); + ++/* ++ * Get a random unique_id and make sure that it is not ++ * SERVERID_UNIQUE_ID_NOT_TO_VERIFY ++ */ ++uint64_t serverid_get_random_unique_id(void); ++ + #endif +Index: source3/lib/serverid.c +=================================================================== +--- source3/lib/serverid.c.orig ++++ source3/lib/serverid.c +@@ -241,6 +241,10 @@ bool serverid_exists(const struct server + return false; + } + ++ if (id->unique_id == SERVERID_UNIQUE_ID_NOT_TO_VERIFY) { ++ return true; ++ } ++ + db = serverid_db(); + if (db == NULL) { + return false; +@@ -355,3 +359,15 @@ bool serverid_traverse(int (*fn)(struct + state.private_data = private_data; + return db->traverse(db, serverid_traverse_fn, &state); + } ++ ++uint64_t serverid_get_random_unique_id(void) ++{ ++ uint64_t unique_id = SERVERID_UNIQUE_ID_NOT_TO_VERIFY; ++ ++ while (unique_id == SERVERID_UNIQUE_ID_NOT_TO_VERIFY) { ++ generate_random_buffer((uint8_t *)&unique_id, ++ sizeof(unique_id)); ++ } ++ ++ return unique_id; ++} +Index: source3/smbd/server.c +=================================================================== +--- source3/smbd/server.c.orig ++++ source3/smbd/server.c +@@ -447,7 +447,7 @@ static void smbd_accept_connection(struc + * Generate a unique id in the parent process so that we use + * the global random state in the parent. + */ +- generate_random_buffer((uint8_t *)&unique_id, sizeof(unique_id)); ++ unique_id = serverid_get_random_unique_id(); + + pid = sys_fork(); + if (pid == 0) { +@@ -920,7 +920,6 @@ extern void build_options(bool screen); + struct smbd_parent_context *parent = NULL; + TALLOC_CTX *frame; + NTSTATUS status; +- uint64_t unique_id; + + /* + * Do this before any other talloc operation +@@ -1119,8 +1118,7 @@ extern void build_options(bool screen); + become_daemon(Fork, no_process_group, log_stdout); + } + +- generate_random_buffer((uint8_t *)&unique_id, sizeof(unique_id)); +- set_my_unique_id(unique_id); ++ set_my_unique_id(serverid_get_random_unique_id()); + + #if HAVE_SETPGID + /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series --- old/patches/series 2012-02-06 14:39:41.000000000 +0100 +++ new/patches/series 2012-02-17 13:26:12.000000000 +0100 @@ -15,6 +15,8 @@ samba.org/9ba7748b5f1c08dbefbb8d9c9646f631c2a355e0 -p0 # bso 8733 1/2 samba.org/693533ba5b91d74925568f719bdee969c6637ba7 -p0 # bso 8733 2/2 samba.org/9d5ed16ddac1598918338a432e9effa8ab869300 -p0 # bso 8406 +samba.org/a6bd7f3d574998419cac01b1f7b4fa2e1067bb7c -p0 # bso 8762, bnc 746825 +samba.org/dd5868d41eeaa304a471822d7783526d9f4c37f5 -p0 # bso 8760, bnc 741854 # SuSE specific changes # disabled -> WIP lmuelle ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2012-02-09 13:53:44.000000000 +0100 +++ new/vendor-files/tools/package-data 2012-02-17 13:51:47.000000000 +0100 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="2757" +SAMBA_PACKAGE_SVN_VERSION="2761" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
