summaryrefslogtreecommitdiffstats
path: root/libexec
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2002-05-08 00:47:01 +0000
committerdes <des@FreeBSD.org>2002-05-08 00:47:01 +0000
commit84dfbe4ad59351b428fe08c0e87d8cca873fbd90 (patch)
treea9177752eedd56dd4dc85c2061db80a29c678464 /libexec
parent6a749b9ddc465ad14d6cf3738355ac8204efc6bc (diff)
downloadFreeBSD-src-84dfbe4ad59351b428fe08c0e87d8cca873fbd90.zip
FreeBSD-src-84dfbe4ad59351b428fe08c0e87d8cca873fbd90.tar.gz
Use <paths.h> rather than "pathnames.h", and fix a couple of whitespace nits.
Sponsored by: DARPA, NAI Labs
Diffstat (limited to 'libexec')
-rw-r--r--libexec/rlogind/pathnames.h40
-rw-r--r--libexec/rlogind/rlogind.c13
2 files changed, 10 insertions, 43 deletions
diff --git a/libexec/rlogind/pathnames.h b/libexec/rlogind/pathnames.h
deleted file mode 100644
index 17a8f5c..0000000
--- a/libexec/rlogind/pathnames.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * 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.
- *
- * @(#)pathnames.h 8.1 (Berkeley) 6/4/93
- * $FreeBSD$
- */
-
-#include <paths.h>
-
-#define _PATH_LOGIN "/usr/bin/login"
-#define _PATH_RLOGIN "/usr/bin/rlogin"
diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c
index 20db3f1..cdc62a6 100644
--- a/libexec/rlogind/rlogind.c
+++ b/libexec/rlogind/rlogind.c
@@ -1,6 +1,13 @@
/*-
* Copyright (c) 1983, 1988, 1989, 1993
* The Regents of the University of California. All rights reserved.
+ * Copyright (c) 2002 Networks Associates Technology, Inc.
+ * All rights reserved.
+ *
+ * Portions of this software were developed for the FreeBSD Project by
+ * ThinkSec AS and NAI Labs, the Security Research Division of Network
+ * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -72,13 +79,13 @@ static const char rcsid[] =
#include <errno.h>
#include <libutil.h>
+#include <paths.h>
#include <pwd.h>
#include <syslog.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include "pathnames.h"
#ifndef TIOCPKT_WINDOW
@@ -177,7 +184,7 @@ main(int argc, char *argv[])
if (no_delay &&
setsockopt(0, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)) < 0)
syslog(LOG_WARNING, "setsockopt (TCP_NODELAY): %m");
- if (from.su_family == AF_INET)
+ if (from.su_family == AF_INET)
{
on = IPTOS_LOWDELAY;
if (setsockopt(0, IPPROTO_IP, IP_TOS, (char *)&on, sizeof(int)) < 0)
@@ -238,7 +245,7 @@ doit(int f, union sockunion *fromp)
}
#ifdef IP_OPTIONS
if (fromp->su_family == AF_INET)
- {
+ {
u_char optbuf[BUFSIZ/3];
int optsize = sizeof(optbuf), ipproto, i;
struct protoent *ip;
OpenPOWER on IntegriCloud