use %p when printing pointers, not %x

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

diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index 269e529f325eccc8886fac3259735651f221ba2a..a1ad02bf084bf9e29ecfa1dbf57486e3e193d43c 100644 (file)
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -21,7 +21,7 @@ static int new_password(const struct passwd *pw, int amroot, int algo);
 static void set_filesize_limit(int blocks);
 
 
-int get_algo(char *a)
+static int get_algo(char *a)
 {
        int x = 1;                                      /* standard: MD5 */
 
@@ -31,14 +31,13 @@ int get_algo(char *a)
 }
 
 
-extern int update_passwd(const struct passwd *pw, char *crypt_pw)
+static int update_passwd(const struct passwd *pw, const char *crypt_pw)
 {
        char filename[1024];
        char buf[1025];
        char buffer[80];
        char username[32];
        char *pw_rest;
-       int has_shadow = 0;
        int mask;
        int continued;
        FILE *fp;
@@ -46,12 +45,12 @@ extern int update_passwd(const struct passwd *pw, char *crypt_pw)
        struct stat sb;
        struct flock lock;
 
+#if ENABLE_FEATURE_SHADOWPASSWDS
        if (access(bb_path_shadow_file, F_OK) == 0) {
-               has_shadow = 1;
-       }
-       if (has_shadow) {
                snprintf(filename, sizeof filename, "%s", bb_path_shadow_file);
-       } else {
+       } else
+#endif
+       {
                snprintf(filename, sizeof filename, "%s", bb_path_passwd_file);
        }
 
@@ -94,8 +93,9 @@ extern int update_passwd(const struct passwd *pw, char *crypt_pw)
        rewind(fp);
        while (!feof(fp)) {
                fgets(buffer, sizeof buffer, fp);
-               if (!continued) {               // Check to see if we're updating this line.
-                       if (strncmp(username, buffer, strlen(username)) == 0) { // we have a match.
+               if (!continued) { /* Check to see if we're updating this line.  */
+                       if (strncmp(username, buffer, strlen(username)) == 0) {
+                               /* we have a match. */
                                pw_rest = strchr(buffer, ':');
                                *pw_rest++ = '\0';
                                pw_rest = strchr(pw_rest, ':');
@@ -111,7 +111,7 @@ extern int update_passwd(const struct passwd *pw, char *crypt_pw)
                } else {
                        continued = 1;
                }
-               bzero(buffer, sizeof buffer);
+               memset(buffer, 0, sizeof buffer);
        }
 
        if (fflush(out_fp) || fsync(fileno(out_fp)) || fclose(out_fp)) {
@@ -132,7 +132,7 @@ extern int update_passwd(const struct passwd *pw, char *crypt_pw)
 }
 
 
-extern int passwd_main(int argc, char **argv)
+int passwd_main(int argc, char **argv)
 {
        int amroot;
        char *cp;
@@ -145,11 +145,10 @@ extern int passwd_main(int argc, char **argv)
        int uflg = 0;                           /* -u - unlock account */
        int dflg = 0;                           /* -d - delete password */
        const struct passwd *pw;
-       unsigned short ruid;
 
-#ifdef CONFIG_FEATURE_SHADOWPASSWDS
+#if ENABLE_FEATURE_SHADOWPASSWDS
        const struct spwd *sp;
-#endif                                                 /* CONFIG_FEATURE_SHADOWPASSWDS */
+#endif
        amroot = (getuid() == 0);
        openlog("passwd", LOG_PID | LOG_CONS | LOG_NOWAIT, LOG_AUTH);
        while ((flag = getopt(argc, argv, "a:dlu")) != EOF) {
@@ -170,12 +169,8 @@ extern int passwd_main(int argc, char **argv)
                        bb_show_usage();
                }
        }
-       ruid = getuid();
-       pw = (struct passwd *) getpwuid(ruid);
-       if (!pw) {
-               bb_error_msg_and_die("Cannot determine your user name.");
-       }
-       myname = (char *) bb_xstrdup(pw->pw_name);
+       myname = (char *) bb_xstrdup(bb_getpwuid(NULL, getuid(), -1));
+       /* exits on error */
        if (optind < argc) {
                name = argv[optind];
        } else {
@@ -192,7 +187,7 @@ extern int passwd_main(int argc, char **argv)
                syslog(LOG_WARNING, "can't change pwd for `%s'", name);
                bb_error_msg_and_die("Permission denied.\n");
        }
-#ifdef CONFIG_FEATURE_SHADOWPASSWDS
+#if ENABLE_FEATURE_SHADOWPASSWDS
        sp = getspnam(name);
        if (!sp) {
                sp = (struct spwd *) pwd_to_spwd(pw);
@@ -202,7 +197,7 @@ extern int passwd_main(int argc, char **argv)
 #else
        cp = pw->pw_passwd;
        np = name;
-#endif                                                 /* CONFIG_FEATURE_SHADOWPASSWDS */
+#endif
 
        safe_strncpy(crypt_passwd, cp, sizeof(crypt_passwd));
        if (!(dflg || lflg || uflg)) {
@@ -327,12 +322,12 @@ static int new_password(const struct passwd *pw, int amroot, int algo)
        char *clear;
        char *cipher;
        char *cp;
+       char salt[12]; /* "$N$XXXXXXXX" or "XX" */
        char orig[200];
        char pass[200];
-       time_t start, now;
 
        if (!amroot && crypt_passwd[0]) {
-               if (!(clear = getpass("Old password:"))) {
+               if (!(clear = bb_askpass(0, "Old password:"))) {
                        /* return -1; */
                        return 1;
                }
@@ -340,32 +335,27 @@ static int new_password(const struct passwd *pw, int amroot, int algo)
                if (strcmp(cipher, crypt_passwd) != 0) {
                        syslog(LOG_WARNING, "incorrect password for `%s'",
                                   pw->pw_name);
-                       time(&start);
-                       now = start;
-                       while (difftime(now, start) < FAIL_DELAY) {
-                               sleep(FAIL_DELAY);
-                               time(&now);
-                       }
+                       bb_do_delay(FAIL_DELAY);
                        fprintf(stderr, "Incorrect password.\n");
                        /* return -1; */
                        return 1;
                }
                safe_strncpy(orig, clear, sizeof(orig));
-               bzero(clear, strlen(clear));
-               bzero(cipher, strlen(cipher));
+               memset(clear, 0, strlen(clear));
+               memset(cipher, 0, strlen(cipher));
        } else {
                orig[0] = '\0';
        }
-       if (! (cp=getpass("Enter the new password (minimum of 5, maximum of 8 characters)\n"
+       if (! (cp=bb_askpass(0, "Enter the new password (minimum of 5, maximum of 8 characters)\n"
                                          "Please use a combination of upper and lower case letters and numbers.\n"
                                          "Enter new password: ")))
        {
-               bzero(orig, sizeof orig);
+               memset(orig, 0, sizeof orig);
                /* return -1; */
                return 1;
        }
        safe_strncpy(pass, cp, sizeof(pass));
-       bzero(cp, strlen(cp));
+       memset(cp, 0, strlen(cp));
        /* if (!obscure(orig, pass, pw)) { */
        if (obscure(orig, pass, pw)) {
                if (amroot) {
@@ -375,8 +365,8 @@ static int new_password(const struct passwd *pw, int amroot, int algo)
                        return 1;
                }
        }
-       if (!(cp = getpass("Re-enter new password: "))) {
-               bzero(orig, sizeof orig);
+       if (!(cp = bb_askpass(0, "Re-enter new password: "))) {
+               memset(orig, 0, sizeof orig);
                /* return -1; */
                return 1;
        }
@@ -385,14 +375,21 @@ static int new_password(const struct passwd *pw, int amroot, int algo)
                /* return -1; */
                return 1;
        }
-       bzero(cp, strlen(cp));
-       bzero(orig, sizeof(orig));
+       memset(cp, 0, strlen(cp));
+       memset(orig, 0, sizeof(orig));
+       memset(salt, 0, sizeof(salt));
 
        if (algo == 1) {
-               cp = pw_encrypt(pass, "$1$");
-       } else
-               cp = pw_encrypt(pass, crypt_make_salt());
-       bzero(pass, sizeof pass);
+               strcpy(salt, "$1$");
+               strcat(salt, crypt_make_salt());
+               strcat(salt, crypt_make_salt());
+               strcat(salt, crypt_make_salt());
+       }
+
+       strcat(salt, crypt_make_salt());
+       cp = pw_encrypt(pass, salt);
+
+       memset(pass, 0, sizeof pass);
        safe_strncpy(crypt_passwd, cp, sizeof(crypt_passwd));
        return 0;
 }