1 files changed, 11 insertions, 12 deletions

diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 7d0f24a53778..3c9f5a188515 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -575,18 +575,6 @@ main(argc, argv)
 	if (!pflag)
 		environ = envinit;
 
-#ifdef USE_PAM
-	/*
-	 * Add any environmental variables that the
-	 * PAM modules may have set.
-	 */
-	if (pamh) {
-		environ_pam = pam_getenvlist(pamh);
-		if (environ_pam)
-			export_pam_environment();
-	}
-#endif /* USE_PAM */
-
 	/*
 	 * PAM modules might add supplementary groups during pam_setcred().
 	 */
@@ -606,6 +594,17 @@ main(argc, argv)
 			    pam_strerror(pamh, e));
 		}
 
+	        /*
+	         * Add any environmental variables that the
+	         * PAM modules may have set.
+		 * Call *after* opening session!
+		 */
+		if (pamh) {
+		  environ_pam = pam_getenvlist(pamh);
+		  if (environ_pam)
+			export_pam_environment();
+		}
+
 		/*
 		 * We must fork() before setuid() because we need to call
 		 * pam_close_session() as root.