From 26b3608b69ef46c0d7803c4fa6219ba6a7d84ca9 Mon Sep 17 00:00:00 2001
From: dtucker <dtucker>
Date: Fri, 8 Aug 2003 03:43:37 +0000
Subject: [PATCH]  - (dtucker) [auth-pam.c] Don't set PAM_TTY if tty is null. 
 ok djm@

---
 ChangeLog  |  1 +
 auth-pam.c | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 316633c2..611abaa7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
  - (dtucker) [openbsd-compat/fake-rfc2553.h] Older Linuxes have AI_PASSIVE and
    AI_CANONNAME in netdb.h but not AI_NUMERICHOST, so check each definition
    separately before defining them.
+ - (dtucker) [auth-pam.c] Don't set PAM_TTY if tty is null.  ok djm@
 
 20030807
  - (dtucker) [session.c] Have session_break_req not attempt to send a break
diff --git a/auth-pam.c b/auth-pam.c
index a613f6dd..30f00048 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -534,11 +534,13 @@ do_pam_session(const char *user, const char *tty)
 	if (sshpam_err != PAM_SUCCESS)
 		fatal("PAM: failed to set PAM_CONV: %s",
 		    pam_strerror(sshpam_handle, sshpam_err));
-	debug("PAM: setting PAM_TTY to \"%s\"", tty);
-	sshpam_err = pam_set_item(sshpam_handle, PAM_TTY, tty);
-	if (sshpam_err != PAM_SUCCESS)
-		fatal("PAM: failed to set PAM_TTY: %s",
-		    pam_strerror(sshpam_handle, sshpam_err));
+	if (tty != NULL) {
+		debug("PAM: setting PAM_TTY to \"%s\"", tty);
+		sshpam_err = pam_set_item(sshpam_handle, PAM_TTY, tty);
+		if (sshpam_err != PAM_SUCCESS)
+			fatal("PAM: failed to set PAM_TTY: %s",
+			    pam_strerror(sshpam_handle, sshpam_err));
+	}
 	sshpam_err = pam_open_session(sshpam_handle, 0);
 	if (sshpam_err != PAM_SUCCESS)
 		fatal("PAM: pam_open_session(): %s",
-- 
2.45.1