summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mysql.c2
-rw-r--r--version.log7
2 files changed, 7 insertions, 2 deletions
diff --git a/src/mysql.c b/src/mysql.c
index 011c8b615..a7f84b06e 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -244,7 +244,7 @@ char *db_mysql_secure(char *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 (!pass) {
snprintf(epass, sizeof(epass), "''");
} else if ((!MysqlSecure) || (strcmp(MysqlSecure, "") == 0)) {
snprintf(epass, sizeof(epass), "'%s'", tmp_pass);
diff --git a/version.log b/version.log
index 989079260..cae7a7fdb 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,15 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="17"
VERSION_EXTRA="-svn"
-VERSION_BUILD="1187"
+VERSION_BUILD="1188"
# $Log$
#
+# BUILD : 1.7.17 (1188)
+# BUGS : N/A
+# NOTES : Make the mysql secure check easier to read... its ugly :(
+#
+#
# BUILD : 1.7.17 (1187)
# BUGS : N/A
# NOTES : Put mysql secure back to how it should be - i think