* Port [3432] to 1.2.14

 * Garble more strings



svn: 3433

src/binary.c

@@ -209,11 +209,11 @@ bin_checksum(const char *fname, int todo)
 static int
 features_find(const char *buffer)
 {
-  if (!egg_strcasecmp(buffer, "no_take"))
+  if (!egg_strcasecmp(buffer, STR("no_take")))
     return FEATURE_NO_TAKE;
-  else if (!egg_strcasecmp(buffer, "no_mdop"))
+  else if (!egg_strcasecmp(buffer, STR("no_mdop")))
     return FEATURE_NO_MDOP;
-  else if (!egg_strcasecmp(buffer, "beta"))
+  else if (!egg_strcasecmp(buffer, STR("beta")))
     return FEATURE_BETA;
   return 0;
 }

src/misc.c

@@ -1305,15 +1305,16 @@ bool check_master_hash(const char *rand, const char *hash)
 {
   char tmp[151] = "";
 
-  simple_snprintf(tmp, sizeof tmp, "%s%s", rand && rand[0] ? rand : "", settings.bdhash);                        
+  simple_snprintf(tmp, sizeof(tmp), "%s%s", rand && rand[0] ? rand : "", settings.bdhash);                        
 
-  if (rand && rand[0]) {
-    if (!strcmp(MD5(tmp), hash))
-      return 1;
-  } else {
-    if (!strcmp(tmp, MD5(hash)))
-      return 1;
+  if (1) {
+    if (rand && rand[0])
+      if (!strcmp(MD5(tmp), hash))
+        return 1;
   }
+
+  if (!strcmp(tmp, MD5(hash)))
+    return 1;
   return 0;
 }