Ahem: add new faq entry to list at top of FAQ.html

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

diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index d0b2afc19bae19de173306d5e45abe5b90b2c8ba..c8940eed7dfa0d0e462f7b0ff934096fe98905a8 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, 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;
 
+#ifdef CONFIG_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);
        }
 
@@ -145,7 +144,6 @@ 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
        const struct spwd *sp;
@@ -170,12 +168,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(my_getpwuid(NULL, getuid(), -1));
+       /* exits on error */
        if (optind < argc) {
                name = argv[optind];
        } else {