Ubuntu
samba package

Merge lp:~ubuntu-branches/ubuntu/precise/samba/precise-201111012222 into lp:ubuntu/precise/samba

  1. Precise (12.04)
  2. precise-201111012222
  3. Merge into precise
Proposed by Ubuntu Package Importer
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/precise/samba/precise-201111012222
Merge into: lp:ubuntu/precise/samba
Diff against target: 60 lines (+34/-0) (has conflicts)
3 files modified
debian/changelog (+10/-0)
debian/patches/initialize_password_db-null-deref (+23/-0)
debian/patches/series (+1/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/precise/samba/precise-201111012222
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+80961@code.launchpad.net

Description of the change

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/samba reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/samba/precise-201111012222. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.

Unmerged revisions

169. By Steve Langasek

debian/patches/initialize_password_db-null-deref: Avoid null
dereference in initialize_password_db(). Closes LP: #829221.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-11-01 17:19:39 +0000
3+++ debian/changelog 2011-11-01 22:30:30 +0000
4@@ -1,9 +1,19 @@
5+<<<<<<< TREE
6 samba (2:3.5.11~dfsg-4ubuntu3) precise; urgency=low
7
8 * Rebuild with dpkg 1.16.1.1ubuntu2 to restore full hardening support.
9
10 -- Colin Watson <cjwatson@ubuntu.com> Tue, 01 Nov 2011 17:19:39 -0400
11
12+=======
13+samba (2:3.5.11~dfsg-4ubuntu3) UNRELEASED; urgency=low
14+
15+ * debian/patches/initialize_password_db-null-deref: Avoid null
16+ dereference in initialize_password_db(). Closes LP: #829221.
17+
18+ -- Steve Langasek <vorlon@debian.org> Sun, 30 Oct 2011 08:44:01 -0700
19+
20+>>>>>>> MERGE-SOURCE
21 samba (2:3.5.11~dfsg-4ubuntu2) precise; urgency=low
22
23 * debian/samba.if-up: fix an overlooked syntax error in the hook.
24
25=== added file 'debian/patches/initialize_password_db-null-deref'
26--- debian/patches/initialize_password_db-null-deref 1970-01-01 00:00:00 +0000
27+++ debian/patches/initialize_password_db-null-deref 2011-11-01 22:30:30 +0000
28@@ -0,0 +1,23 @@
29+Description: Avoid null dereference in initialize_password_db()
30+ When initialize_password_db() is called with reload=True, it's assumed that
31+ the free_private_data member of pdb_methods is non-null. This is not
32+ necessarily the case, as the tdb backend has no private data and therefore
33+ no free function. Check to see if we have private data that needs freed
34+ before calling.
35+Author: Steve Langasek <steve.langasek@ubuntu.com>
36+Bug-Ubuntu: https://bugs.launchpad.net/bugs/829221
37+
38+Index: ubuntu/source3/passdb/pdb_interface.c
39+===================================================================
40+--- ubuntu.orig/source3/passdb/pdb_interface.c
41++++ ubuntu/source3/passdb/pdb_interface.c
42+@@ -176,7 +176,8 @@
43+ static struct pdb_methods *pdb = NULL;
44+
45+ if ( pdb && reload ) {
46+- pdb->free_private_data( &(pdb->private_data) );
47++ if (pdb->private_data)
48++ pdb->free_private_data( &(pdb->private_data) );
49+ if ( !NT_STATUS_IS_OK( make_pdb_method_name( &pdb, lp_passdb_backend() ) ) ) {
50+ char *msg = NULL;
51+ if (asprintf(&msg, "pdb_get_methods_reload: "
52
53=== modified file 'debian/patches/series'
54--- debian/patches/series 2011-09-30 13:08:34 +0000
55+++ debian/patches/series 2011-11-01 22:30:30 +0000
56@@ -16,3 +16,4 @@
57 bug_601406_fix-perl-path-in-example.patch
58 bug_221618_precise-64bit-prototype.patch
59 fix-debuglevel-name-conflict.patch
60+initialize_password_db-null-deref

Subscribers

People subscribed via source and target branches

to all changes: