From ac647185507cee04ed058df5199466e53f59e9cf Mon Sep 17 00:00:00 2001 From: lukem Date: Thu, 2 Oct 1997 14:16:12 +0000 Subject: [PATCH] - build common/* once, into a library, rather than recompiling each of the files multiple times in the other subdirectories (saves about 10% on compilation time) - clean up the manual pages --- usr.sbin/ypserv/Makefile | 5 +- usr.sbin/ypserv/Makefile.inc | 11 +++- usr.sbin/ypserv/common/Makefile | 11 ++++ usr.sbin/ypserv/makedbm/Makefile | 6 +-- usr.sbin/ypserv/makedbm/makedbm.8 | 32 ++++++------ usr.sbin/ypserv/mknetid/Makefile | 6 +-- usr.sbin/ypserv/mknetid/mknetid.8 | 52 ++++++++++--------- usr.sbin/ypserv/mknetid/netid.5 | 21 ++++---- usr.sbin/ypserv/stdethers/Makefile | 6 +-- usr.sbin/ypserv/stdethers/stdethers.8 | 15 ++++-- usr.sbin/ypserv/stdhosts/Makefile | 6 +-- usr.sbin/ypserv/stdhosts/stdhosts.8 | 19 ++++--- usr.sbin/ypserv/ypinit/ypinit.8 | 6 +-- usr.sbin/ypserv/yppush/Makefile | 8 +-- usr.sbin/ypserv/yppush/yppush.8 | 6 +-- usr.sbin/ypserv/ypserv/Makefile | 9 ++-- usr.sbin/ypserv/ypserv/securenet.5 | 18 +++---- usr.sbin/ypserv/ypserv/ypserv.8 | 30 +++++------ usr.sbin/ypserv/ypserv/ypserv.acl.5 | 74 +++++++++++---------------- usr.sbin/ypserv/yptest/Makefile | 3 +- usr.sbin/ypserv/yptest/yptest.8 | 6 +-- usr.sbin/ypserv/ypxfr/Makefile | 7 +-- usr.sbin/ypserv/ypxfr/ypxfr.8 | 20 ++++---- 23 files changed, 181 insertions(+), 196 deletions(-) create mode 100644 usr.sbin/ypserv/common/Makefile diff --git a/usr.sbin/ypserv/Makefile b/usr.sbin/ypserv/Makefile index a980298198ad..db2b4e20d1b3 100644 --- a/usr.sbin/ypserv/Makefile +++ b/usr.sbin/ypserv/Makefile @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.1.1.1 1996/08/09 10:14:50 thorpej Exp $ +# $NetBSD: Makefile,v 1.2 1997/10/02 14:16:12 lukem Exp $ -SUBDIR= makedbm mknetid stdethers stdhosts ypinit ypserv yptest yppush ypxfr +SUBDIR= common makedbm mknetid stdethers stdhosts ypinit yppush ypserv yptest \ + ypxfr .include diff --git a/usr.sbin/ypserv/Makefile.inc b/usr.sbin/ypserv/Makefile.inc index 14b5b19aa18b..f082ed9aaca1 100644 --- a/usr.sbin/ypserv/Makefile.inc +++ b/usr.sbin/ypserv/Makefile.inc @@ -1,3 +1,10 @@ -# $NetBSD: Makefile.inc,v 1.1.1.1 1996/08/09 10:14:49 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.2 1997/10/02 14:16:14 lukem Exp $ -BINDIR?= /usr/sbin +LIBCOMMON != cd ${.CURDIR}/../common;\ + printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f- +CFLAGS+=-I${.CURDIR}/../common +DPADD+= ${LIBCOMMON}/libcommon.a +LDADD+= -L${LIBCOMMON} -lcommon + +BINDIR?=/usr/sbin +WARNS?= 1 diff --git a/usr.sbin/ypserv/common/Makefile b/usr.sbin/ypserv/common/Makefile new file mode 100644 index 000000000000..62d227af974c --- /dev/null +++ b/usr.sbin/ypserv/common/Makefile @@ -0,0 +1,11 @@ +# $NetBSD: Makefile,v 1.1 1997/10/02 14:16:17 lukem Exp $ + +LIB= common +SRCS= localhostname.c read_line.c ypdb.c yplib_host.c yplog.c ypresp_xdr.c + +NOPROFILE= noprofile +NOPIC= nopic + +.include +LDADD= +DPADD= diff --git a/usr.sbin/ypserv/makedbm/Makefile b/usr.sbin/ypserv/makedbm/Makefile index 4287db0c92ca..80d171c8e4d4 100644 --- a/usr.sbin/ypserv/makedbm/Makefile +++ b/usr.sbin/ypserv/makedbm/Makefile @@ -1,10 +1,6 @@ -# $NetBSD: Makefile,v 1.4 1997/07/18 21:57:04 thorpej Exp $ +# $NetBSD: Makefile,v 1.5 1997/10/02 14:16:19 lukem Exp $ PROG= makedbm -SRCS= localhostname.c makedbm.c read_line.c ypdb.c MAN= makedbm.8 -.PATH: ${.CURDIR}/../common -CFLAGS+=-I${.CURDIR}/../common -WARNS=1 .include diff --git a/usr.sbin/ypserv/makedbm/makedbm.8 b/usr.sbin/ypserv/makedbm/makedbm.8 index b68c029a04be..213e0784f8dd 100644 --- a/usr.sbin/ypserv/makedbm/makedbm.8 +++ b/usr.sbin/ypserv/makedbm/makedbm.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: makedbm.8,v 1.1.1.1 1996/08/09 10:14:54 thorpej Exp $ +.\" $NetBSD: makedbm.8,v 1.2 1997/10/02 14:16:21 lukem Exp $ .\" .\" Copyright (c) 1994 Mats O Jansson .\" All rights reserved. @@ -36,19 +36,19 @@ .Nm makedbm .Nd create a YP database .Sh SYNOPSIS -.Nm makedbm +.Nm .Op Fl u Ar file -.Nm /usr/sbin/makedbm +.Nm makedbm .Op Fl bls -.Op Fl i Ar yp_input_file -.Op Fl o Ar yp_output_file .Op Fl d Ar yp_domain_name +.Op Fl i Ar yp_input_file .Op Fl m Ar yp_master_name +.Op Fl o Ar yp_output_file .Ar infile .Ar outfile .Sh DESCRIPTION -.Nm Makedbm -is the utiliy in YP that creates the +.Nm +is the utility in YP that creates the .Xr db 3 database file containing the YP map. .Pp @@ -68,22 +68,22 @@ Secure map. Include an entry in the database informing and .Xr ypserv 8 that the YP map is going to be handled as secure. -.It Fl i Ar yp_input_file -Include an entry the in the map with the key YP_INPUT_FILE and the argument -as value. -.It Fl o Ar yp_output_file -Include an entry the in the map with the key YP_OUTPUT_FILE and the argument -as value. .It Fl d Ar yp_domain_name -Include an entry the in the map with the key YP_DOMAIN_NAME and the argument +Include an entry in the map with the key YP_DOMAIN_NAME and the argument +as value. +.It Fl i Ar yp_input_file +Include an entry in the map with the key YP_INPUT_FILE and the argument as value. .It Fl m Ar yp_master_name -Include an entry the in the map with the key YP_MASTER_NAME and the argument +Include an entry in the map with the key YP_MASTER_NAME and the argument +as value. +.It Fl o Ar yp_output_file +Include an entry in the map with the key YP_OUTPUT_FILE and the argument as value. .El .Sh SEE ALSO -.Xr yp 8 , .Xr db 3 , +.Xr yp 8 , .Xr ypxfr 8 , .Xr ypserv 8 .Sh AUTHOR diff --git a/usr.sbin/ypserv/mknetid/Makefile b/usr.sbin/ypserv/mknetid/Makefile index e33788a52608..6659de428ea1 100644 --- a/usr.sbin/ypserv/mknetid/Makefile +++ b/usr.sbin/ypserv/mknetid/Makefile @@ -1,10 +1,6 @@ -# $NetBSD: Makefile,v 1.4 1997/07/18 21:57:06 thorpej Exp $ +# $NetBSD: Makefile,v 1.5 1997/10/02 14:16:23 lukem Exp $ PROG= mknetid -SRCS= mknetid.c read_line.c MAN= mknetid.8 netid.5 -.PATH: ${.CURDIR}/../common -CFLAGS+=-I${.CURDIR}/../common -WARNS=1 .include diff --git a/usr.sbin/ypserv/mknetid/mknetid.8 b/usr.sbin/ypserv/mknetid/mknetid.8 index 0e71f957a4e6..265c808a8f0a 100644 --- a/usr.sbin/ypserv/mknetid/mknetid.8 +++ b/usr.sbin/ypserv/mknetid/mknetid.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: mknetid.8,v 1.1.1.1 1996/08/09 10:14:55 thorpej Exp $ +.\" $NetBSD: mknetid.8,v 1.2 1997/10/02 14:16:25 lukem Exp $ .\" .\" Copyright (c) 1996 Mats O Jansson .\" All rights reserved. @@ -36,7 +36,7 @@ .Nm mknetid .Nd a YP filter program .Sh SYNOPSIS -.Nm mknetid +.Nm .Op Fl d Ar domain .Op Fl q .Op Fl p Ar passwdfile @@ -44,7 +44,7 @@ .Op Fl h Ar hostfile .Op Fl m Ar netidfile .Sh DESCRIPTION -.Nm Mknetid +.Nm is used to create a map named .Ar netid.byname . The map consists of information from @@ -57,44 +57,48 @@ eventually concatenated with a file. .Pp The options are as follows: -.Bl -tag -width indent +.Bl -tag -width "-p passwdfile" .It Fl d Ar domain -Which yp-domain if not default yp-domain. -.It Fl q -Keep quiet about multipy occuraces of a uid. Ignore all but the first. -.It Fl p Ar passwdfile -Alternate -.Xr passwd 5 -file. Default is -.Nm /etc/passwd . +YP domain to use instead of the default. .It Fl g Ar groupfile Alternate .Xr group 5 -file. Default is -.Nm /etc/group . +file. +Default is +.Pa /etc/group . .It Fl h Ar hostfile Alternate -.Xr hosts 5 Default is -.Nm /etc/hosts . -file +.Xr hosts 5 +file. +Default is +.Pa /etc/hosts . .It Fl m Ar netidfile Alternate -.Xr netid 5 Default is -.Nm /etc/netid . +.Xr netid 5 file. +Default is +.Pa /etc/netid . +.It Fl p Ar passwdfile +Alternate +.Xr passwd 5 +file. +Default is +.Pa /etc/passwd . +.It Fl q +Keep quiet about multiple occurrences of a uid; ignore all but the first. .El .Sh FILES -.Bl -tag -width /etc/passwd -compact -.It Pa /etc/passwd +.Bl -tag -width "/etc/passwd" -compact .It Pa /etc/group .It Pa /etc/hosts .It Pa /etc/netid +.It Pa /etc/passwd .El .Sh SEE ALSO -.Xr yp 8 -.Xr passwd 5 , .Xr group 5 , .Xr hosts 5 , -.Xr netid 5 +.Xr netid 5 , +.Xr passwd 5 , +.Xr yp 8 .Sh AUTHOR Mats O Jansson diff --git a/usr.sbin/ypserv/mknetid/netid.5 b/usr.sbin/ypserv/mknetid/netid.5 index 4283f7a86a32..6e85b32c3bb0 100644 --- a/usr.sbin/ypserv/mknetid/netid.5 +++ b/usr.sbin/ypserv/mknetid/netid.5 @@ -1,4 +1,4 @@ -.\" $NetBSD: netid.5,v 1.1.1.1 1996/08/09 10:14:55 thorpej Exp $ +.\" $NetBSD: netid.5,v 1.2 1997/10/02 14:16:29 lukem Exp $ .\" .\" Copyright (c) 1996 Mats O Jansson .\" All rights reserved. @@ -35,19 +35,16 @@ .Sh NAME .Nm netid .Nd -.Nm YP -network credential file +YP network credential file .Sh DESCRIPTION Files in -.Nm netid -format is rare. One lives in the -.Nm YP -map -.Nm netid.byname . +.Nm +format are rare. One lives in the YP map +.Pa netid.byname . The format is rather simple. Each row consists of two items, a key and a value. When created by .Xr mknetid 8 -there is three kind of records. +there are three kind of records. .Pp The first type is information about which gids a uid has: .Bd -literal @@ -72,11 +69,11 @@ unix.jodie@kaka 0:jodie .Sh FILES .Bl -tag -width /etc/netid -compact .It Pa /etc/netid -A file for lines not generated automatic by +A file for lines not generated automatically by .Xr mknetid 8 . .El .Sh SEE ALSO -.Xr yp 8 , -.Xr mknetid 8 +.Xr mknetid 8 , +.Xr yp 8 .Sh AUTHOR Mats O Jansson diff --git a/usr.sbin/ypserv/stdethers/Makefile b/usr.sbin/ypserv/stdethers/Makefile index 340c3f179c16..32adf3025960 100644 --- a/usr.sbin/ypserv/stdethers/Makefile +++ b/usr.sbin/ypserv/stdethers/Makefile @@ -1,11 +1,7 @@ -# $NetBSD: Makefile,v 1.4 1997/07/18 21:57:08 thorpej Exp $ +# $NetBSD: Makefile,v 1.5 1997/10/02 14:16:31 lukem Exp $ PROG= stdethers -SRCS= read_line.c stdethers.c MAN= stdethers.8 -.PATH: ${.CURDIR}/../common -CFLAGS+=-I${.CURDIR}/../common CFLAGS+= -DNTOA_FIX -WARNS=1 .include diff --git a/usr.sbin/ypserv/stdethers/stdethers.8 b/usr.sbin/ypserv/stdethers/stdethers.8 index 229701a96bd8..4d9675c58d40 100644 --- a/usr.sbin/ypserv/stdethers/stdethers.8 +++ b/usr.sbin/ypserv/stdethers/stdethers.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: stdethers.8,v 1.1.1.1 1996/08/09 10:14:56 thorpej Exp $ +.\" $NetBSD: stdethers.8,v 1.2 1997/10/02 14:16:33 lukem Exp $ .\" .\" Copyright (c) 1995 Mats O Jansson .\" All rights reserved. @@ -36,13 +36,18 @@ .Nm stdethers .Nd a YP filter program .Sh SYNOPSIS -.Nm stdethers +.Nm .Op Ar file .Sh DESCRIPTION -.Nm Stdethers -is used to get ride of some unwanted information in file or stdin. This -program is used by YP when creating some YP maps. +.Nm +parses the +.Xr ethers 5 +style input stream (stdin, or +.Ar file +if given), and outputs lines containing only the MAC address and host name. .Pp +.Nm +is used by other YP programs when creating some of the YP maps. .Pp The options are as follows: .Bl -tag -width indent diff --git a/usr.sbin/ypserv/stdhosts/Makefile b/usr.sbin/ypserv/stdhosts/Makefile index 0c2743db4470..7e7086de7a1d 100644 --- a/usr.sbin/ypserv/stdhosts/Makefile +++ b/usr.sbin/ypserv/stdhosts/Makefile @@ -1,10 +1,6 @@ -# $NetBSD: Makefile,v 1.4 1997/07/18 21:57:09 thorpej Exp $ +# $NetBSD: Makefile,v 1.5 1997/10/02 14:16:35 lukem Exp $ PROG= stdhosts -SRCS= read_line.c stdhosts.c MAN= stdhosts.8 -.PATH: ${.CURDIR}/../common -CFLAGS+=-I${.CURDIR}/../common -WARNS=1 .include diff --git a/usr.sbin/ypserv/stdhosts/stdhosts.8 b/usr.sbin/ypserv/stdhosts/stdhosts.8 index 56bdbe0d8bf4..f6e98c622fc1 100644 --- a/usr.sbin/ypserv/stdhosts/stdhosts.8 +++ b/usr.sbin/ypserv/stdhosts/stdhosts.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: stdhosts.8,v 1.1.1.1 1996/08/09 10:14:58 thorpej Exp $ +.\" $NetBSD: stdhosts.8,v 1.2 1997/10/02 14:16:37 lukem Exp $ .\" .\" Copyright (c) 1994 Mats O Jansson .\" All rights reserved. @@ -13,7 +13,7 @@ .\" 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 Mats O Jansson +.\" This product includes software developed by Mats O Jansson .\" 4. The name of the author may not be used to endorse or promote products .\" derived from this software without specific prior written permission. .\" @@ -29,20 +29,25 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 25, 1994 +.Dd August 24, 1994 .Dt STDHOSTS 8 .Os .Sh NAME .Nm stdhosts .Nd a YP filter program .Sh SYNOPSIS -.Nm stdhosts +.Nm .Op Ar file .Sh DESCRIPTION -.Nm Stdhosts -is used to get ride of some unwanted information in file or stdin. This -program is used by YP when creating some YP maps. +.Nm +parses the +.Xr hosts 5 +style input stream (stdin, or +.Ar file +if given), and outputs lines containing only the IP address and host name. .Pp +.Nm +is used by other YP programs when creating some of the YP maps. .Pp The options are as follows: .Bl -tag -width indent diff --git a/usr.sbin/ypserv/ypinit/ypinit.8 b/usr.sbin/ypserv/ypinit/ypinit.8 index 2bf0dae2ed44..f126792d89c3 100644 --- a/usr.sbin/ypserv/ypinit/ypinit.8 +++ b/usr.sbin/ypserv/ypinit/ypinit.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: ypinit.8,v 1.2 1997/07/30 22:55:12 jtc Exp $ +.\" $NetBSD: ypinit.8,v 1.3 1997/10/02 14:16:40 lukem Exp $ .\" .\" Copyright (c) 1997 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -41,7 +41,7 @@ .Nm ypinit .Nd initialise YP system .Sh SYNOPSIS -.Nm ypinit +.Nm .Fl m .Op Ar domainname .Nm ypinit @@ -49,7 +49,7 @@ .Ar master_server .Op Ar domainname .Sh DESCRIPTION -.Nm Ypinit +.Nm initialises the directories that hold the maps for a YP domain on a YP server. .Pp diff --git a/usr.sbin/ypserv/yppush/Makefile b/usr.sbin/ypserv/yppush/Makefile index 4b9827d88598..52e826a56a62 100644 --- a/usr.sbin/ypserv/yppush/Makefile +++ b/usr.sbin/ypserv/yppush/Makefile @@ -1,11 +1,7 @@ -# $NetBSD: Makefile,v 1.4 1997/07/18 21:57:11 thorpej Exp $ +# $NetBSD: Makefile,v 1.5 1997/10/02 14:16:42 lukem Exp $ PROG= yppush -SRCS= localhostname.c yppush.c yplib_host.c yppush_svc.c yppush_proc.c \ - ypdb.c yppush_err.c +SRCS= yppush.c yppush_err.c yppush_proc.c yppush_svc.c MAN= yppush.8 -.PATH: ${.CURDIR}/../common ${.CURDIR}/../ypserv -CFLAGS+=-I${.CURDIR}/../common -WARNS=1 .include diff --git a/usr.sbin/ypserv/yppush/yppush.8 b/usr.sbin/ypserv/yppush/yppush.8 index 5df4a17d81d9..1e76020942c2 100644 --- a/usr.sbin/ypserv/yppush/yppush.8 +++ b/usr.sbin/ypserv/yppush/yppush.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: yppush.8,v 1.1.1.1 1996/08/09 10:15:00 thorpej Exp $ +.\" $NetBSD: yppush.8,v 1.2 1997/10/02 14:16:44 lukem Exp $ .\" .\" Copyright (c) 1995 Mats O Jansson .\" All rights reserved. @@ -36,13 +36,13 @@ .Nm yppush .Nd force distribution of YP map .Sh SYNOPSIS -.Nm yppush +.Nm .Op Fl d Ar domainname .Op Fl h Ar hostname .Op Fl v .Ar mapname .Sh DESCRIPTION -.Nm yppush +.Nm is used to distribute an YP map from a master server to any slave server in the domain. All servers of domain is featch from the YP map ypservers. diff --git a/usr.sbin/ypserv/ypserv/Makefile b/usr.sbin/ypserv/ypserv/Makefile index 53555b0bc71a..a4cb8246f31e 100644 --- a/usr.sbin/ypserv/ypserv/Makefile +++ b/usr.sbin/ypserv/ypserv/Makefile @@ -1,13 +1,10 @@ -# $NetBSD: Makefile,v 1.5 1997/07/18 21:57:16 thorpej Exp $ +# $NetBSD: Makefile,v 1.6 1997/10/02 14:16:46 lukem Exp $ PROG= ypserv -SRCS= acl.c gram.c scan.c ypserv.c ypserv_proc.c ypserv_db.c yplog.c \ - ypdb.c ypserv_xdr.c ypresp_xdr.c +SRCS= acl.c gram.c scan.c ypserv.c ypserv_proc.c ypserv_db.c ypserv_xdr.c MAN= ypserv.acl.5 securenet.5 ypserv.8 -.PATH: ${.CURDIR}/../common -CFLAGS+=-I. -I${.CURDIR}/../common +CFLAGS+=-I. CPPFLAGS+=-DYY_NO_UNPUT -WARNS=1 CLEANFILES+= gram.c scan.c y.tab.h diff --git a/usr.sbin/ypserv/ypserv/securenet.5 b/usr.sbin/ypserv/ypserv/securenet.5 index 1d7aabd37c0f..56816cdd4f54 100644 --- a/usr.sbin/ypserv/ypserv/securenet.5 +++ b/usr.sbin/ypserv/ypserv/securenet.5 @@ -1,4 +1,4 @@ -.\" $NetBSD: securenet.5,v 1.1.1.1 1996/08/09 10:15:03 thorpej Exp $ +.\" $NetBSD: securenet.5,v 1.2 1997/10/02 14:16:48 lukem Exp $ .\" .\" Copyright (c) 1994 Mats O Jansson .\" All rights reserved. @@ -39,10 +39,8 @@ configuration file for secure networks .Sh DESCRIPTION The -.Nm securenet -file controls which hosts can connect to the -.Nm YP -server. +.Nm +file controls which hosts can connect to the YP server. .Pp The format is rather simple. Each row consists of two items. The first item is the network mask. The second item is the network. @@ -63,12 +61,10 @@ A configuration file. .El .Sh SEE ALSO +.Xr ypserv.acl 5 , .Xr yp 8 , -.Xr ypserv 8 , -.Xr ypserv.acl 5 +.Xr ypserv 8 .Sh HISTORY The -.Nm securenet -was added to -.Nm NIS -by Sun Microsystems, Inc. as a bugfix for weak security. +.Nm +file was added to YP by Sun Microsystems, Inc. as a bugfix for weak security. diff --git a/usr.sbin/ypserv/ypserv/ypserv.8 b/usr.sbin/ypserv/ypserv/ypserv.8 index 8ddde227c01f..0a3173cde110 100644 --- a/usr.sbin/ypserv/ypserv/ypserv.8 +++ b/usr.sbin/ypserv/ypserv/ypserv.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: ypserv.8,v 1.2 1997/01/05 09:49:07 cjs Exp $ +.\" $NetBSD: ypserv.8,v 1.3 1997/10/02 14:16:50 lukem Exp $ .\" .\" Copyright (c) 1994 Mats O Jansson .\" All rights reserved. @@ -36,12 +36,12 @@ .Nm ypserv .Nd YP server daemon .Sh SYNOPSIS -.Nm ypserv +.Nm .Op Fl a Ar aclfile .Op Fl d .Op Fl x .Sh DESCRIPTION -.Nm Ypserv +.Nm is a fundamental part of the network information system called YP. This server provides information from YP maps to the YP clients on the network. @@ -49,7 +49,7 @@ on the network. A YP map is stored on the server as a .Xr db 3 database. A number of YP maps is grouped together in a domain. -.Ar Ypserv +.Nm determines the domains it serves by looking for a directory with the domain name in .Ar /var/yp . @@ -72,16 +72,17 @@ the argument to .Fl a (use full path). .Pp -The file used can be reread by sending a SIGHUP to ypserv. The process pid +The file used can be reread by sending a SIGHUP to +.Nm "" . +The process pid can be found in the file -.Nm /var/run/ypserv.pid -. +.Pa /var/run/ypserv.pid . .Pp If a host isn't secure all queries to the server will result in a YP_NODOM result. .Pp IF the file -.Nm /var/yp/ypserv.log +.Pa /var/yp/ypserv.log exists then messages will be written to the file. .Pp The options are as follows: @@ -93,7 +94,7 @@ Use another file with another file format. For futher information see man page for .Ar ypserv.acl . .It Fl d -Use Internet Domain Name System. If a query to map +Use internet Domain Name System. If a query to map .Ar hosts.byname or .Ar hosts.byaddr @@ -111,15 +112,14 @@ or .It Pa /var/run/ypserv.pid .El .Sh SEE ALSO -.Xr yp 8 , -.Xr ypserv.acl 5 , +.Xr ypbind 1 , .Xr securenet 5 , -.Xr ypinit 8 , -.Xr ypbind 1 +.Xr ypserv.acl 5 , +.Xr yp 8 , +.Xr ypinit 8 .Sh AUTHOR This implementation of -.Nm ypserv +.Nm was originally written by Mats O Jansson . The access control list code was later re-written from scratch by Jason R. Thorpe . - diff --git a/usr.sbin/ypserv/ypserv/ypserv.acl.5 b/usr.sbin/ypserv/ypserv/ypserv.acl.5 index a739012dcb8a..f20b5e8dee10 100644 --- a/usr.sbin/ypserv/ypserv/ypserv.acl.5 +++ b/usr.sbin/ypserv/ypserv/ypserv.acl.5 @@ -1,4 +1,4 @@ -.\" $NetBSD: ypserv.acl.5,v 1.1.1.1 1996/08/09 10:15:03 thorpej Exp $ +.\" $NetBSD: ypserv.acl.5,v 1.2 1997/10/02 14:16:52 lukem Exp $ .\" .\" Copyright (c) 1994 Mats O Jansson .\" All rights reserved. @@ -39,78 +39,64 @@ configuration file .Sh DESCRIPTION The -.Nm ypserv.acl -file controls which hosts can connect to the -.Nm YP -server. +.Nm +file controls which hosts can connect to the YP server. .Pp The format is more complex than the format for .Xr securenet 5 . The first two verbs on each line controls if the line will -.Nm allow +.Em allow or -.Nm deny +.Em deny access for a -.Nm host , +.Em host , network -.Nm (net) +.Em (net) or -.Nm all +.Em all hosts. .Pp -The -.Nm YP -server reads the configuration file and build a list in memory. This list -is processed from the beginning for every incomming request. As soon a -match is found in the list the search terminates and it returns success -or failure depending on -.Nm allow +The YP server reads the configuration file and build a list in memory. +This list is processed from the beginning for every incomming request. +As soon a match is found in the list the search terminates and it +returns success or failure depending on +.Em allow or -.Nm deny . +.Em deny . If no match was found in the list success is returned. .Pp If access is denied every call will cause a -.Nm no such domain +.Dq no such domain error for the caller. .Pp There is no default name for this file. Start .Nm ypserv with a -.Ar -a filename +.Fl a Ar filename to read a file with this format. .Pp The following different syntax can be used: .Pp -< -.Nm allow|deny -> -.Nm host -< -.Nm hostname|ip-address -> +.Aq Em allow|deny +.Em host +.Aq Em hostname|ip-address .Pp If -.Nm hostname +.Em hostname has more than one ip address then all will be added to the list. .Pp -< -.Nm allow|deny -> -.Nm net -< -.Nm netname|netnumber -> -.Op Nm netmask +.Aq Em allow|deny +.Em net +.Aq Em netname|netnumber +.Op Em netmask Aq netname|netnumber .Pp -If -.Nm netmask +If the +.Em netmask part of the command isn't given then the netmask will be assumed to be a class A, B or C net depending on the net number. .Pp -< -.Nm allow|deny -> -.Nm all +.Aq Em allow|deny +.Em all .Pp A line containing one of these commands will always match any host. .Sh EXAMPLES @@ -170,8 +156,8 @@ A configuration file. .El .Sh SEE ALSO +.Xr securenet 5 , .Xr yp 8 , -.Xr ypserv 8 , -.Xr securenet 5 +.Xr ypserv 8 .Sh AUTHOR Mats O Jansson diff --git a/usr.sbin/ypserv/yptest/Makefile b/usr.sbin/ypserv/yptest/Makefile index d1bdb86e327a..42d3e46a6a16 100644 --- a/usr.sbin/ypserv/yptest/Makefile +++ b/usr.sbin/ypserv/yptest/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.2 1997/07/18 21:57:22 thorpej Exp $ +# $NetBSD: Makefile,v 1.3 1997/10/02 14:16:55 lukem Exp $ PROG= yptest MAN= yptest.8 -WARNS=1 .include diff --git a/usr.sbin/ypserv/yptest/yptest.8 b/usr.sbin/ypserv/yptest/yptest.8 index 8451158cb65e..122069f6e84f 100644 --- a/usr.sbin/ypserv/yptest/yptest.8 +++ b/usr.sbin/ypserv/yptest/yptest.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: yptest.8,v 1.1.1.1 1996/08/09 10:15:05 thorpej Exp $ +.\" $NetBSD: yptest.8,v 1.2 1997/10/02 14:16:56 lukem Exp $ .\" .\" Copyright (c) 1994 Mats O Jansson .\" All rights reserved. @@ -36,9 +36,9 @@ .Nm yptest .Nd calls different YP routines .Sh SYNOPSIS -.Nm yptest +.Nm .Sh DESCRIPTION -.Nm Yptest +.Nm is a utility written to check if the YP server works as expected. .Pp .Sh SEE ALSO diff --git a/usr.sbin/ypserv/ypxfr/Makefile b/usr.sbin/ypserv/ypxfr/Makefile index f5a6542bc480..e89511517fc3 100644 --- a/usr.sbin/ypserv/ypxfr/Makefile +++ b/usr.sbin/ypserv/ypxfr/Makefile @@ -1,10 +1,7 @@ -# $NetBSD: Makefile,v 1.4 1997/07/18 21:57:23 thorpej Exp $ +# $NetBSD: Makefile,v 1.5 1997/10/02 14:17:00 lukem Exp $ PROG= ypxfr -SRCS= ypxfr.c ypdb.c yplog.c yplib_host.c ypresp_xdr.c +SRCS= ypxfr.c MAN= ypxfr.8 -.PATH: ${.CURDIR}/../common -CFLAGS+=-I${.CURDIR}/../common -WARNS=1 .include diff --git a/usr.sbin/ypserv/ypxfr/ypxfr.8 b/usr.sbin/ypserv/ypxfr/ypxfr.8 index e77b56d77db2..70a32b8dff2a 100644 --- a/usr.sbin/ypserv/ypxfr/ypxfr.8 +++ b/usr.sbin/ypserv/ypxfr/ypxfr.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: ypxfr.8,v 1.1.1.1 1996/08/09 10:15:06 thorpej Exp $ +.\" $NetBSD: ypxfr.8,v 1.2 1997/10/02 14:17:02 lukem Exp $ .\" .\" Copyright (c) 1994 Mats O Jansson .\" All rights reserved. @@ -36,16 +36,16 @@ .Nm ypxfr .Nd get a YP map from YP server .Sh SYNOPSIS -.Nm ypxfr +.Nm .Op Fl bcf +.Op Fl C Ar tid prog ipadd port .Op Fl d Ar domain .Op Fl h Ar host .Op Fl s Ar domain -.Op Fl C Ar tid prog ipadd port .Ar mapname .Sh DESCRIPTION -.Nm ypxfr -is the utiliy in YP that transfers maps to the local host. +.Nm +is the utility in YP that transfers maps to the local host. .Pp .Pp The options are as follows: @@ -57,17 +57,17 @@ effect on the two maps hosts.byname and hosts.byaddr. .It Fl c Don't send a "Clear current map" to local ypserv process. Useful if ypserv isn't running localy to avoid timeout message. -.It Fl f -Force map transfer, even if version of master is older than local copy. +.It Fl C Ar tid prog ipadd port +This option is only used by ypserv. This is to open communication with +an yppush on another host. .It Fl d Ar domain Don't use default domain, use the specifiyed domain. +.It Fl f +Force map transfer, even if version of master is older than local copy. .It Fl h Ar host Get map from host insteed of the maps master host. .It Fl s Ar domain Specify a source domain other than the target domain. -.It Fl C Ar tid prog ipadd port -This option is only used by ypserv. This is to open communication with -an yppush on another host. .El .Sh SEE ALSO .Xr yp 8 ,