 @@ -1,14 +1,14 @@
-/*	$NetBSD: rlogind.c,v 1.39 2009/03/16 02:18:39 lukem Exp $	*/
+/*	$NetBSD: rlogind.c,v 1.40 2011/08/27 15:45:52 joerg Exp $	*/
 /*
  * Copyright (C) 1998 WIDE Project.
  * 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.
 @@ -59,27 +59,27 @@
  * 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>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1989, 1993\
  The Regents of the University of California.  All rights reserved.");
 #if 0
 static char sccsid[] = "@(#)rlogind.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: rlogind.c,v 1.39 2009/03/16 02:18:39 lukem Exp $");
+__RCSID("$NetBSD: rlogind.c,v 1.40 2011/08/27 15:45:52 joerg Exp $");
 #endif
 #endif /* not lint */
 /*
  * remote login server:
  *	\0
  *	remuser\0
  *	locuser\0
  *	terminal_type/speed\0
  *	data
  */
 #include <sys/param.h>
 @@ -103,61 +103,58 @@ __RCSID("$NetBSD: rlogind.c,v 1.39 2009/
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <util.h>
 #include "pathnames.h"
 #ifndef TIOCPKT_WINDOW
 #define TIOCPKT_WINDOW 0x80
 #endif
 #define		OPTIONS			"alnL"
-char	*env[2];
+static char	*env[2];
 #define	NMAX 30
-char	lusername[NMAX+1], rusername[NMAX+1];
+static char	lusername[NMAX+1], rusername[NMAX+1];
 static	char term[64] = "TERM=";
 #define	ENVSIZE	(sizeof("TERM=")-1)	/* skip null for concatenation */
-int	keepalive = 1;
+static int	keepalive = 1;
-int	check_all = 0;
+static int	check_all = 0;
-int	log_success = 0;
+static int	log_success = 0;
-struct	passwd *pwd;
+static struct	passwd *pwd;
-void	doit __P((int, struct sockaddr_storage *));
+__dead static void	doit(int, struct sockaddr_storage *);
-int	control __P((int, char *, int));
+static int	control(int, char *, int);
-void	protocol __P((int, int));
+static void	protocol(int, int);
-void	cleanup __P((int));
+__dead static void	cleanup(int);
-void	fatal __P((int, const char *, int));
+__dead static void	fatal(int, const char *, int);
-int	do_rlogin __P((struct sockaddr *, char *));
+static int	do_rlogin(struct sockaddr *, char *);
-void	getstr __P((char *, int, const char *));
+static void	getstr(char *, int, const char *);
-void	setup_term __P((int));
+static void	setup_term(int);
 #if 0
-int	do_krb_login __P((union sockunion *));
+static int	do_krb_login(union sockunion *);
 #endif
-void	usage __P((void));
+__dead static void	usage(void);
-int	local_domain __P((char *));
+static int	local_domain(char *);
-char	*topdomain __P((char *));
+static char	*topdomain(char *);
 int	main __P((int, char *[]));
 extern int __check_rhosts_file;
 extern char *__rcmd_errstr;	/* syslog hook from libc/net/rcmd.c */
 extern char **environ;
 int
-main(argc, argv)
+main(int argc, char *argv[])
 	int argc;
 	char *argv[];
+{
 	struct sockaddr_storage from;
 	int ch, on;
 	socklen_t fromlen = sizeof(from);
 	openlog("rlogind", LOG_PID, LOG_AUTH);
 	opterr = 0;
 	while ((ch = getopt(argc, argv, OPTIONS)) != -1)
 		switch (ch) {
 		case 'a':
 			check_all = 1;
 			break;
 @@ -220,38 +217,34 @@ main(argc, argv)
 	if (from.ss_family == AF_INET) {
 		on = IPTOS_LOWDELAY;
 		if (setsockopt(0, IPPROTO_IP, IP_TOS, (char *)&on, sizeof(int)) < 0)
 			syslog(LOG_WARNING, "setsockopt (IP_TOS): %m");
+	}
 #endif
 	doit(0, &from);
 	/* NOTREACHED */
 #ifdef __GNUC__
 	exit(0);
 #endif
+}
-int	child;
+static int	netf;
-int	netf;
+static char	line[MAXPATHLEN];
-char	line[MAXPATHLEN];
+static int	confirmed;
 int	confirmed;
 struct winsize win = { 0, 0, 0, 0 };
 static struct winsize win = { 0, 0, 0, 0 };
-void
+static void
-doit(f, fromp)
+doit(int f, struct sockaddr_storage *fromp)
 	int f;
 	struct sockaddr_storage *fromp;
+{
 	int master, pid, on = 1;
 	int authenticated = 0;
 	char *hostname;
 	char hostnamebuf[2 * MAXHOSTNAMELEN + 1];
 	char hostaddrbuf[sizeof(*fromp) * 4 + 1];
 	char c;
 	char naddr[NI_MAXHOST];
 	char saddr[NI_MAXHOST];
 	char raddr[NI_MAXHOST];
 	int af = fromp->ss_family;
 	u_int16_t *portp;
 	struct addrinfo hints, *res, *res0;
 @@ -411,60 +404,56 @@ doit(f, fromp)
 			    "--", lusername, (char *)0);
 		fatal(STDERR_FILENO, _PATH_LOGIN, 1);
 		/*NOTREACHED*/
+	}
 	ioctl(f, FIONBIO, &on);
 	ioctl(master, FIONBIO, &on);
 	ioctl(master, TIOCPKT, &on);
 	signal(SIGCHLD, cleanup);
 	protocol(f, master);
 	signal(SIGCHLD, SIG_IGN);
 	cleanup(0);
+}
-char	magic[2] = { 0377, 0377 };
+static char	magic[2] = { 0377, 0377 };
-char	oobdata[] = {TIOCPKT_WINDOW};
+static char	oobdata[] = {TIOCPKT_WINDOW};
 /*
  * Handle a "control" request (signaled by magic being present)
  * in the data stream.  For now, we are only willing to handle
  * window size changes.
  */
-int
+static int
-control(pty, cp, n)
+control(int pty, char *cp, int n)
 	int pty;
 	char *cp;
 	int n;
+{
 	struct winsize w;
 	if (n < (int)(4+sizeof (w)) || cp[2] != 's' || cp[3] != 's')
 		return (0);
 	oobdata[0] &= ~TIOCPKT_WINDOW;	/* we know he heard */
 	memmove(&w, cp+4, sizeof(w));
 	w.ws_row = ntohs(w.ws_row);
 	w.ws_col = ntohs(w.ws_col);
 	w.ws_xpixel = ntohs(w.ws_xpixel);
 	w.ws_ypixel = ntohs(w.ws_ypixel);
 	(void)ioctl(pty, TIOCSWINSZ, &w);
 	return (4+sizeof (w));
+}
 /*
  * rlogin "protocol" machine.
  */
-void
+static void
-protocol(f, p)
+protocol(int f, int p)
 	int f, p;
+{
 	char pibuf[1024+1], fibuf[1024], *pbp = NULL, *fbp = NULL;
 					/* XXX gcc above */
 	int pcc = 0, fcc = 0;
 	int cc, nfd;
 	char cntl;
 	struct pollfd set[2];
 	/*
 	 * Must ignore SIGTTOU, otherwise we'll stop
 	 * when we try and set slave pty's window shape
 	 * (our controlling tty is the master pty).
 	 */
 @@ -561,84 +550,78 @@ protocol(f, p)
 				pcc = 0;
+			}
+		}
 		if (set[1].revents & POLLOUT && pcc > 0) {
 			cc = write(f, pbp, pcc);
 			if (cc > 0) {
 				pcc -= cc;
 				pbp += cc;
+			}
+		}
+	}
+}
-void
+static void
-cleanup(signo)
+cleanup(int signo)
 	int signo;
+{
 	char *p, c;
 	p = line + sizeof(_PATH_DEV) - 1;
 #ifdef SUPPORT_UTMP
 	if (logout(p))
 		logwtmp(p, "", "");
 #endif
 #ifdef SUPPORT_UTMPX
 	if (logoutx(p, 0, DEAD_PROCESS))
 		logwtmpx(p, "", "", 0, DEAD_PROCESS);
 #endif
 	(void)chmod(line, 0666);
 	(void)chown(line, 0, 0);
 	c = *p; *p = 'p';
 	(void)chmod(line, 0666);
 	(void)chown(line, 0, 0);
 	*p = c;
 	if (ttyaction(line, "rlogind", "root"))
 		syslog(LOG_ERR, "%s: ttyaction failed", line);
 	shutdown(netf, 2);
 	exit(1);
+}
-void
+static void
-fatal(f, msg, syserr)
+fatal(int f, const char *msg, int syserr)
 	int f;
 	const char *msg;
 	int syserr;
+{
 	int len;
 	char buf[BUFSIZ], *bp, *ep;
 	bp = buf;
 	ep = buf + sizeof(buf);
 	/*
 	 * Prepend binary one to message if we haven't sent
 	 * the magic null as confirmation.
 	 */
 	if (!confirmed)
 		*bp++ = '\001';		/* error indicator */
 	if (syserr)
 		len = snprintf(bp, ep - bp, "rlogind: %s: %s.\r\n",
 		    msg, strerror(errno));
 	else
 		len = snprintf(bp, ep - bp, "rlogind: %s.\r\n", msg);
 	(void) write(f, buf, bp + len - buf);
 	exit(1);
+}
-int
+static int
-do_rlogin(dest, host)
+do_rlogin(struct sockaddr *dest, char *host)
 	struct sockaddr *dest;
 	char *host;
+{
 	int retval;
 	getstr(rusername, sizeof(rusername), "remuser too long");
 	getstr(lusername, sizeof(lusername), "locuser too long");
 	getstr(term+ENVSIZE, sizeof(term)-ENVSIZE, "Terminal type too long");
 	pwd = getpwnam(lusername);
 	if (pwd == NULL) {
 		syslog(LOG_INFO,
 		    "%s@%s as %s: unknown login.", rusername, host, lusername);
 		return (-1);
+	}
 @@ -651,47 +634,43 @@ do_rlogin(dest, host)
 			syslog(LOG_INFO, "%s@%s as %s: iruserok succeeded",
 			    rusername, host, lusername);
 	} else {
 		if (__rcmd_errstr)
 			syslog(LOG_INFO, "%s@%s as %s: iruserok failed (%s)",
 			    rusername, host, lusername, __rcmd_errstr);
 		else
 			syslog(LOG_INFO, "%s@%s as %s: iruserok failed",
 			    rusername, host, lusername);
+	}
 	return(retval);
+}
-void
+static void
-getstr(buf, cnt, errmsg)
+getstr(char *buf, int cnt, const char *errmsg)
 	char *buf;
 	int cnt;
 	const char *errmsg;
+{
 	char c;
 	do {
 		if (read(0, &c, 1) != 1)
 			exit(1);
 		if (--cnt < 0)
 			fatal(STDOUT_FILENO, errmsg, 0);
 		*buf++ = c;
 	} while (c != 0);
+}
-void
+static void
-setup_term(fd)
+setup_term(int fd)
 	int fd;
+{
 	char *cp = index(term+ENVSIZE, '/');
 	char *speed;
 	struct termios tt;
 #ifndef notyet
 	tcgetattr(fd, &tt);
 	if (cp) {
 		*cp++ = '\0';
 		speed = cp;
 		cp = index(speed, '/');
 		if (cp)
 			*cp++ = '\0';
 @@ -711,60 +690,59 @@ setup_term(fd)
 			*cp++ = '\0';
 		tcgetattr(fd, &tt);
 		cfsetspeed(&tt, atoi(speed));
 		tcsetattr(fd, TCSAFLUSH, &tt);
+	}
 #endif
 	env[0] = term;
 	env[1] = 0;
 	environ = env;
+}
-void
+static void
-usage()
+usage(void)
+{
 	syslog(LOG_ERR, "usage: rlogind [-alnL]");
 	exit(1);
+}
 /*
  * Check whether host h is in our local domain,
  * defined as sharing the last two components of the domain part,
  * or the entire domain part if the local domain has only one component.
  * If either name is unqualified (contains no '.'),
  * assume that the host is local, as it will be
  * interpreted as such.
  */
-int
+static int
-local_domain(h)
+local_domain(char *h)
 	char *h;
+{
 	char localhost[MAXHOSTNAMELEN + 1];
 	char *p1, *p2;
 	localhost[0] = 0;
 	(void) gethostname(localhost, sizeof(localhost));
 	localhost[sizeof(localhost) - 1] = '\0';
 	p1 = topdomain(localhost);
 	p2 = topdomain(h);
 	if (p1 == NULL || p2 == NULL || !strcasecmp(p1, p2))
 		return (1);
 	return (0);
+}
-char *
+static char *
-topdomain(h)
+topdomain(char *h)
 	char *h;
+{
 	char *p;
 	char *maybe = NULL;
 	int dots = 0;
 	for (p = h + strlen(h); p >= h; p--) {
 		if (*p == '.') {
 			if (++dots == 2)
 				return (p);
 			maybe = p;
+		}
+	}
 	return (maybe);