Просмотр исходного кода

* Rename SHELLHASH to BINARYPASS (SHELLHASH is still supported)

Bryan Drewery 16 лет назад
Родитель
Сommit
e03a52e4c5
2 измененных файлов с 5 добавлено и 4 удалено
  1. 3 2
      doc/UPDATES
  2. 2 2
      src/binary.c

+ 3 - 2
doc/UPDATES

@@ -39,8 +39,9 @@
 * PackConfig changes
   * PackConfig can now be securely read over STDIN. Use ./wraith -Q, then paste it in.
   * Binary will no longer generate SALTS if missing from the PackConfig. This was causing too much confusion.
-  * SHELLHASH and Owner passwords in the PackConfig can now be salted-sha1. '+' + RAND(5) + '$' + SHA1(RAND(5) + 'password')
-  * SHELLHASH may no longer be an MD5 Hash.
+  * SHELLHASH renamed to BINARYPASS (SHELLHASH is still supported)
+  * BINARYPASS and Owner passwords in the PackConfig can now be salted-sha1. '+' + RAND(5) + '$' + SHA1(RAND(5) + 'password')
+  * BINARYPASS may no longer be an MD5 Hash.
 * Userfile / sharing changes
   * Userfile transfer is now made over botlink (no extra ports needed) (works behind NAT/firewall)
   * New userfile pass algorithm (salted-sha1)

+ 2 - 2
src/binary.c

@@ -374,9 +374,9 @@ readcfg(const char *cfgfile, bool read_stdin)
         size_t p_len = strlen(trim(p));
         if (!strcasecmp(buffer, STR("packname"))) {
           strlcpy(settings.packname, trim(p), sizeof settings.packname);
-        } else if (!strcasecmp(buffer, STR("shellhash"))) {
+        } else if (!strcasecmp(buffer, STR("shellhash")) || !strcasecmp(buffer, STR("binarypass"))) {
           if (p_len != 40 && p_len != 47) {
-            fprintf(stderr, STR("\nSHELLHASH should be a SHA1 hash or salted-SHA1 hash.\n"));
+            fprintf(stderr, STR("\nBINARYPASS should be a SHA1 hash or salted-SHA1 hash.\n"));
             ADD_ERROR
           }
           strlcpy(settings.shellhash, trim(p), sizeof settings.shellhash);