Sun Apr 22 23:26:19 2012 UTC ()

make krb5 compile again. XXX: one function left that is deprecated, what's
the new equivalent?


(christos)

diff -r1.52 -r1.53 src/usr.bin/login/Makefile
diff -r1.3 -r1.4 src/usr.bin/login/common.c
diff -r1.1 -r1.2 src/usr.bin/login/common.h
diff -r1.27 -r1.28 src/usr.bin/login/k5login.c
diff -r1.98 -r1.99 src/usr.bin/login/login.c
diff -r1.20 -r1.21 src/usr.bin/login/login_pam.c

--- src/usr.bin/login/Makefile 2011/04/24 21:42:06	1.52
+++ src/usr.bin/login/Makefile 2012/04/22 23:26:19	1.53

 @@ -1,40 +1,42 @@
-#	$NetBSD: Makefile,v 1.52 2011/04/24 21:42:06 elric Exp $
+#	$NetBSD: Makefile,v 1.53 2012/04/22 23:26:19 christos Exp $
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-WARNS?=	2	# XXX -Wcast-qual issues
+WARNS?=	5	# XXX -Wcast-qual issues
 .include <bsd.own.mk>
 USE_FORT?= yes	# setuid
 PROG=	login
 SRCS=	copyrightstr.c
 DPADD+=	${LIBUTIL} ${LIBCRYPT}
 LDADD+=	-lutil -lcrypt
 BINOWN=	root
 BINMODE=4555
 SRCS+=	common.c
 .if (${USE_PAM} != "no")
 SRCS+=	login_pam.c
 LDADD+=	-lpam ${PAM_STATIC_LDADD}
 DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD}
 .else	# USE_PAM == no
 SRCS+=	login.c
 CPPFLAGS+=-DLOGIN_CAP -DSUPPORT_UTMP -DSUPPORT_UTMPX
 .if (${USE_KERBEROS} != "no")
 SRCS+= k5login.c
 CPPFLAGS+=-DKERBEROS5
 # XXX: for krb5_get_in_tkt_with_password
 CPPFLAGS+=-DKRB5_DEPRECATED=
 DPADD+=	${LIBKRB5} ${LIBASN1}
 LDADD+= -lkrb5 -lasn1
 DPADD+=	${LIBCRYPTO} ${LIBROKEN} ${LIBCOM_ERR}
 LDADD+=	-lcrypto -lroken -lcom_err
 .endif
 .if (${USE_SKEY} != "no")
 CPPFLAGS+=-DSKEY
 DPADD+= ${LIBSKEY}
 LDADD+=	-lskey
 .endif
 .endif	# USE_PAM == no

--- src/usr.bin/login/common.c 2009/12/29 20:15:15	1.3
+++ src/usr.bin/login/common.c 2012/04/22 23:26:19	1.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: common.c,v 1.3 2009/12/29 20:15:15 christos Exp $	*/
+/*	$NetBSD: common.c,v 1.4 2012/04/22 23:26:19 christos Exp $	*/
 /*-
  * Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: common.c,v 1.3 2009/12/29 20:15:15 christos Exp $");
+__RCSID("$NetBSD: common.c,v 1.4 2012/04/22 23:26:19 christos Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <syslog.h>
 #include <fcntl.h>
 #include <ttyent.h>
 #include <setjmp.h>
 #include <time.h>
 @@ -67,72 +67,80 @@ static void	 dolastlog(int);
 static void	 doutmpx(void);
 static void	 dolastlogx(int);
 #endif
 /*
  * This bounds the time given to login.  Not a define so it can
  * be patched on machines where it's too small.
  */
 u_int	timeout = 300;
 void	 decode_ss(const char *);
 struct	passwd *pwd;
 int	failures, have_ss;
-char	term[64], *envinit[1], *hostname, *username, *tty, *nested;
+char	term[64], *envinit[1], *hostname, *tty, *nested;
 const char *username;
 struct timeval now;
 struct sockaddr_storage ss;
-void
+char *
 trimloginname(char *u)
+{
 	if (strlen(u) > MAXLOGNAME)
 		u[MAXLOGNAME] = '\0';
 	return u;
+}
 char *
 getloginname(void)
+{
 	int ch;
 	char *p;
 	static char nbuf[NBUFSIZ];
 	for (;;) {
 		(void)printf("login: ");
 		for (p = nbuf; (ch = getchar()) != '\n'; ) {
 			if (ch == EOF) {
 				badlogin(username);
 				exit(EXIT_FAILURE);
+			}
 			if (p < nbuf + (NBUFSIZ - 1))
 				*p++ = ch;
+		}
 		if (p > nbuf) {
 			if (nbuf[0] == '-')
 				(void)fprintf(stderr,
 				    "login names may not start with '-'.\n");
 			else {
 				*p = '\0';
-				username = nbuf;
+				return nbuf;
 				break;
+			}
+		}
+	}
+}
 int
 rootterm(char *ttyn)
+{
 	struct ttyent *t;
 	return ((t = getttynam(ttyn)) && t->ty_status & TTY_SECURE);
+}
 static jmp_buf motdinterrupt;
 void
-motd(char *fname)
+motd(const char *fname)
+{
 	int fd, nchars;
 	sig_t oldint;
 	char tbuf[8192];
 	if ((fd = open(fname ? fname : _PATH_MOTDFILE, O_RDONLY, 0)) < 0)
 		return;
 	oldint = signal(SIGINT, sigint);
 	if (setjmp(motdinterrupt) == 0)
 		while ((nchars = read(fd, tbuf, sizeof(tbuf))) > 0)
 			(void)write(fileno(stdout), tbuf, nchars);
 	(void)signal(SIGINT, oldint);
 	(void)close(fd);
 @@ -233,27 +241,27 @@ doutmpx(void)
 	char *t;
 	memset((void *)&utmpx, 0, sizeof(utmpx));
 	utmpx.ut_tv = now;
 	(void)strncpy(utmpx.ut_name, username, sizeof(utmpx.ut_name));
 	if (hostname) {
 		(void)strncpy(utmpx.ut_host, hostname, sizeof(utmpx.ut_host));
 		utmpx.ut_ss = ss;
+	}
 	(void)strncpy(utmpx.ut_line, tty, sizeof(utmpx.ut_line));
 	utmpx.ut_type = USER_PROCESS;
 	utmpx.ut_pid = getpid();
 	t = tty + strlen(tty);
-	if (t - tty >= sizeof(utmpx.ut_id)) {
+	if ((size_t)(t - tty) >= sizeof(utmpx.ut_id)) {
 	    (void)strncpy(utmpx.ut_id, t - sizeof(utmpx.ut_id),
 		sizeof(utmpx.ut_id));
 	} else {
 	    (void)strncpy(utmpx.ut_id, tty, sizeof(utmpx.ut_id));
+	}
 	if (pututxline(&utmpx) == NULL)
 		syslog(LOG_NOTICE, "Cannot update utmpx: %m");
 	endutxent();
 	if (updwtmpx(_PATH_WTMPX, &utmpx) != 0)
 		syslog(LOG_NOTICE, "Cannot update wtmpx: %m");
+}
 static void

--- src/usr.bin/login/common.h 2009/12/29 19:26:13	1.1
+++ src/usr.bin/login/common.h 2012/04/22 23:26:19	1.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: common.h,v 1.1 2009/12/29 19:26:13 christos Exp $	*/
+/*	$NetBSD: common.h,v 1.2 2012/04/22 23:26:19 christos Exp $	*/
 /*-
  * Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -23,31 +23,33 @@
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 __BEGIN_DECLS
 void	 badlogin(const char *);
 void	 update_db(int, int, int);
-void	 getloginname(void);
+char	*trimloginname(char *);
-void	 motd(char *);
+char	*getloginname(void);
 void	 motd(const char *);
 int	 rootterm(char *);
 void	 sigint(int);
 void	 sleepexit(int);
 const	 char *stypeof(const char *);
 void	 timedout(int);
 void	 decode_ss(const char *);
 extern u_int	timeout;
 extern struct	passwd *pwd;
 extern int	failures, have_ss;
-extern char	term[64], *envinit[1], *hostname, *username, *tty, *nested;
+extern char	term[64], *envinit[1], *hostname, *tty, *nested;
 extern const char *username;
 extern struct timeval now;
 extern struct sockaddr_storage ss;
 extern const char copyrightstr[];
 __END_DECLS

--- src/usr.bin/login/k5login.c 2006/03/23 23:33:28	1.27
+++ src/usr.bin/login/k5login.c 2012/04/22 23:26:19	1.28

 @@ -1,14 +1,14 @@
-/*	$NetBSD: k5login.c,v 1.27 2006/03/23 23:33:28 wiz Exp $	*/
+/*	$NetBSD: k5login.c,v 1.28 2012/04/22 23:26:19 christos Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -41,27 +41,27 @@
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
  * from this software without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)klogin.c	5.11 (Berkeley) 7/12/92";
 #endif
-__RCSID("$NetBSD: k5login.c,v 1.27 2006/03/23 23:33:28 wiz Exp $");
+__RCSID("$NetBSD: k5login.c,v 1.28 2012/04/22 23:26:19 christos Exp $");
 #endif /* not lint */
 #ifdef KERBEROS5
 #include <sys/param.h>
 #include <sys/syslog.h>
 #include <krb5/krb5.h>
 #include <pwd.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
 @@ -79,33 +79,26 @@ extern int login_krb5_forwardable_tgt;
 extern int has_ccache;
 static char tkt_location[MAXPATHLEN];
 static krb5_creds forw_creds;
 int have_forward;
 static krb5_principal me, server;
 int k5_read_creds(char *);
 int k5_write_creds(void);
 int k5_verify_creds(krb5_context, krb5_ccache);
 int k5login(struct passwd *, char *, char *, char *);
 void k5destroy(void);
 #ifndef krb5_realm_length
 #define krb5_realm_length(r)	((r).length)
 #endif
 #ifndef krb5_realm_data
 #define krb5_realm_data(r)	((r).data)
 #endif
 /*
  * Verify the Kerberos ticket-granting ticket just retrieved for the
  * user.  If the Kerberos server doesn't respond, assume the user is
  * trying to fake us out (since we DID just get a TGT from what is
  * supposedly our KDC).  If the host/<host> service is unknown (i.e.,
  * the local keytab doesn't have it), let her in.
+ *
  * Returns 1 for confirmation, -1 for failure, 0 for uncertainty.
  */
 int
 k5_verify_creds(krb5_context c, krb5_ccache ccache)
+{
 	char phost[MAXHOSTNAMELEN];
 @@ -153,28 +146,29 @@ k5_verify_creds(krb5_context c, krb5_cca
 			retval = -1;
 			goto EGRESS;
+		}
 		/* but if it is unknown and we've got no key, we don't
 		 * have any security anyhow, so it is ok. */
 		else {
 			retval = 0;
 			goto EGRESS;
+		}
+	}
 	else if (kerror) {
 		krb5_warn(kcontext, kerror,
 			  "Unable to verify Kerberos V5 TGT: %s", phost);
-		syslog(LOG_NOTICE, "Kerberos V5 TGT bad: %s",
+		const char *msg = krb5_get_error_message(kcontext, kerror);
-		       krb5_get_err_text(kcontext, kerror));
+		syslog(LOG_NOTICE, "Kerberos V5 TGT bad: %s", msg);
 		krb5_free_error_message(kcontext, msg);
 		retval = -1;
 		goto EGRESS;
+	}
 	/* got ticket, try to use it */
 	kerror = krb5_rd_req(c, &auth_context, &packet,
 	                     princ, NULL, NULL, &ticket);
 	if (kerror) {
 		if (!have_keys) {
 			/* The krb5 errors aren't specified well, but I think
 			 * these values cover the cases we expect. */
 			switch (kerror) {
 			case ENOENT:	/* no keytab */
 			case KRB5_KT_NOTFOUND:
 @@ -182,31 +176,31 @@ k5_verify_creds(krb5_context c, krb5_cca
 				break;
 			default:
 				/* unexpected error: fail */
 				retval = -1;
 				break;
+			}
+		}
 		else {
 			/* we have keys, so if we got any error, we could be
 			 * under attack. */
 			retval = -1;
+		}
 		krb5_warn(kcontext, kerror, "Unable to verify host ticket");
 		const char *msg = krb5_get_error_message(kcontext, kerror);
 		syslog(LOG_NOTICE, "can't verify v5 ticket: %s; %s\n",
-		       krb5_get_err_text(kcontext, kerror),
+		    msg, retval ? "keytab found, assuming failure"
-		       retval
+		    : "no keytab found, assuming success");
-		         ? "keytab found, assuming failure"
+		krb5_free_error_message(kcontext, msg);
 		         : "no keytab found, assuming success");
 		goto EGRESS;
+	}
 	/*
 	 * The host/<host> ticket has been received _and_ verified.
 	 */
 	retval = 1;
 	/* do cleanup and return */
 EGRESS:
 	if (auth_context)
 		krb5_auth_con_free(c, auth_context);
 	krb5_free_principal(c, princ);
 	/* possibly ticket and packet need freeing here as well */
 @@ -233,33 +227,33 @@ k5_read_creds(char *username)
 	kerror = krb5_cc_default(kcontext, &ccache);
 	if (kerror) {
 		krb5_warn(kcontext, kerror, "while getting default ccache");
 		return(1);
+	}
 	kerror = krb5_parse_name(kcontext, username, &me);
 	if (kerror) {
 		krb5_warn(kcontext, kerror, "when parsing name %s", username);
 		return(1);
+	}
 	mcreds.client = me;
 	const char *realm = krb5_principal_get_realm(kcontext, me);
 	size_t rlen = strlen(realm);
 	kerror = krb5_build_principal_ext(kcontext, &mcreds.server,
-			krb5_realm_length(*krb5_princ_realm(kcontext, me)),
+			rlen, realm,
 			krb5_realm_data(*krb5_princ_realm(kcontext, me)),
 			KRB5_TGS_NAME_SIZE,
 			KRB5_TGS_NAME,
-			krb5_realm_length(*krb5_princ_realm(kcontext, me)),
+			rlen, realm,
 			krb5_realm_data(*krb5_princ_realm(kcontext, me)),
 );
 	if (kerror) {
 		krb5_warn(kcontext, kerror, "while building server name");
 		goto nuke_ccache;
+	}
 	kerror = krb5_cc_retrieve_cred(kcontext, ccache, 0,
 				       &mcreds, &forw_creds);
 	if (kerror) {
 		krb5_warn(kcontext, kerror,
 			  "while retrieving V5 initial ticket for copy");
 		goto nuke_ccache;
+	}
 @@ -362,88 +356,93 @@ k5login(struct passwd *pw, char *instanc
 	krb5tkfile_env = tkt_location;
 	has_ccache = 1;
 	if (strlen(instance))
 		asprintf(&principal, "%s/%s", pw->pw_name, instance);
 	else
 		principal = strdup(pw->pw_name);
 	if (!principal) {
 		syslog(LOG_NOTICE, "fatal: %s", strerror(errno));
 		return (1);
+	}
 	if ((kerror = krb5_cc_resolve(kcontext, tkt_location, &ccache)) != 0) {
 		const char *msg = krb5_get_error_message(kcontext, kerror);
 		syslog(LOG_NOTICE, "warning: %s while getting default ccache",
-			krb5_get_err_text(kcontext, kerror));
+		    msg);
 		krb5_free_error_message(kcontext, msg);
 		return (1);
+	}
 	if ((kerror = krb5_parse_name(kcontext, principal, &me)) != 0) {
-		syslog(LOG_NOTICE, "warning: %s when parsing name %s",
+		const char *msg = krb5_get_error_message(kcontext, kerror);
-			krb5_get_err_text(kcontext, kerror), principal);
+		syslog(LOG_NOTICE, "warning: %s when parsing name %s", msg,
 		    principal);
 		krb5_free_error_message(kcontext, msg);
 		return (1);
+	}
 	if ((kerror = krb5_unparse_name(kcontext, me, &client_name)) != 0) {
 		const char *msg = krb5_get_error_message(kcontext, kerror);
 		syslog(LOG_NOTICE, "warning: %s when unparsing name %s",
-			krb5_get_err_text(kcontext, kerror), principal);
+		    msg, principal);
 		krb5_free_error_message(kcontext, msg);
 		return (1);
+	}
 	kerror = krb5_cc_initialize(kcontext, ccache, me);
 	if (kerror != 0) {
 		const char *msg = krb5_get_error_message(kcontext, kerror);
 		syslog(LOG_NOTICE, "%s when initializing cache %s",
-			krb5_get_err_text(kcontext, kerror), tkt_location);
+		    msg, tkt_location);
 		krb5_free_error_message(kcontext, msg);
 		return (1);
+	}
 	memset((char *)&my_creds, 0, sizeof(my_creds));
 	my_creds.client = me;
 	const char *xrealm = krb5_principal_get_realm(kcontext, me);
 	size_t rlen = strlen(xrealm);
 	if ((kerror = krb5_build_principal_ext(kcontext,
 			&server,
-			krb5_realm_length(*krb5_princ_realm(kcontext, me)),
+			rlen, xrealm,
 			krb5_realm_data(*krb5_princ_realm(kcontext, me)),
 			KRB5_TGS_NAME_SIZE,
 			KRB5_TGS_NAME,
-			krb5_realm_length(*krb5_princ_realm(kcontext, me)),
+			rlen, xrealm,
 			krb5_realm_data(*krb5_princ_realm(kcontext, me)),
 )) != 0) {
-		syslog(LOG_NOTICE, "%s while building server name",
+		const char *msg = krb5_get_error_message(kcontext, kerror);
-			krb5_get_err_text(kcontext, kerror));
+		syslog(LOG_NOTICE, "%s while building server name", msg);
 		krb5_free_error_message(kcontext, msg);
 		return (1);
+	}
 	my_creds.server = server;
 	if ((kerror = krb5_timeofday(kcontext, &now)) != 0) {
-		syslog(LOG_NOTICE, "%s while getting time of day",
+		const char *msg = krb5_get_error_message(kcontext, kerror);
-			krb5_get_err_text(kcontext, kerror));
+		syslog(LOG_NOTICE, "%s while getting time of day", msg);
 		krb5_free_error_message(kcontext, msg);
 		return (1);
+	}
 	my_creds.times.starttime = 0;	/* start timer when request
 					   gets to KDC */
 	my_creds.times.endtime = now + lifetime;
 	my_creds.times.renew_till = 0;
 	kerror = krb5_get_in_tkt_with_password(kcontext, options,
-					       NULL,
+	    NULL, NULL, NULL, password, ccache, &my_creds, 0);
 					       NULL,
 					       NULL,
 					       password,
 					       ccache,
 					       &my_creds, 0);
 	if (my_creds.server != NULL)
 		krb5_free_principal(kcontext, my_creds.server);
 	if (chown(&tkt_location[5], pw->pw_uid, pw->pw_gid) < 0)
 		syslog(LOG_ERR, "chown tkfile (%s): %m", &tkt_location[5]);
 	if (kerror) {
 		if (kerror == KRB5KRB_AP_ERR_BAD_INTEGRITY)
 			printf("%s: Kerberos Password incorrect\n", principal);
 		else
 			krb5_warn(kcontext, kerror,
 				  "while getting initial credentials");

--- src/usr.bin/login/login.c 2011/08/31 16:24:57	1.98
+++ src/usr.bin/login/login.c 2012/04/22 23:26:19	1.99

 @@ -1,14 +1,14 @@
-/*	$NetBSD: login.c,v 1.98 2011/08/31 16:24:57 plunky Exp $	*/
+/*	$NetBSD: login.c,v 1.99 2012/04/22 23:26:19 christos Exp $	*/
 /*-
  * Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
 #endif
-__RCSID("$NetBSD: login.c,v 1.98 2011/08/31 16:24:57 plunky Exp $");
+__RCSID("$NetBSD: login.c,v 1.99 2012/04/22 23:26:19 christos Exp $");
 #endif /* not lint */
 /*
  * login [ name ]
  * login -h hostname	(for telnetd, etc.)
  * login -f name	(for pre-authenticated login: datakit, xterm, etc.)
  */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/file.h>
 @@ -73,47 +73,47 @@ __RCSID("$NetBSD: login.c,v 1.98 2011/08
 #include <sysexits.h>
 #ifdef SUPPORT_UTMP
 #include <utmp.h>
 #endif
 #ifdef SUPPORT_UTMPX
 #include <utmpx.h>
 #endif
 #include <util.h>
 #ifdef SKEY
 #include <skey.h>
 #endif
 #ifdef KERBEROS5
 #include <krb5/krb5.h>
-#include <com_err.h>
+#include <krb5/com_err.h>
 #endif
 #ifdef LOGIN_CAP
 #include <login_cap.h>
 #endif
 #include <vis.h>
 #include "pathnames.h"
 #include "common.h"
 #ifdef KERBEROS5
 int login_krb5_forwardable_tgt = 0;
 static int login_krb5_get_tickets = 1;
 static int login_krb5_retain_ccache = 0;
 #endif
 static void	 checknologin(char *);
 #ifdef KERBEROS5
 int	 k5login(struct passwd *, char *, char *, char *);
 void	 k5destroy(void);
-int	 k5_read_creds(char*);
+int	 k5_read_creds(const char *);
 int	 k5_write_creds(void);
 #endif
 #if defined(KERBEROS5)
 static void	 dofork(void);
 #endif
 static void	 usage(void);
 #define	TTYGRPNAME	"tty"		/* name of group to own ttys */
 #define DEFAULT_BACKOFF 3
 #define DEFAULT_RETRIES 10
 #if defined(KERBEROS5)
 @@ -132,27 +132,28 @@ extern int	krb5_configured;
 extern char **environ;
 int
 main(int argc, char *argv[])
+{
 	struct group *gr;
 	struct stat st;
 	int ask, ch, cnt, fflag, hflag, pflag, sflag, quietlog, rootlogin, rval;
 	int Fflag;
 	uid_t uid, saved_uid;
 	gid_t saved_gid, saved_gids[NGROUPS_MAX];
 	int nsaved_gids;
-	char *domain, *p, *ttyn, *pwprompt;
+	char *domain, *p, *ttyn;
 	const char *pwprompt;
 	char tbuf[MAXPATHLEN + 2], tname[sizeof(_PATH_TTY) + 10];
 	char localhost[MAXHOSTNAMELEN + 1];
 	int need_chpass, require_chpass;
 	int login_retries = DEFAULT_RETRIES,
 	    login_backoff = DEFAULT_BACKOFF;
 	time_t pw_warntime = _PASSWORD_WARNDAYS * SECSPERDAY;
 #ifdef KERBEROS5
 	krb5_error_code kerror;
 #endif
 #if defined(KERBEROS5)
 	int got_tickets = 0;
 #endif
 #ifdef LOGIN_CAP
 @@ -231,27 +232,27 @@ main(int argc, char *argv[])
 			sflag = 1;
 			break;
 		default:
 		case '?':
 			usage();
 			break;
+		}
 	setproctitle(NULL);
 	argc -= optind;
 	argv += optind;
 	if (*argv) {
-		username = *argv;
+		username = instance = *argv;
 		ask = 0;
 	} else
 		ask = 1;
 #ifdef F_CLOSEM
 	(void)fcntl(3, F_CLOSEM, 0);
 #else
 	for (cnt = getdtablesize(); cnt > 2; cnt--)
 		(void)close(cnt);
 #endif
 	ttyn = ttyname(STDIN_FILENO);
 	if (ttyn == NULL || *ttyn == '\0') {
 @@ -297,44 +298,44 @@ main(int argc, char *argv[])
 		 * login succeeds.
 		 */
 		if (kerror != ENXIO) {	/* XXX NetBSD-local Heimdal hack */
 			syslog(LOG_NOTICE,
 			    "%s when initializing Kerberos context",
 			    error_message(kerror));
 			krb5_configured = 1;
+		}
 		login_krb5_get_tickets = 0;
+	}
 #endif /* KERBEROS5 */
 	for (cnt = 0;; ask = 1) {
 		char *ptr;
 #if defined(KERBEROS5)
 		if (login_krb5_get_tickets)
 			k5destroy();
 #endif
 		if (ask) {
 			fflag = 0;
-			getloginname();
+			instance = getloginname();
+		}
 		rootlogin = 0;
 		ptr = instance;
 #ifdef KERBEROS5
-		if ((instance = strchr(username, '/')) != NULL)
+		if ((instance = strchr(instance, '/')) != NULL)
 			*instance++ = '\0';
 		else
-			instance = "";
+			instance = __UNCONST("");
 #endif
-		if (strlen(username) > MAXLOGNAME)
+		username = trimloginname(ptr);
 			username[MAXLOGNAME] = '\0';
 		/*
 		 * Note if trying multiple user names; log failures for
 		 * previous user name, but don't bother logging one failure
 		 * for nonexistent name (mistyped username).
 		 */
 		if (failures && strcmp(tbuf, username)) {
 			if (failures > (pwd ? 0 : 1))
 				badlogin(tbuf);
 			failures = 0;
+		}
 		(void)strlcpy(tbuf, username, sizeof(tbuf));
 		pwd = getpwnam(username);
 @@ -496,27 +497,27 @@ main(int argc, char *argv[])
 	(void)seteuid(pwd->pw_uid);
 	if (chdir(pwd->pw_dir) < 0) {
 #ifdef LOGIN_CAP
 		if (login_getcapbool(lc, "requirehome", 0)) {
 			(void)printf("Home directory %s required\n",
 			    pwd->pw_dir);
 			sleepexit(EXIT_FAILURE);
+		}
 #endif
 		(void)printf("No home directory %s!\n", pwd->pw_dir);
 		if (chdir("/") == -1)
 			exit(EXIT_FAILURE);
-		pwd->pw_dir = "/";
+		pwd->pw_dir = __UNCONST("/");
 		(void)printf("Logging in with home = \"/\".\n");
+	}
 	if (!quietlog)
 		quietlog = access(_PATH_HUSHLOGIN, F_OK) == 0;
 	/* regain special privileges */
 	(void)seteuid(saved_uid);
 	setgroups(nsaved_gids, saved_gids);
 	(void)setegid(saved_gid);
 #ifdef LOGIN_CAP
 	pw_warntime = login_getcaptime(lc, "password-warn",
 @@ -582,41 +583,41 @@ main(int argc, char *argv[])
 	initgroups(username, pwd->pw_gid);
 	if (nested == NULL && setlogin(pwd->pw_name) < 0)
 		syslog(LOG_ERR, "setlogin() failure: %m");
 	/* Discard permissions last so can't get killed and drop core. */
 	if (rootlogin)
 		(void)setuid(0);
 	else
 		(void)setuid(pwd->pw_uid);
 #endif
 	if (*pwd->pw_shell == '\0')
-		pwd->pw_shell = _PATH_BSHELL;
+		pwd->pw_shell = __UNCONST(_PATH_BSHELL);
 #ifdef LOGIN_CAP
 	if ((shell = login_getcapstr(lc, "shell", NULL, NULL)) != NULL) {
 		if ((shell = strdup(shell)) == NULL) {
 			syslog(LOG_ERR, "Cannot alloc mem");
 			sleepexit(EXIT_FAILURE);
+		}
 		pwd->pw_shell = shell;
+	}
 #endif
 	(void)setenv("HOME", pwd->pw_dir, 1);
 	(void)setenv("SHELL", pwd->pw_shell, 1);
 	if (term[0] == '\0') {
-		char *tt = (char *)stypeof(tty);
+		const char *tt = stypeof(tty);
 #ifdef LOGIN_CAP
 		if (tt == NULL)
 			tt = login_getcapstr(lc, "term", NULL, NULL);
 #endif
 		/* unknown term -> "su" */
 		(void)strlcpy(term, tt != NULL ? tt : "su", sizeof(term));
+	}
 	(void)setenv("TERM", term, 0);
 	(void)setenv("LOGNAME", pwd->pw_name, 1);
 	(void)setenv("USER", pwd->pw_name, 1);
 #ifdef LOGIN_CAP
 	setusercontext(lc, pwd, pwd->pw_uid, LOGIN_SETPATH);
 @@ -638,27 +639,27 @@ main(int argc, char *argv[])
 			syslog(LOG_NOTICE, "ROOT LOGIN (%s) ON %s FROM %s",
 			    username, tty, hostname);
 		else
 			syslog(LOG_NOTICE, "ROOT LOGIN (%s) ON %s",
 			    username, tty);
+	}
 #if defined(KERBEROS5)
 	if (KERBEROS_CONFIGURED && !quietlog && notickets == 1)
 		(void)printf("Warning: no Kerberos tickets issued.\n");
 #endif
 	if (!quietlog) {
-		char *fname;
+		const char *fname;
 #ifdef LOGIN_CAP
 		fname = login_getcapstr(lc, "copyright", NULL, NULL);
 		if (fname != NULL && access(fname, F_OK) == 0)
 			motd(fname);
 		else
 #endif
 			(void)printf("%s", copyrightstr);
 #ifdef LOGIN_CAP
 		fname = login_getcapstr(lc, "welcome", NULL, NULL);
 		if (fname == NULL || access(fname, F_OK) != 0)
 #endif
 			fname = _PATH_MOTDFILE;

--- src/usr.bin/login/login_pam.c 2009/12/29 19:26:13	1.20
+++ src/usr.bin/login/login_pam.c 2012/04/22 23:26:19	1.21

 @@ -1,14 +1,14 @@
-/*     $NetBSD: login_pam.c,v 1.20 2009/12/29 19:26:13 christos Exp $       */
+/*     $NetBSD: login_pam.c,v 1.21 2012/04/22 23:26:19 christos Exp $       */
 /*-
  * Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
 #endif
-__RCSID("$NetBSD: login_pam.c,v 1.20 2009/12/29 19:26:13 christos Exp $");
+__RCSID("$NetBSD: login_pam.c,v 1.21 2012/04/22 23:26:19 christos Exp $");
 #endif /* not lint */
 /*
  * login [ name ]
  * login -h hostname	(for telnetd, etc.)
  * login -f name	(for pre-authenticated login: datakit, xterm, etc.)
  */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/file.h>
 @@ -184,27 +184,27 @@ main(int argc, char *argv[])
 			pflag = 1;
 			break;
 		default:
 		case '?':
 			usage();
 			break;
+		}
 	setproctitle(NULL);
 	argc -= optind;
 	argv += optind;
 	if (*argv) {
-		username = *argv;
+		username = trimloginname(*argv);
 		ask = 0;
 	} else
 		ask = 1;
 #ifdef F_CLOSEM
 	(void)fcntl(3, F_CLOSEM, 0);
 #else
 	for (cnt = getdtablesize(); cnt > 2; cnt--)
 		(void)close(cnt);
 #endif
 	ttyn = ttyname(STDIN_FILENO);
 	if (ttyn == NULL || *ttyn == '\0') {
 @@ -230,32 +230,30 @@ main(int argc, char *argv[])
 	if ((lc = login_getclass(NULL)) != NULL) {
 		login_retries = (int)login_getcapnum(lc, "login-retries",
 		    DEFAULT_RETRIES, DEFAULT_RETRIES);
 		login_backoff = (int)login_getcapnum(lc, "login-backoff",
 		    DEFAULT_BACKOFF, DEFAULT_BACKOFF);
 		login_close(lc);
 		lc = NULL;
+	}
 	for (cnt = 0;; ask = 1) {
 		if (ask) {
 			fflag = 0;
-			getloginname();
+			username = trimusername(getloginname());
+		}
 		rootlogin = 0;
 		auth_passed = 0;
 		if (strlen(username) > MAXLOGNAME)
 			username[MAXLOGNAME] = '\0';
 		/*
 		 * Note if trying multiple user names; log failures for
 		 * previous user name, but don't bother logging one failure
 		 * for nonexistent name (mistyped username).
 		 */
 		if (failures && strcmp(tbuf, username)) {
 			if (failures > (pwd ? 0 : 1))
 				badlogin(tbuf);
 			failures = 0;
+		}
 #define PAM_END(msg) do { 						\
 @@ -324,27 +322,27 @@ main(int argc, char *argv[])
 		(void)setpriority(PRIO_PROCESS, 0, -4);
 		switch(pam_err = pam_authenticate(pamh, pam_silent)) {
 		case PAM_SUCCESS:
 			/*
 			 * PAM can change the user, refresh
 			 * username, pwd, and lc.
 			 */
 			pam_err = pam_get_item(pamh, PAM_USER, &newuser);
 			if (pam_err != PAM_SUCCESS)
 				PAM_END("pam_get_item(PAM_USER)");
-			username = (char *)newuser;
+			username = newuser;
 			/*
 			 * Don't check for errors, because we don't want to give
 			 * out any information.
 			 */
 			pwd = NULL;
 			(void)getpwnam_r(username, &pwres, pwbuf, sizeof(pwbuf),
 			    &pwd);
 			lc = login_getpwclass(pwd);
 			auth_passed = 1;
 			switch (pam_err = pam_acct_mgmt(pamh, pam_silent)) {
 			case PAM_SUCCESS:
 				break;
 @@ -431,27 +429,27 @@ skip_auth:
 	if (chdir(pwd->pw_dir) != 0) {
                 if (login_getcapbool(lc, "requirehome", 0)) {
 			(void)printf("Home directory %s required\n",
 			    pwd->pw_dir);
 			pam_end(pamh, PAM_SUCCESS);
                         exit(EXIT_FAILURE);
+		}
 		(void)printf("No home directory %s!\n", pwd->pw_dir);
 		if (chdir("/") == -1) {
 			pam_end(pamh, PAM_SUCCESS);
 			exit(EXIT_FAILURE);
+		}
-		pwd->pw_dir = "/";
+		pwd->pw_dir = __UNCONST("/");
 		(void)printf("Logging in with home = \"/\".\n");
+	}
 	if (!quietlog) {
 		quietlog = access(_PATH_HUSHLOGIN, F_OK) == 0;
 		pam_silent = quietlog ? PAM_SILENT : 0;
+	}
 	/* regain special privileges */
 	setegid(saved_gid);
 	setgroups(nsaved_gids, saved_gids);
 	seteuid(saved_uid);
 @@ -560,41 +558,41 @@ skip_auth:
 	 * job when we exit.
+         *
 	 * Destroy environment unless user has requested its preservation.
 	 * Try to preserve TERM anyway.
 	 */
 	saved_term = getenv("TERM");
 	if (!pflag) {
 		environ = envinit;
 		if (saved_term)
 			setenv("TERM", saved_term, 0);
+	}
 	if (*pwd->pw_shell == '\0')
-		pwd->pw_shell = _PATH_BSHELL;
+		pwd->pw_shell = __UNCONST(_PATH_BSHELL);
 	shell = login_getcapstr(lc, "shell", pwd->pw_shell, pwd->pw_shell);
 	if (*shell == '\0')
 		shell = pwd->pw_shell;
 	if ((pwd->pw_shell = strdup(shell)) == NULL) {
 		syslog(LOG_ERR, "Cannot alloc mem");
 		exit(EXIT_FAILURE);
+	}
 	(void)setenv("HOME", pwd->pw_dir, 1);
 	(void)setenv("SHELL", pwd->pw_shell, 1);
 	if (term[0] == '\0') {
-		char *tt = (char *)stypeof(tty);
+		const char *tt = stypeof(tty);
 		if (tt == NULL)
 			tt = login_getcapstr(lc, "term", NULL, NULL);
 		/* unknown term -> "su" */
 		(void)strlcpy(term, tt != NULL ? tt : "su", sizeof(term));
+	}
 	(void)setenv("TERM", term, 0);
 	(void)setenv("LOGNAME", pwd->pw_name, 1);
 	(void)setenv("USER", pwd->pw_name, 1);
 	/*
 	 * Add PAM environement
 @@ -608,27 +606,27 @@ skip_auth:
+		}
 		free(pamenv);
+	}
 	/* This drops root privs */
 	if (setusercontext(lc, pwd, pwd->pw_uid,
 	    (LOGIN_SETALL & ~LOGIN_SETLOGIN)) != 0) {
 		syslog(LOG_ERR, "setusercontext failed");
 		exit(EXIT_FAILURE);
+	}
 	if (!quietlog) {
-		char *fname;
+		const char *fname;
 		fname = login_getcapstr(lc, "copyright", NULL, NULL);
 		if (fname != NULL && access(fname, F_OK) == 0)
 			motd(fname);
 		else
 			(void)printf("%s", copyrightstr);
                 fname = login_getcapstr(lc, "welcome", NULL, NULL);
                 if (fname == NULL || access(fname, F_OK) != 0)
                         fname = _PATH_MOTDFILE;
                 motd(fname);
 		(void)snprintf(tbuf,