diff options
| -rw-r--r-- | etc/Makefile | 4 | ||||
| -rw-r--r-- | etc/changelist | 3 | ||||
| -rw-r--r-- | etc/phones | 7 | ||||
| -rw-r--r-- | etc/remote | 20 | ||||
| -rw-r--r-- | share/man/man5/Makefile | 4 | ||||
| -rw-r--r-- | share/man/man5/phones.5 | 116 | ||||
| -rw-r--r-- | share/man/man5/remote.5 | 58 |
7 files changed, 9 insertions, 203 deletions
diff --git a/etc/Makefile b/etc/Makefile index 89e9f7d0f5f..972226291a3 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.289 2010/06/07 10:09:05 reyk Exp $ +# $OpenBSD: Makefile,v 1.290 2010/06/29 17:17:53 nicm Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -16,7 +16,7 @@ BINGRP= wheel BIN1= changelist ccd.conf csh.cshrc csh.login csh.logout daily dhcpd.conf \ exports ftpusers ftpchroot gettytab group hosts hosts.lpd inetd.conf \ ksh.kshrc locate.rc man.conf monthly motd mrouted.conf myname \ - netstart networks newsyslog.conf phones printcap protocols \ + netstart networks newsyslog.conf printcap protocols \ rbootd.conf rc rc.conf rc.local rc.securelevel rc.shutdown \ remote rpc security services shells syslog.conf weekly \ etc.${MACHINE}/disktab dhclient.conf mailer.conf ntpd.conf \ diff --git a/etc/changelist b/etc/changelist index 03ac02abad7..74b2d5b3726 100644 --- a/etc/changelist +++ b/etc/changelist @@ -1,4 +1,4 @@ -# $OpenBSD: changelist,v 1.67 2010/06/07 10:09:05 reyk Exp $ +# $OpenBSD: changelist,v 1.68 2010/06/29 17:17:53 nicm Exp $ # # List of files which the security script backs up and checks # for modifications. @@ -97,7 +97,6 @@ /etc/passwd /etc/pf.conf /etc/pf.os -/etc/phones /etc/portal.conf /etc/printcap /etc/profile diff --git a/etc/phones b/etc/phones deleted file mode 100644 index 94d4ba8c37e..00000000000 --- a/etc/phones +++ /dev/null @@ -1,7 +0,0 @@ -# $OpenBSD: phones,v 1.3 1996/09/20 21:00:35 deraadt Exp $ -# -# phones -- remote host phone number data base -# see tip(1), phones(5) -# examples: -#system1 9=2225551212 -#system2 9995551212 diff --git a/etc/remote b/etc/remote index 34f6f796072..f7a5b5ccefe 100644 --- a/etc/remote +++ b/etc/remote @@ -1,21 +1,18 @@ -# $OpenBSD: remote,v 1.11 2005/02/07 06:08:10 david Exp $ +# $OpenBSD: remote,v 1.12 2010/06/29 17:17:53 nicm Exp $ # from: @(#)remote 8.1 (Berkeley) 6/10/93 # # remote -- remote host description database -# see tip(1), cgetcap(3), phones(5), remote(5) +# see tip(1), cgetcap(3), remote(5) # # Capabilities used in examples: # -# at ACU type # br baud rate (defaults to 300) # dc direct connect -# du make a call flag (dial up) # dv device to use for the tty # el EOL marks (default is NULL) # ie input EOF marks (default is NULL) # oe output EOF string (default is NULL) # pa parity -# pn phone #, '\@' means use the phones(5) file # tc include the named system description # # Most OpenBSD architectures use /dev/tty00, /dev/cua00, etc. @@ -50,27 +47,14 @@ direct:\ :dc: -dialup:\ - :du:at=hayes:pn=\@: - doshost:\ :oe=^Z:tc=unixhost: unixhost:\ :pa=none:br#9600:el=^U^C^R^O^D^S^Q:ie=%$:oe=^D: -# Sample directly connected lines. Directly connected lines are -# most commonly used for serial consoles. -# tty00|For hp300,i386,mac68k,macppc,mvmeppc,vax:\ :dv=/dev/tty00:tc=direct:tc=unixhost: ttya|For sparc,mvme68k:\ :dv=/dev/ttya:tc=direct:tc=unixhost: - -# Sample dial out lines. -# -cua00|For hp300,i386,mac68k,macppc,mvmeppc,vax:\ - :dv=/dev/cua00:tc=dialup:tc=unixhost: -cuaa|For sparc,mvme68k:\ - :dv=/dev/cuaa:tc=dialup:tc=unixhost: diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index 98b5dd44896..f6bdd3c4700 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.42 2009/11/22 22:01:55 deraadt Exp $ +# $OpenBSD: Makefile,v 1.43 2010/06/29 17:17:53 nicm Exp $ # $NetBSD: Makefile,v 1.14 1995/05/11 23:13:15 cgd Exp $ # missing: dump.5 plot.5 @@ -8,7 +8,7 @@ MAN= a.out.5 acct.5 bsd.port.mk.5 bsd.regress.mk.5 changelist.5 core.5 \ forward.5 fs.5 fstab.5 genassym.cf.5 group.5 hostname.if.5 \ hosts.equiv.5 hosts.5 intro.5 link.5 login.conf.5 mixerctl.conf.5 \ mk.conf.5 moduli.5 motd.5 myname.5 netgroup.5 networks.5 passwd.5 \ - pf.conf.5 pf.os.5 phones.5 port-modules.5 printcap.5 protocols.5 \ + pf.conf.5 pf.os.5 port-modules.5 printcap.5 protocols.5 \ remote.5 resolv.conf.5 rpc.5 services.5 shells.5 stab.5 spamd.conf.5 \ sysctl.conf.5 utmp.5 wsconsctl.conf.5 diff --git a/share/man/man5/phones.5 b/share/man/man5/phones.5 deleted file mode 100644 index f036f616a6b..00000000000 --- a/share/man/man5/phones.5 +++ /dev/null @@ -1,116 +0,0 @@ -.\" $OpenBSD: phones.5,v 1.11 2007/05/31 19:19:58 jmc Exp $ -.\" $NetBSD: phones.5,v 1.3 1994/11/30 19:31:25 jtc Exp $ -.\" -.\" Copyright (c) 1983, 1991, 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. 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. -.\" -.\" @(#)phones.5 8.1 (Berkeley) 6/5/93 -.\" -.Dd $Mdocdate: May 31 2007 $ -.Dt PHONES 5 -.Os -.Sh NAME -.Nm phones -.Nd remote host phone number file -.Sh DESCRIPTION -.Nm -files are used by -.Xr tip 1 -to find phone numbers not included in the -.Xr remote 5 -database(s) being used. -.Pp -The default file is -.Pa /etc/phones , -which is used unless the -.Ev PHONES -environment variable has been set. -.Pa /etc/phones -is world readable by default, and should -.Em not -contain privileged information. -.Pp -The format of the file is a series of lines of the form: -.Pp -.D1 Li <system name>[\ \et]*<phone number> -.Pp -The system name must start at the first character on the line. -The phone number is any sequence of characters terminated by a -.Ql \&, -or the end of the line. -Thus the phone number field can contain arbitrary dialing strings, not -just phone numbers. -.Pp -Certain auto-call units or modems can use -.Ql \&, -in their dialing strings. -For these units (currently Hayes, Courier and Telebit) -.Xr tip 1 -will translate a -.Ql \&= -in the phone number to a -.Ql \&, -when actually dialing the number. -.Pp -If the auto-call unit is a Racal-Vadic 831, -.Xr tip 1 -will translate a -.Ql \&_ -in the phone number to a -.Ql \&= . -.Pp -.Xr tip 1 -ignores all lines with a system name other than the one being -looked up. -Comments can be inserted into the file by making the first character -on a line something not used to start any system name in the -.Xr remote 5 -database(s) being used, such as -.Ql # . -.Pp -Only one phone number per line is permitted. -To associate more than one phone number with a system name you must -create multiple lines that have the same system name. -.Xr tip 1 -will try each number in sequence until it makes a connection or -reaches the end of the file. -.Sh FILES -.Bl -tag -width /etc/phones -compact -.It Pa /etc/phones -The default -.Nm -file for -.Xr tip 1 . -.El -.Sh SEE ALSO -.Xr tip 1 , -.Xr remote 5 -.Sh HISTORY -The -.Nm -file appeared in -.Bx 4.2 . diff --git a/share/man/man5/remote.5 b/share/man/man5/remote.5 index 6d40b33ffd9..69df4454347 100644 --- a/share/man/man5/remote.5 +++ b/share/man/man5/remote.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: remote.5,v 1.21 2009/10/22 09:22:46 sobrado Exp $ +.\" $OpenBSD: remote.5,v 1.22 2010/06/29 17:17:53 nicm Exp $ .\" $NetBSD: remote.5,v 1.4 1997/04/20 00:05:27 mellon Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)remote.5 8.1 (Berkeley) 6/5/93 .\" -.Dd $Mdocdate: October 22 2009 $ +.Dd $Mdocdate: June 29 2010 $ .Dt REMOTE 5 .Os .Sh NAME @@ -100,9 +100,6 @@ for example, .Dq xa#99 . A boolean capability is specified by simply listing the capability. .Bl -tag -width indent -.It Sy \&at -(str) -Auto call unit type. .It Sy \&be (bool) Initialize the @@ -123,12 +120,6 @@ The default baud rate is 300 baud. An initial connection message to be sent to the remote host. For example, if a host is reached through port selector, this might be set to the appropriate sequence required to switch to the host. -.It Sy \&cu -(str) -Call unit if making a phone call. -Default is the same as the -.Sy dv -field. .It Sy \&dc (bool) This host is directly connected, and @@ -138,9 +129,6 @@ carrier detect drops. .It Sy \&di (str) Disconnect message sent to the host when a disconnect is requested by the user. -.It Sy \&du -(bool) -This host is on a dial-up line. .It Sy \&dv (str) .Tn UNIX @@ -274,38 +262,6 @@ or .Dq one (always set bit 8 to 1). The default is no parity. -.It Sy \&pn -(str) -Telephone number(s) for this host. -Either a list of arbitrary dialing strings separated by -commas, or a -.Ql @ . -An at sign, -.Ql @ , -tells -.Xr tip 1 -to search the -.Xr phones 5 -database for the list of telephone numbers. -.Pp -For modems or auto-call units that use a -.Ql \&, -in their dialing strings (hayes, courier, t3000) -.Xr tip 1 -will convert any -.Ql \&= -in the string to a -.Ql \&, -when dialing. -For modems or auto-call units that use a -.Ql \&= -in their dial strings, (v831), -.Xr tip 1 -will convert any -.Ql \&_ -to a -.Ql \&= -when dialing. .It Sy \&pr (str) Character that indicates end-of-line on the remote host. @@ -382,15 +338,6 @@ to .Sy on , so that verbose mode will be turned on. .El -.Pp -Here is a short example showing the use of the capability continuation -feature: -.Bd -literal -offset indent -UNIX-1200:\e -:dv=/dev/cau0:el=^D^U^C^S^Q^O@:du:at=ventel:ie=#$%:oe=^D:br#1200: -arpavax|ax:\e -:pn=7654321%:tc=UNIX-1200 -.Ed .Sh FILES .Bl -tag -width /etc/remote -compact .It Pa /etc/remote @@ -398,7 +345,6 @@ Global database. .El .Sh SEE ALSO .Xr tip 1 , -.Xr phones 5 .Sh HISTORY The .Nm |