libarchive: open_zipped() does not need to check extensions for e.g. gzip

[oweals/busybox.git] / loginutils / passwd.c

diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index b3ce646f185a01ed73c5ee98ccda2f5b272bd371..1509089328df8476a7adbf5d4c5847defc2b17ac 100644 (file)
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -8,7 +8,6 @@
 //usage:#define passwd_full_usage "\n\n"
 //usage:       "Change USER's password (default: current user)"
 //usage:     "\n"
-//usage:     "\nOptions:"
 //usage:     "\n       -a ALG  Encryption method"
 //usage:     "\n       -d      Set password to ''"
 //usage:     "\n       -l      Lock (disable) account"
@@ -16,11 +15,7 @@
 
 #include "libbb.h"
 #include <syslog.h>
-
-static void nuke_str(char *str)
-{
-       if (str) memset(str, 0, strlen(str));
-}
+#include <sys/resource.h> /* setrlimit */
 
 static char* new_password(const struct passwd *pw, uid_t myuid, const char *algo)
 {
@@ -95,7 +90,7 @@ int passwd_main(int argc UNUSED_PARAM, char **argv)
        };
        unsigned opt;
        int rc;
-       const char *opt_a = "d"; /* des */
+       const char *opt_a = CONFIG_FEATURE_DEFAULT_PASSWD_ALGO;
        const char *filename;
        char *myname;
        char *name;