[Pkg-samba-maint] r4137 - trunk/samba/debian/patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2012-06-26 19:58:53 +0000 (Tue, 26 Jun 2012)
New Revision: 4137

Removed:
   trunk/samba/debian/patches/dont_start_when_guest_account_doesnt_exist.patch
   trunk/samba/debian/patches/fix-samba.ldif-syntax.patch
   trunk/samba/debian/patches/initialize_password_db-null-deref
Modified:
   trunk/samba/debian/patches/series
Log:
Drop patches that have been applied in 3.6.6


Deleted: trunk/samba/debian/patches/dont_start_when_guest_account_doesnt_exist.patch
===================================================================
--- trunk/samba/debian/patches/dont_start_when_guest_account_doesnt_exist.patch	2012-06-26 14:48:20 UTC (rev 4136)
+++ trunk/samba/debian/patches/dont_start_when_guest_account_doesnt_exist.patch	2012-06-26 19:58:53 UTC (rev 4137)
@@ -1,26 +0,0 @@
-Description: Don't start smbd when guest account doesn't exist
- When the guest account doesn't exist, smbd should not start, because it will
- crash when accessing a share as guest user.
- .
- This patch correctly returns the status of make_new_server_info_guest.
- .
- This is a backport of commit 51567de6d7d91f727a2135cd2d5434f85db6d45a by
- Volker Lendecke <vl at samba.org> from upstream samba git master.
-Author: Ivo De Decker <ivo.dedecker at ugent.be>
-Origin: upstream
-Bug: https://bugzilla.samba.org/show_bug.cgi?id=9004
-Bug-Debian: http://bugs.debian.org/653382
-Forwarded: not-needed
-Last-Update: 2012-06-24
-
---- samba-3.6.5.orig/source3/auth/auth_util.c
-+++ samba-3.6.5/source3/auth/auth_util.c
-@@ -760,7 +760,7 @@ static NTSTATUS make_new_server_info_gue
- 	status = NT_STATUS_OK;
- done:
- 	TALLOC_FREE(tmp_ctx);
--	return NT_STATUS_OK;
-+	return status;
- }
- 
- /***************************************************************************

Deleted: trunk/samba/debian/patches/fix-samba.ldif-syntax.patch
===================================================================
--- trunk/samba/debian/patches/fix-samba.ldif-syntax.patch	2012-06-26 14:48:20 UTC (rev 4136)
+++ trunk/samba/debian/patches/fix-samba.ldif-syntax.patch	2012-06-26 19:58:53 UTC (rev 4137)
@@ -1,19 +0,0 @@
-Description: Fix example samba.ldif
-Author: Christian Perrier <bubulle at debian.org>
-Bug: https://bugzilla.samba.org/show_bug.cgi?id=8789
-Forwarded: yes
-Bug-Debian: http://bugs.debian.org/659963
-
-Index: samba/examples/LDAP/samba.ldif
-===================================================================
---- samba.orig/examples/LDAP/samba.ldif
-+++ samba/examples/LDAP/samba.ldif
-@@ -153,7 +153,7 @@
-  21.1.27 SINGLE-VALUE )
- olcAttributeTypes: {50}( 1.3.6.1.4.1.7165.2.1.73 NAME 'sambaTrustPartner' DESC
-   'Fully qualified name of the domain with which a trust exists' EQUALITY case
--  IgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
-+ IgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
- olcAttributeTypes: {51}( 1.3.6.1.4.1.7165.2.1.74 NAME 'sambaFlatName' DESC 'Ne
-  tBIOS name of a domain' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.
-  121.1.15{128} )

Deleted: trunk/samba/debian/patches/initialize_password_db-null-deref
===================================================================
--- trunk/samba/debian/patches/initialize_password_db-null-deref	2012-06-26 14:48:20 UTC (rev 4136)
+++ trunk/samba/debian/patches/initialize_password_db-null-deref	2012-06-26 19:58:53 UTC (rev 4137)
@@ -1,25 +0,0 @@
-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
-Forwarded: yes
-Bug: https://bugzilla.samba.org/show_bug.cgi?id=8920
-
-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: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2012-06-26 14:48:20 UTC (rev 4136)
+++ trunk/samba/debian/patches/series	2012-06-26 19:58:53 UTC (rev 4137)
@@ -12,8 +12,6 @@
 autoconf.patch
 dont-build-VFS-examples.patch
 bug_221618_precise-64bit-prototype.patch
-initialize_password_db-null-deref
-fix-samba.ldif-syntax.patch
 bug_598313_upstream_7499-nss_wins-dont-clobber-daemons-logs.patch
 bug_387266_upstream_4104_mention-kerberos-in-smbspool-manpage.patch
 bug_604768_upstream_7826_drop-using-samba-link.patch
@@ -22,4 +20,3 @@
 smbtorture-manpage.patch
 libutil_drop_AI_ADDRCONFIG.patch
 shadow_copy2_backport.patch
-dont_start_when_guest_account_doesnt_exist.patch