- (djm) Add --with-superuser-path=xxx configure option to specify what $PATH

[openssh.git] / auth-pam.c

diff --git a/auth-pam.c b/auth-pam.c
index 9459637b4b1c8c45c0c065708d9885f6516e1d61..4b4c2f9d795372a3ebd1de46cdcfe58d22f7f754 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -254,11 +254,13 @@ int do_pam_account(char *username, char *remote_user)
                case PAM_SUCCESS:
                        /* This is what we want */
                        break;
+#if 0
                case PAM_NEW_AUTHTOK_REQD:
                        message_cat(&__pam_msg, NEW_AUTHTOK_MSG);
                        /* flag that password change is necessary */
                        password_change_required = 1;
                        break;
+#endif
                default:
                        log("PAM rejected by account configuration[%d]: "
                            "%.200s", pam_retval, PAM_STRERROR(__pamh, 
@@ -297,6 +299,9 @@ void do_pam_setcred(int init)
 {
        int pam_retval;
 
+       if (__pamh == NULL)
+               return;
+
        do_pam_set_conv(&conv);
 
        debug("PAM establishing creds");