diff options
| -rw-r--r-- | src/mysql.c | 4 | ||||
| -rw-r--r-- | version.log | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/mysql.c b/src/mysql.c index d58a4a9e9..011c8b615 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -238,12 +238,13 @@ char *db_mysql_secure(char *pass) /* Initialize the buffer. Bug #86 */ memset(epass, '\0', BUFSIZE); + memset(tmp_pass, 0, PASSMAX); /* We couldnt decrypt the pass... */ if(enc_decrypt(pass,tmp_pass,PASSMAX)!=1) { snprintf(epass, sizeof(epass), "'%s'", pass); } else { /* if we could decrypt the pass */ - if (tmp_pass) { + if (!tmp_pass) { snprintf(epass, sizeof(epass), "''"); } else if ((!MysqlSecure) || (strcmp(MysqlSecure, "") == 0)) { snprintf(epass, sizeof(epass), "'%s'", tmp_pass); @@ -258,7 +259,6 @@ char *db_mysql_secure(char *pass) MysqlSecure); } } - return sstrdup(epass); } diff --git a/version.log b/version.log index 2fbc5dae4..989079260 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="17" VERSION_EXTRA="-svn" -VERSION_BUILD="1186" +VERSION_BUILD="1187" # $Log$ # +# BUILD : 1.7.17 (1187) +# BUGS : N/A +# NOTES : Put mysql secure back to how it should be - i think +# # BUILD : 1.7.17 (1186) # BUGS : N/A # NOTES : Encryption fixes for win32 |