[Midnightbsd-cvs] src [11400] sync with freebsd.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Jul 6 21:01:21 EDT 2018
Revision: 11400
http://svnweb.midnightbsd.org/src/?rev=11400
Author: laffer1
Date: 2018-07-06 21:01:21 -0400 (Fri, 06 Jul 2018)
Log Message:
-----------
sync with freebsd.
Modified Paths:
--------------
trunk/libexec/getty/Makefile
trunk/libexec/getty/chat.c
trunk/libexec/getty/extern.h
trunk/libexec/getty/getty.8
trunk/libexec/getty/gettytab.5
trunk/libexec/getty/gettytab.h
trunk/libexec/getty/init.c
trunk/libexec/getty/main.c
trunk/libexec/getty/pathnames.h
trunk/libexec/getty/subr.c
trunk/libexec/getty/ttys.5
Property Changed:
----------------
trunk/libexec/getty/getty.8
trunk/libexec/getty/gettytab.5
trunk/libexec/getty/ttys.5
Modified: trunk/libexec/getty/Makefile
===================================================================
--- trunk/libexec/getty/Makefile 2018-07-07 01:00:54 UTC (rev 11399)
+++ trunk/libexec/getty/Makefile 2018-07-07 01:01:21 UTC (rev 11400)
@@ -1,6 +1,6 @@
+# $MidnightBSD$
# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/libexec/getty/Makefile,v 1.11 2002/02/04 02:33:50 kris Exp $
-# $MidnightBSD: src/libexec/getty/Makefile,v 1.2 2012/04/11 00:46:54 laffer1 Exp $
+# $FreeBSD: stable/10/libexec/getty/Makefile 201380 2010-01-02 09:50:19Z ed $
PROG= getty
SRCS= main.c init.c subr.c chat.c
Modified: trunk/libexec/getty/chat.c
===================================================================
--- trunk/libexec/getty/chat.c 2018-07-07 01:00:54 UTC (rev 11399)
+++ trunk/libexec/getty/chat.c 2018-07-07 01:01:21 UTC (rev 11400)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/libexec/getty/chat.c,v 1.2 2012/04/11 00:46:54 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1997
* David L Nugent <davidn at blaze.net.au>.
@@ -24,10 +24,8 @@
* For semi-intelligent modem handling.
*/
-#ifndef lint
-static const char rcsid[] =
- "$FreeBSD: src/libexec/getty/chat.c,v 1.11 2005/04/06 17:42:24 stefanf Exp $";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: stable/10/libexec/getty/chat.c 228582 2011-12-16 15:44:12Z dim $");
#include <sys/types.h>
#include <sys/ioctl.h>
Modified: trunk/libexec/getty/extern.h
===================================================================
--- trunk/libexec/getty/extern.h 2018-07-07 01:00:54 UTC (rev 11399)
+++ trunk/libexec/getty/extern.h 2018-07-07 01:01:21 UTC (rev 11400)
@@ -11,11 +11,7 @@
* 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
+ * 3. 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.
*
@@ -32,7 +28,7 @@
* SUCH DAMAGE.
*
* from: @(#)extern.h 8.1 (Berkeley) 6/4/93
- * $FreeBSD: src/libexec/getty/extern.h,v 1.9 2005/04/06 17:42:24 stefanf Exp $
+ * $FreeBSD: stable/10/libexec/getty/extern.h 262435 2014-02-24 08:21:49Z brueffer $
*/
struct delayval;
Modified: trunk/libexec/getty/getty.8
===================================================================
--- trunk/libexec/getty/getty.8 2018-07-07 01:00:54 UTC (rev 11399)
+++ trunk/libexec/getty/getty.8 2018-07-07 01:01:21 UTC (rev 11400)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 1980, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -9,11 +10,7 @@
.\" 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
+.\" 3. 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.
.\"
@@ -30,9 +27,8 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)getty.8 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/libexec/getty/getty.8,v 1.16 2005/01/18 09:29:39 ru Exp $
-.\" $MidnightBSD$
-.\"
+.\" $FreeBSD: stable/10/libexec/getty/getty.8 262435 2014-02-24 08:21:49Z brueffer $
+.\" "
.Dd June 4, 1993
.Dt GETTY 8
.Os
Property changes on: trunk/libexec/getty/getty.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/libexec/getty/gettytab.5
===================================================================
--- trunk/libexec/getty/gettytab.5 2018-07-07 01:00:54 UTC (rev 11399)
+++ trunk/libexec/getty/gettytab.5 2018-07-07 01:01:21 UTC (rev 11400)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -9,11 +10,7 @@
.\" 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
+.\" 3. 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.
.\"
@@ -30,9 +27,8 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)gettytab.5 8.4 (Berkeley) 4/19/94
-.\" $FreeBSD: src/libexec/getty/gettytab.5,v 1.41 2005/01/18 09:29:39 ru Exp $
-.\" $MidnightBSD: src/libexec/getty/gettytab.5,v 1.2 2012/04/11 00:46:54 laffer1 Exp $
-.\"
+.\" $FreeBSD: stable/10/libexec/getty/gettytab.5 262435 2014-02-24 08:21:49Z brueffer $
+.\" "
.Dd April 19, 1994
.Dt GETTYTAB 5
.Os
@@ -76,7 +72,7 @@
.Va default
table.
.Bl -column Name Type /usr/bin/login
-.It Sy "Name Type Default Description
+.It Sy "Name Type Default Description"
.It "ac str unused expect-send chat script for modem answer"
.It "al str unused user to auto-login instead of prompting"
.It "ap bool false terminal uses any parity"
@@ -189,7 +185,7 @@
.It "ub bool false do unbuffered output (of prompts etc)"
.It "we str" Ta So Li ^W Sc Ta
.No "word erase character"
-.It "xc bool false do
+.It "xc bool false do"
.Em NOT
echo control chars as
.Ql ^X
Property changes on: trunk/libexec/getty/gettytab.5
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/libexec/getty/gettytab.h
===================================================================
--- trunk/libexec/getty/gettytab.h 2018-07-07 01:00:54 UTC (rev 11399)
+++ trunk/libexec/getty/gettytab.h 2018-07-07 01:01:21 UTC (rev 11400)
@@ -11,11 +11,7 @@
* 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
+ * 3. 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.
*
@@ -32,7 +28,7 @@
* SUCH DAMAGE.
*
* from: @(#)gettytab.h 8.2 (Berkeley) 3/30/94
- * $FreeBSD: src/libexec/getty/gettytab.h,v 1.14 2003/06/10 18:30:41 yar Exp $
+ * $FreeBSD: stable/10/libexec/getty/gettytab.h 262435 2014-02-24 08:21:49Z brueffer $
*/
/*
Modified: trunk/libexec/getty/init.c
===================================================================
--- trunk/libexec/getty/init.c 2018-07-07 01:00:54 UTC (rev 11399)
+++ trunk/libexec/getty/init.c 2018-07-07 01:01:21 UTC (rev 11400)
@@ -11,11 +11,7 @@
* 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
+ * 3. 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.
*
@@ -37,7 +33,7 @@
static char sccsid[] = "@(#)from: init.c 8.1 (Berkeley) 6/4/93";
#endif
static const char rcsid[] =
- "$FreeBSD: src/libexec/getty/init.c,v 1.16 2005/04/06 17:42:24 stefanf Exp $";
+ "$FreeBSD: stable/10/libexec/getty/init.c 262435 2014-02-24 08:21:49Z brueffer $";
#endif /* not lint */
/*
@@ -65,7 +61,7 @@
{ "et", &omode.c_cc[VEOF] }, /* eof chatacter (eot) */
{ "pc", nullstr }, /* pad character */
{ "tt" }, /* terminal type */
- { "ev" }, /* enviroment */
+ { "ev" }, /* environment */
{ "lo", loginprg }, /* login program */
{ "hn", hostname }, /* host name */
{ "he" }, /* host name edit */
Modified: trunk/libexec/getty/main.c
===================================================================
--- trunk/libexec/getty/main.c 2018-07-07 01:00:54 UTC (rev 11399)
+++ trunk/libexec/getty/main.c 2018-07-07 01:01:21 UTC (rev 11400)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/libexec/getty/main.c,v 1.3 2012/04/11 00:46:54 laffer1 Exp $ */
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
* 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
+ * 3. 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.
*
@@ -42,9 +38,9 @@
#if 0
static char sccsid[] = "@(#)from: main.c 8.1 (Berkeley) 6/20/93";
#endif
-static const char rcsid[] =
- "$FreeBSD: src/libexec/getty/main.c,v 1.47 2005/04/06 17:42:24 stefanf Exp $";
#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: stable/10/libexec/getty/main.c 262435 2014-02-24 08:21:49Z brueffer $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -196,7 +192,7 @@
gethostname(hostname, sizeof(hostname) - 1);
hostname[sizeof(hostname) - 1] = '\0';
if (hostname[0] == '\0')
- strcpy(hostname, "RedShirt");
+ strcpy(hostname, "Amnesiac");
/*
* Limit running time to deal with broken or dead lines.
Modified: trunk/libexec/getty/pathnames.h
===================================================================
--- trunk/libexec/getty/pathnames.h 2018-07-07 01:00:54 UTC (rev 11399)
+++ trunk/libexec/getty/pathnames.h 2018-07-07 01:01:21 UTC (rev 11400)
@@ -11,11 +11,7 @@
* 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
+ * 3. 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.
*
@@ -32,7 +28,7 @@
* SUCH DAMAGE.
*
* from: @(#)pathnames.h 8.1 (Berkeley) 6/4/93
- * $FreeBSD: src/libexec/getty/pathnames.h,v 1.7 1999/08/28 00:09:36 peter Exp $
+ * $FreeBSD: stable/10/libexec/getty/pathnames.h 262435 2014-02-24 08:21:49Z brueffer $
*/
#include <paths.h>
Modified: trunk/libexec/getty/subr.c
===================================================================
--- trunk/libexec/getty/subr.c 2018-07-07 01:00:54 UTC (rev 11399)
+++ trunk/libexec/getty/subr.c 2018-07-07 01:01:21 UTC (rev 11400)
@@ -11,11 +11,7 @@
* 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
+ * 3. 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.
*
@@ -37,15 +33,12 @@
static char sccsid[] = "@(#)from: subr.c 8.1 (Berkeley) 6/4/93";
#endif
static const char rcsid[] =
- "$FreeBSD: src/libexec/getty/subr.c,v 1.19 2004/06/25 10:11:28 phk Exp $";
+ "$FreeBSD: stable/10/libexec/getty/subr.c 282523 2015-05-06 09:38:44Z kib $";
#endif /* not lint */
/*
* Melbourne getty.
*/
-#ifdef DEBUG
-#include <stdio.h>
-#endif
#include <stdlib.h>
#include <string.h>
#include <termios.h>
@@ -165,17 +158,6 @@
fp->value = 1 ^ fp->invrt;
}
}
-
-#ifdef DEBUG
- printf("name=\"%s\", buf=\"%s\"\r\n", name, buf);
- for (sp = gettystrs; sp->field; sp++)
- printf("cgetstr: %s=%s\r\n", sp->field, sp->value);
- for (np = gettynums; np->field; np++)
- printf("cgetnum: %s=%d\r\n", np->field, np->value);
- for (fp = gettyflags; fp->field; fp++)
- printf("cgetflags: %s='%c' set='%c'\r\n", fp->field,
- fp->value + '0', fp->set + '0');
-#endif /* DEBUG */
}
void
Modified: trunk/libexec/getty/ttys.5
===================================================================
--- trunk/libexec/getty/ttys.5 2018-07-07 01:00:54 UTC (rev 11399)
+++ trunk/libexec/getty/ttys.5 2018-07-07 01:01:21 UTC (rev 11400)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 1985, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -9,11 +10,7 @@
.\" 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
+.\" 3. 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.
.\"
@@ -30,9 +27,8 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)ttys.5 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/libexec/getty/ttys.5,v 1.19 2007/07/24 06:41:06 delphij Exp $
-.\" $MidnightBSD: src/libexec/getty/ttys.5,v 1.3 2012/04/11 00:46:54 laffer1 Exp $
-.\"
+.\" $FreeBSD: stable/10/libexec/getty/ttys.5 267236 2014-06-08 17:50:07Z nwhitehorn $
+.\" "
.Dd May 27, 2005
.Dt TTYS 5
.Os
@@ -103,8 +99,11 @@
.Pp
As flag values, the strings ``on'' and ``off'' specify that
.Xr init 8
-should (should not) execute the command given in the second field,
-while ``secure'' (if ``on'' is also specified) allows users with a
+should (should not) execute the command given in the second field.
+``onifconsole'' will cause this line to be enabled if and only if it is
+an active kernel console device (it is equivalent to ``on'' in this
+case).
+The flag ``secure'' (if the console is enabled) allows users with a
uid of 0 to login on
this line.
The flag ``dialin'' indicates that a tty entry describes a dialin
Property changes on: trunk/libexec/getty/ttys.5
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list