[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1291-gd980587

[Günther Deschner]

The branch, master has been updated
       via  d9805878e242d0d279f340b4a1fd084c77f240b1 (commit)
      from  a94bd62d28838d04ff32c34205a073c7a4d9fa9b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d9805878e242d0d279f340b4a1fd084c77f240b1
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 27 18:47:41 2009 +0200

    s3-auth-charcnv: fix push_string(). Don't push to ucs2 and ascii after another.
    
    This fixes all kinds of encrypted passwords used in the shared auth code naturally.
    Andrew B., please check.
    
    Guenther

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

Summary of changes:
 source3/lib/charcnv.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index eb794d8..b945668 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -1672,8 +1672,9 @@ ssize_t push_string(void *dest, const char *src, size_t dest_len, int flags)
 	if (!(flags & STR_ASCII) && \
 	    (flags & STR_UNICODE)) {
 		ret = push_ucs2(NULL, dest, src, dest_len, flags);
+	} else {
+		ret = push_ascii(dest, src, dest_len, flags);
 	}
-	ret = push_ascii(dest, src, dest_len, flags);
 	if (ret == (size_t)-1) {
 		return -1;
 	}


-- 
Samba Shared Repository