ipsec-interfaces: Apply static routes (again) after creating IPsec interfaces

[ipfire-2.x.git] / src / setup / passwords.c

diff --git a/src/setup/passwords.c b/src/setup/passwords.c
index 5b21a97951b778521cc2601b741524c773302138..6242577af9eb7540cd87ef711f7d952d1304976f 100644 (file)
--- a/src/setup/passwords.c
+++ b/src/setup/passwords.c
@@ -35,7 +35,7 @@ int handlerootpassword(void)
        
        snprintf(commandstring, STRING_SIZE,
                "/bin/echo 'root:%s' | /usr/sbin/chpasswd", password);
-       if (runhiddencommandwithstatus(commandstring, _("Setting password"), _("Setting 'root' password...."))) {
+       if (runhiddencommandwithstatus(commandstring, _("Setting password"), _("Setting 'root' password...."), NULL)) {
                errorbox(_("Problem setting 'root' password."));
                return 0;
        }
@@ -56,9 +56,9 @@ int handleadminpassword(void)
                return 0;
        
        snprintf(commandstring, STRING_SIZE,
-               "/usr/sbin/htpasswd -c -m -b " CONFIG_ROOT "/auth/users admin '%s'", password);
+               "/usr/bin/htpasswd -c -B -C 7 -b " CONFIG_ROOT "/auth/users admin '%s'", password);
        sprintf(message, _("Setting %s 'admin' user password..."), NAME);
-       if (runhiddencommandwithstatus(commandstring, _("Setting password"), message)) {
+       if (runhiddencommandwithstatus(commandstring, _("Setting password"), message, NULL)) {
                sprintf(message, _("Problem setting %s 'admin' user password."), NAME);
                errorbox(message);
                return 0;
@@ -84,7 +84,7 @@ int getpassword(char *password, char *text)
        do
        {
                done = 1;
-               sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
+               sprintf (title, "%s - %s", NAME, SLOGAN);
                rc = newtWinEntries(title, text,
                        65, 5, 5, 50, entries, _("OK"), _("Cancel"), NULL);