svn commit: r227314 - head/lib/libpam/modules/pam_lastlog

[Ed Schouten]

Author: ed
Date: Mon Nov  7 19:57:42 2011
New Revision: 227314
URL: http://svn.freebsd.org/changeset/base/227314

Log:
  Ensure pam_lastlog removes the /dev/ component of the TTY name.
  
  Some consumers of PAM remove the /dev/ component (i.e. login), while
  others don't (i.e. su). We must ensure that the /dev/ component is
  removed to ensure that the utmpx entries properly work with tools such
  as w(1).
  
  Discussed with:	des
  MFC after:	1 week

Modified:
  head/lib/libpam/modules/pam_lastlog/pam_lastlog.c

Modified: head/lib/libpam/modules/pam_lastlog/pam_lastlog.c
==============================================================================
--- head/lib/libpam/modules/pam_lastlog/pam_lastlog.c	Mon Nov  7 19:53:20 2011	(r227313)
+++ head/lib/libpam/modules/pam_lastlog/pam_lastlog.c	Mon Nov  7 19:57:42 2011	(r227314)
@@ -47,6 +47,8 @@ __FBSDID("$FreeBSD$");
 #define _BSD_SOURCE
 
 #include <sys/time.h>
+
+#include <paths.h>
 #include <pwd.h>
 #include <stdlib.h>
 #include <string.h>
@@ -96,6 +98,9 @@ pam_sm_open_session(pam_handle_t *pamh, 
 		pam_err = PAM_SERVICE_ERR;
 		goto err;
 	}
+	/* Strip /dev/ component. */
+	if (strncmp(tty, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0)
+		tty = (const char *)tty + sizeof(_PATH_DEV) - 1;
 
 	if ((flags & PAM_SILENT) == 0) {
 		if (setutxdb(UTXDB_LASTLOGIN, NULL) != 0) {