Merge.

[irc/rqf/shadowircd.git] / tools / mkpasswd.c

diff --git a/tools/mkpasswd.c b/tools/mkpasswd.c
index d553e1662d94a3dd1a23fdbdbadeca3a45863eae..d831d2df42c2823c3907c1db87df9ff70eaba7a3 100644 (file)
--- a/tools/mkpasswd.c
+++ b/tools/mkpasswd.c
@@ -9,7 +9,6 @@
 ** /dev/random for salt generation added by 
 ** Aaron Sethman <androsyn@ratbox.org>
 **
-** $Id: mkpasswd.c 26439 2009-02-01 15:27:24Z jilles $
 */
 #include <stdio.h>
 #include <string.h>
@@ -190,15 +189,6 @@ main(int argc, char *argv[])
                else
                        salt = make_sha256_salt(length);
        }
-       else if(flag & FLAG_SHA512)
-       {
-               if(length == 0)
-                       length = 16;
-               if(flag & FLAG_SALT)
-                       salt = make_sha512_salt_para(saltpara);
-               else
-                       salt = make_sha512_salt(length);
-       }
        else if(flag & FLAG_EXT)
        {
                /* XXX - rounds needs to be done */
@@ -219,7 +209,7 @@ main(int argc, char *argv[])
                        salt = make_ext_salt(rounds);
                }
        }
-       else
+       else if (flag & FLAG_DES)
        {
                if(flag & FLAG_SALT)
                {
@@ -238,6 +228,15 @@ main(int argc, char *argv[])
                        salt = make_des_salt();
                }
        }
+       else
+       {
+               if(length == 0)
+                       length = 16;
+               if(flag & FLAG_SALT)
+                       salt = make_sha512_salt_para(saltpara);
+               else
+                       salt = make_sha512_salt(length);
+       }
 
        if(flag & FLAG_PASS)
        {