* Port [3907] to 1.2.16 from trunk

 * Fixed bug where salts were not written to binary when first generating them



svn: 3908

doc/UPDATES

@@ -13,6 +13,7 @@
 * checkchannels now displays server. (fixes #420)
 * Added 'jupenick'. Jupenick is preferred over 'nick' but only 'nick' will be rotated with altchars. Ie, nick_, nick-, etc. (fixes #421)
 * Added 'link_cleartext' which allows disabling of cleartext bot linking (needed for upgrades)
+* Fixed bug where salts were not written to binary when first generating them
 
 1.2.15 - http://wraith.botpack.net/milestone/1.2.15
 * Fix a possible segfault when binaries compiled wrong

src/binary.c

@@ -357,6 +357,8 @@ readcfg(const char *cfgfile)
     make_rand_str(salt1, SALT1LEN);
     make_rand_str(salt2, SALT2LEN);
     salt1[sizeof salt1 - 1] = salt2[sizeof salt2 - 1] = 0;
+    strlcpy(settings.salt1, salt1, sizeof(settings.salt1));
+    strlcpy(settings.salt2, salt2, sizeof(settings.salt2));
     fprintf(f, STR("SALT1 %s\n"), salt1);
     fprintf(f, STR("SALT2 %s\n"), salt2);
     fflush(f);