[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-5-193-gfdb3341

[Karolin Seeger]

The branch, v3-2-stable has been updated
       via  fdb33417890d46918ebc75c48adfc2ba467894f1 (commit)
       via  7fd018907e6f390bac92cdff28fec103318f317c (commit)
       via  da6f1b12e64745684b0179e1864370059d17eba7 (commit)
      from  86895cd434059a547e0f13fbe53894b642279f9f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable


- Log -----------------------------------------------------------------
commit fdb33417890d46918ebc75c48adfc2ba467894f1
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Dec 9 17:39:03 2008 +0100

    WHATSNEW: Update changes.
    
    Karolin
    (cherry picked from commit f73ecfaa7942bf01720f330b99cce3305ea6859c)

commit 7fd018907e6f390bac92cdff28fec103318f317c
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Dec 9 17:35:49 2008 +0100

    WHATSNEW: Fix entry.
    
    Karolin
    (cherry picked from commit d700767e11f413c9386876e73462f701cf7e447f)

commit da6f1b12e64745684b0179e1864370059d17eba7
Author: Günther Deschner <gd at samba.org>
Date:   Tue Dec 9 17:28:15 2008 +0100

    s3-ldapsam: Fix Bug 5957: do not abort rename process on valid rename script.
    
    Guenther
    (cherry picked from commit 26139344fd0fac4fdd2a6752628b252fbd9b7450)

-----------------------------------------------------------------------

Summary of changes:
 WHATSNEW.txt             |    6 ++----
 source/passdb/pdb_ldap.c |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 647c3ec..769ae24 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -81,6 +81,7 @@ o   Steven Danneman <steven.danneman at isilon.com>
 
 o   Guenther Deschner <gd at samba.org>
     * BUG 5888: Fix PNP_GetHwProfInfo().
+    * BUG 5957: Do not abort rename process on valid rename script.
     * BUG 5898: Fix 'net rpc shutdown'.
     * Fix duplicate installation of cifs.upcall.
     * Fix _srvsvc_NetShareAdd segfault.
@@ -119,6 +120,7 @@ o   Tomasz Krasuski <kr0tki at poczta.onet.pl>
 o   Jeff Layton <jlayton at redhat.com>
     * Have uppercase_string return success on NULL pointer in mount.cifs.
     * Make mount.cifs return codes match the return codes for /bin/mount.
+    * Use lock/unlock_mtab scheme from util-linux-ng mount prog in mount.cifs.
 
 
 o   Volker Lendecke <vl at samba.org>
@@ -139,10 +141,6 @@ o   Volker Lendecke <vl at samba.org>
       HAVE_IPRINT.
 
 
-o   Jeff Layton <jlayton at redhat.com>
-    * Use lock/unlock_mtab scheme from util-linux-ng mount prog in mount.cifs.
-
-
 o   Derrell Lipman <derrell.lipman at unwireduniverse.com>
     * BUG 5805: Don't close stdout when calling setup_logging multiple times.
 
diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c
index 636682d..0d54fe0 100644
--- a/source/passdb/pdb_ldap.c
+++ b/source/passdb/pdb_ldap.c
@@ -2010,7 +2010,7 @@ static NTSTATUS ldapsam_rename_sam_account(struct pdb_methods *my_methods,
 					newname_lower,
 					true,
 					true);
-	if (rename_script) {
+	if (!rename_script) {
 		return NT_STATUS_NO_MEMORY;
 	}
 	rename_script = realloc_string_sub2(rename_script,


-- 
Samba Shared Repository