[Pkg-samba-maint] r3956 - in branches/samba/experimental/debian: . patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2011-10-29 09:32:18 +0000 (Sat, 29 Oct 2011)
New Revision: 3956

Added:
   branches/samba/experimental/debian/patches/initialize_password_db-null-deref
Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/control
   branches/samba/experimental/debian/patches/series
Log:
Merge changes from unreleased -5

Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2011-10-29 06:53:24 UTC (rev 3955)
+++ branches/samba/experimental/debian/changelog	2011-10-29 09:32:18 UTC (rev 3956)
@@ -1,6 +1,9 @@
 samba (2:3.6.1-2) UNRELEASED; urgency=low
 
-  * Merge changes from 3.5.11~dfsg-4 in unstable branch
+  * Merge changes from 3.5.11~dfsg-4 and unreleased -5 in unstable branch
+  * debian/patches/initialize_password_db-null-deref: Avoid null
+    dereference in initialize_password_db().  Closes LP: #829221.
+  * Mark samba-common Multi-Arch: foreign.
 
  -- Christian Perrier <bubulle at debian.org>  Tue, 25 Oct 2011 04:52:36 +0200
 

Modified: branches/samba/experimental/debian/control
===================================================================
--- branches/samba/experimental/debian/control	2011-10-29 06:53:24 UTC (rev 3955)
+++ branches/samba/experimental/debian/control	2011-10-29 09:32:18 UTC (rev 3956)
@@ -42,6 +42,7 @@
 
 Package: samba-common-bin
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (>= 2:3.4.0~pre1-2)
 Replaces: samba (<< 3.0.20b-1), samba-common (<< 2:3.4.0~pre1-2)
 Description: common files used by both the Samba server and client

Added: branches/samba/experimental/debian/patches/initialize_password_db-null-deref
===================================================================
--- branches/samba/experimental/debian/patches/initialize_password_db-null-deref	                        (rev 0)
+++ branches/samba/experimental/debian/patches/initialize_password_db-null-deref	2011-10-29 09:32:18 UTC (rev 3956)
@@ -0,0 +1,23 @@
+Description: Avoid null dereference in initialize_password_db()
+ When initialize_password_db() is called with reload=True, it's assumed that
+ the free_private_data member of pdb_methods is non-null.  This is not
+ necessarily the case, as the tdb backend has no private data and therefore
+ no free function.  Check to see if we have private data that needs freed
+ before calling.
+Author: Steve Langasek <steve.langasek at ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/829221
+
+Index: ubuntu/source3/passdb/pdb_interface.c
+===================================================================
+--- ubuntu.orig/source3/passdb/pdb_interface.c
++++ ubuntu/source3/passdb/pdb_interface.c
+@@ -176,7 +176,8 @@
+ 	static struct pdb_methods *pdb = NULL;
+ 
+ 	if ( pdb && reload ) {
+-		pdb->free_private_data( &(pdb->private_data) );
++		if (pdb->private_data)
++			pdb->free_private_data( &(pdb->private_data) );
+ 		if ( !NT_STATUS_IS_OK( make_pdb_method_name( &pdb, lp_passdb_backend() ) ) ) {
+ 			char *msg = NULL;
+ 			if (asprintf(&msg, "pdb_get_methods_reload: "

Modified: branches/samba/experimental/debian/patches/series
===================================================================
--- branches/samba/experimental/debian/patches/series	2011-10-29 06:53:24 UTC (rev 3955)
+++ branches/samba/experimental/debian/patches/series	2011-10-29 09:32:18 UTC (rev 3956)
@@ -12,3 +12,4 @@
 dont-build-VFS-examples.patch
 bug_601406_fix-perl-path-in-example.patch
 bug_221618_precise-64bit-prototype.patch
+initialize_password_db-null-deref