diff --git a/.cvsignore b/.cvsignore index f60e85e..9cccc0d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -samba-3.4.5.tar.gz +samba-3.4.6.tar.gz diff --git a/samba-3.4.5-cifs_upcall.patch b/samba-3.4.5-cifs_upcall.patch deleted file mode 100644 index 7cbc0e0..0000000 --- a/samba-3.4.5-cifs_upcall.patch +++ /dev/null @@ -1,61 +0,0 @@ -From efc2e996e3348392f1fd5c0ec7feae4f869fb8f9 Mon Sep 17 00:00:00 2001 -From: Jeff Layton -Date: Tue, 16 Feb 2010 09:16:42 -0500 -Subject: [PATCH] cifs.upcall: allocate a talloc context for smb_krb5_unparse_name -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -cifs.upcall calls smb_krb5_unparse_name with a NULL talloc context. -Older versions of this function though will conditionally use -SMB_REALLOC instead of TALLOC_REALLOC when a NULL context is passed -in. To make it more consistent, just spawn a talloc context that -we can pass into this function. - -Resolves: -https://bugzilla.redhat.com/show_bug.cgi?id=565446 -https://bugzilla.samba.org/show_bug.cgi?id=6868 - -Reported-by: Ludek Finstrle -Signed-off-by: Jeff Layton -Signed-off-by: Günther Deschner -(cherry picked from commit a8cc2fa09ed43a167f62711bef363a5ac335dc78) ---- - source3/client/cifs.upcall.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/source3/client/cifs.upcall.c b/source3/client/cifs.upcall.c -index 1617e0e..d573e76 100644 ---- a/source3/client/cifs.upcall.c -+++ b/source3/client/cifs.upcall.c -@@ -55,6 +55,7 @@ get_tgt_time(const char *ccname) { - krb5_principal principal; - time_t credtime = 0; - char *realm = NULL; -+ TALLOC_CTX *mem_ctx; - - if (krb5_init_context(&context)) { - syslog(LOG_DEBUG, "%s: unable to init krb5 context", __func__); -@@ -86,9 +87,10 @@ get_tgt_time(const char *ccname) { - goto err_ccstart; - } - -+ mem_ctx = talloc_init("cifs.upcall"); - while (!credtime && !krb5_cc_next_cred(context, ccache, &cur, &creds)) { - char *name; -- if (smb_krb5_unparse_name(NULL, context, creds.server, &name)) { -+ if (smb_krb5_unparse_name(mem_ctx, context, creds.server, &name)) { - syslog(LOG_DEBUG, "%s: unable to unparse name", __func__); - goto err_endseq; - } -@@ -101,6 +103,7 @@ get_tgt_time(const char *ccname) { - TALLOC_FREE(name); - } - err_endseq: -+ TALLOC_FREE(mem_ctx); - krb5_cc_end_seq_get(context, ccache, &cur); - err_ccstart: - krb5_free_principal(context, principal); --- -1.6.6 - diff --git a/samba-3.4.5-pdbedit.patch b/samba-3.4.5-pdbedit.patch deleted file mode 100644 index aa9fcb8..0000000 --- a/samba-3.4.5-pdbedit.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ad6a97f4a6908fa8858cd4bb9e5d804e8c29aba0 Mon Sep 17 00:00:00 2001 -From: Volker Lendecke -Date: Wed, 27 May 2009 18:40:13 +0200 -Subject: [PATCH] Do not segfault in pdb_search_destructor if no real search was started - (cherry picked from commit d07464b21fe652e205f5eb2c74d12495bab100ce) - ---- - source3/passdb/pdb_interface.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c -index 8c00329..01815c6 100644 ---- a/source3/passdb/pdb_interface.c -+++ b/source3/passdb/pdb_interface.c -@@ -1711,7 +1711,7 @@ static NTSTATUS pdb_default_lookup_names(struct pdb_methods *methods, - - static int pdb_search_destructor(struct pdb_search *search) - { -- if (!search->search_ended) { -+ if ((!search->search_ended) && (search->search_end != NULL)) { - search->search_end(search); - } - return 0; -@@ -1733,6 +1733,7 @@ struct pdb_search *pdb_search_init(TALLOC_CTX *mem_ctx, - result->num_entries = 0; - result->cache_size = 0; - result->search_ended = False; -+ result->search_end = NULL; - - /* Segfault appropriately if not initialized */ - result->next_entry = NULL; --- -1.6.6 - diff --git a/samba.spec b/samba.spec index 0884ef8..a22b202 100644 --- a/samba.spec +++ b/samba.spec @@ -1,5 +1,5 @@ -%define main_release 56 -%define samba_version 3.4.5 +%define main_release 57 +%define samba_version 3.4.6 %define tdb_version 1.1.3 %define talloc_version 1.3.0 #%define pre_release rc1 @@ -45,9 +45,7 @@ Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch # The passwd part has been applied, but not the group part Patch107: samba-3.2.0pre1-grouppwd.patch Patch200: samba-3.2.5-inotify.patch -Patch201: samba-3.4.5-pdbedit.patch Patch202: samba-3.4.5-CVE-2009-3297-mount_cifs.patch -Patch203: samba-3.4.5-cifs_upcall.patch Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release} Requires: pam >= 0:0.64 @@ -205,9 +203,7 @@ cp %{SOURCE11} packaging/Fedora/ #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply %patch107 -p1 -b .grouppwd %patch200 -p0 -b .inotify -%patch201 -p1 -b .pdbedit %patch202 -p1 -b .CVE-2009-3297-mount_cifs -%patch203 -p1 -b .cifs_upcall mv %samba_source/VERSION %samba_source/VERSION.orig sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION @@ -660,6 +656,9 @@ exit 0 %{_datadir}/pixmaps/samba/logo-small.png %changelog +* Wed Feb 24 2010 Guenther Deschner - 3.4.6-57 +- Update to 3.4.6 + * Wed Feb 17 2010 Guenther Deschner - 3.4.5-56 - Fix crash in cifs.upcall - resolves: #565446 diff --git a/sources b/sources index c34da44..144cea4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8e8a484782f2b7716b6c6bd9a7d2bf71 samba-3.4.5.tar.gz +1090ea7e85b0b915c7e3c427d6457e36 samba-3.4.6.tar.gz