[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-459-ge1041f5

[Jeremy Allison]

The branch, v3-4-test has been updated
       via  e1041f5957e84b6c255c714b2bf6056cdc8f3323 (commit)
       via  49399cb3cc09213c6c44799e17d7a95afc8c8584 (commit)
      from  28f233ddc010893f50b45f91ce41deaa537f11d7 (commit)

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


- Log -----------------------------------------------------------------
commit e1041f5957e84b6c255c714b2bf6056cdc8f3323
Merge: 49399cb3cc09213c6c44799e17d7a95afc8c8584 28f233ddc010893f50b45f91ce41deaa537f11d7
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Mar 17 15:38:07 2009 -0700

    Merge branch 'v3-4-test' of ssh://jra@git.samba.org/data/git/samba into v3-4-test

commit 49399cb3cc09213c6c44799e17d7a95afc8c8584
Author: Alexander Zagrebin <alexz at visp.ru>
Date:   Tue Mar 17 15:37:19 2009 -0700

    Missing break in conversion function prevents tdb password database update.

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

Summary of changes:
 source3/passdb/pdb_tdb.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index 3442561..ab26651 100644
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -102,6 +102,7 @@ static int tdbsam_convert_one(struct db_record *rec, void *priv)
 		ret = init_samu_from_buffer(user, SAMU_BUFFER_V3,
 					    (uint8 *)rec->value.dptr,
 					    rec->value.dsize);
+		break;
 	case 4:
 		ret = init_samu_from_buffer(user, SAMU_BUFFER_V4,
 					    (uint8 *)rec->value.dptr,


-- 
Samba Shared Repository