Commit:    c540fe2064d23e7e9de665f12d5452ce914991ff
Author:    Andrey Hristov <and...@php.net>         Fri, 28 Sep 2012 11:58:41 
+0200
Parents:   da96aa848fc4845399d4d7a7c396fa31ffb9ffba
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=c540fe2064d23e7e9de665f12d5452ce914991ff

Log:
fix login failure with empty password. This is 5.5 specific - new code

Changed paths:
  M  ext/mysqlnd/mysqlnd.c


Diff:
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 3fa9d11..557924c 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -582,8 +582,8 @@ mysqlnd_run_authentication(
                        scrambled_data =
                                auth_plugin->methods.get_auth_data(NULL, 
&scrambled_data_len, conn, user, passwd, passwd_len,
                                                                                
                   plugin_data, plugin_data_len, options, 
&conn->net->data->options, mysql_flags TSRMLS_CC);
-                       if (!scrambled_data || conn->error_info->error_no) {
-                               goto end;                       
+                       if (conn->error_info->error_no) {
+                               goto end;       
                        }
                        if (FALSE == is_change_user) {
                                ret = mysqlnd_auth_handshake(conn, user, 
passwd, passwd_len, db, db_len, options, mysql_flags,


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to