[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-13-30-gf46137e

[Karolin Seeger]

The branch, v3-2-stable has been updated
       via  f46137ef9485324c3789d7d28bc858fca4f7509e (commit)
       via  8080a0094317eb1e677b5523b5ff9f894a354caa (commit)
      from  7aea93c3d1060f277aab87e85fb3066b4f666109 (commit)

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


- Log -----------------------------------------------------------------
commit f46137ef9485324c3789d7d28bc858fca4f7509e
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Aug 12 13:58:12 2009 +0200

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

commit 8080a0094317eb1e677b5523b5ff9f894a354caa
Author: Simo Sorce <idra at samba.org>
Date:   Sat Jul 12 22:44:15 2008 -0400

    Fix bug #6628 - "smbpassdb -a" using rid algorithm with tdbsam passdb
    
    samu_set_unix() does not use the rid allocator, but forces to use the
    algoritmic allocator unconditionally, this is wrong and inconsistent.
    Use samu_alloc_rid_unix() instead.
    (If we create a new user we should do it in a way consistent with all
    other commands like pdbedit -a and net rpc user add.)
    (cherry picked from commit e1d4db8f55b25c7e9c408cb334fb89ccfd4c6565)
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    
    This fixes bug #6628.
    (cherry picked from commit 0a1b125ae4260de3cee6a92b19e3977d922a8c11)

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

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


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index f29e92c..3f15827 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -32,6 +32,8 @@ o   Michael Adam <obnox at samba.org>
     * BUG 6387: Fix Winbind crash when multiple IDmappings exist in the
       LDAP directory.
     * BUG 6509: Use gid (not uid) cache in fetch_gid_from_cache().
+    * BUG 6628: 'smbpasswd -a' uses algorithmic rid base with
+      'passdb backend = tdbsam'.
     * Prevent creation of keys containing the '/' character.
 
 
diff --git a/source/passdb/passdb.c b/source/passdb/passdb.c
index e3a3d3c..125689c 100644
--- a/source/passdb/passdb.c
+++ b/source/passdb/passdb.c
@@ -675,7 +675,7 @@ NTSTATUS local_password_change(const char *user_name,
 				return NT_STATUS_NO_MEMORY;
 			}
 
-			result = samu_set_unix( sam_pass, pwd );
+			result = samu_alloc_rid_unix( sam_pass, pwd );
 
 			DEBUGLEVEL = tmp_debug;
 


-- 
Samba Shared Repository