1 files changed, 4 insertions, 4 deletions

diff --git a/libbb/setup_environment.c b/libbb/setup_environment.c
index df2983958..3549e2099 100644
--- a/libbb/setup_environment.c
+++ b/libbb/setup_environment.c
@@ -36,9 +36,8 @@ void FAST_FUNC setup_environment(const char *shell, int flags, const struct pass
 
         /* Change the current working directory to be the home directory
          * of the user */
-        if (!(flags & SETUP_ENV_NO_CHDIR)) {
-                if (chdir(pw->pw_dir) != 0) {
-                        bb_error_msg("can't change directory to '%s'", pw->pw_dir);
+        if (flags & SETUP_ENV_CHDIR) {
+                if (chdir_or_warn(pw->pw_dir) != 0) {
                         xchdir((flags & SETUP_ENV_TO_TMP) ? "/tmp" : "/");
                 }
         }
@@ -59,7 +58,8 @@ void FAST_FUNC setup_environment(const char *shell, int flags, const struct pass
                 //xsetenv("LOGNAME", pw->pw_name);
                 //xsetenv("HOME",    pw->pw_dir);
                 //xsetenv("SHELL",   shell);
-        } else if (flags & SETUP_ENV_CHANGEENV) {
+        } else
+        if (flags & (SETUP_ENV_CHANGEENV|SETUP_ENV_CHANGEENV_LOGNAME)) {
                 /* Set HOME, SHELL, and if not becoming a super-user
                  * or if SETUP_ENV_CHANGEENV_LOGNAME, USER and LOGNAME.  */
                 if ((flags & SETUP_ENV_CHANGEENV_LOGNAME) || pw->pw_uid != 0) {