summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2015-11-30 17:03:07 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2015-11-30 17:03:07 +0000
commitb0c7c04861827626ca0c8bb81ece585b174d4076 (patch)
treec4b3c2a0aebacbb711565c1987c85eb712495d83 /usr.sbin
parente22ab36ca63cc43fe3c3d2502e265383e718baf0 (diff)
change Xrs from now-defunct db(3) to dbopen(3); this wasn;t a
straight replace: thanks both to schwarze and maja for feedback on how to rewrite parts; i've snuck in an rcs id->openbsd id change in dev_mkdb too;
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/dev_mkdb/dev_mkdb.811
-rw-r--r--usr.sbin/netgroup_mkdb/netgroup_mkdb.810
-rw-r--r--usr.sbin/pwd_mkdb/pwd_mkdb.810
-rw-r--r--usr.sbin/smtpd/table.514
-rw-r--r--usr.sbin/ypserv/makedbm/makedbm.812
-rw-r--r--usr.sbin/ypserv/ypinit/Makefile.yp.811
-rw-r--r--usr.sbin/ypserv/yppush/yppush.88
-rw-r--r--usr.sbin/ypserv/ypserv/ypserv.813
8 files changed, 39 insertions, 50 deletions
diff --git a/usr.sbin/dev_mkdb/dev_mkdb.8 b/usr.sbin/dev_mkdb/dev_mkdb.8
index 26b93bce05c..2d082a613fe 100644
--- a/usr.sbin/dev_mkdb/dev_mkdb.8
+++ b/usr.sbin/dev_mkdb/dev_mkdb.8
@@ -1,3 +1,5 @@
+.\" $OpenBSD: dev_mkdb.8,v 1.8 2015/11/30 17:03:05 jmc Exp $
+.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -26,9 +28,8 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)dev_mkdb.8 8.1 (Berkeley) 6/6/93
-.\" $Id: dev_mkdb.8,v 1.7 2015/09/10 15:16:44 schwarze Exp $
.\"
-.Dd $Mdocdate: September 10 2015 $
+.Dd $Mdocdate: November 30 2015 $
.Dt DEV_MKDB 8
.Os
.Sh NAME
@@ -40,8 +41,8 @@
The
.Nm
command creates a
-.Xr db 3
-hash access method database in
+.Xr hash 3
+access method Berkeley database in
.Dq Pa /var/run/dev.db
which contains the names of all of the character and block special
files in the
@@ -70,7 +71,7 @@ database file
.Sh SEE ALSO
.Xr ps 1 ,
.Xr stat 2 ,
-.Xr db 3 ,
+.Xr dbopen 3 ,
.Xr devname 3 ,
.Xr kvm_nlist 3 ,
.Xr ttyname 3 ,
diff --git a/usr.sbin/netgroup_mkdb/netgroup_mkdb.8 b/usr.sbin/netgroup_mkdb/netgroup_mkdb.8
index 4b56555aba2..bb9b2ac531a 100644
--- a/usr.sbin/netgroup_mkdb/netgroup_mkdb.8
+++ b/usr.sbin/netgroup_mkdb/netgroup_mkdb.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: netgroup_mkdb.8,v 1.7 2007/05/31 19:20:26 jmc Exp $
+.\" $OpenBSD: netgroup_mkdb.8,v 1.8 2015/11/30 17:03:05 jmc Exp $
.\"
.\" Copyright (c) 1994 Christos Zoulas
.\" All rights reserved.
@@ -28,7 +28,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: November 30 2015 $
.Dt NETGROUP_MKDB 8
.Os
.Sh NAME
@@ -40,9 +40,7 @@
.Op Ar file
.Sh DESCRIPTION
.Nm netgroup_mkdb
-creates
-.Xr db 3
-style databases for the specified
+creates Berkeley databases for the specified
.Ar file .
If no file is specified,
.Pa /etc/netgroup
@@ -73,7 +71,7 @@ a temporary file
current netgroup file
.El
.Sh SEE ALSO
-.Xr db 3 ,
+.Xr dbopen 3 ,
.Xr getnetgrent 3 ,
.Xr netgroup 5
.Sh BUGS
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.8 b/usr.sbin/pwd_mkdb/pwd_mkdb.8
index 9026a14fe8b..1f9a12f912e 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.8
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pwd_mkdb.8,v 1.23 2014/01/20 05:07:48 schwarze Exp $
+.\" $OpenBSD: pwd_mkdb.8,v 1.24 2015/11/30 17:03:05 jmc Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" from: @(#)pwd_mkdb.8 8.1 (Berkeley) 6/6/93
.\"
-.Dd $Mdocdate: January 20 2014 $
+.Dd $Mdocdate: November 30 2015 $
.Dt PWD_MKDB 8
.Os
.Sh NAME
@@ -44,9 +44,7 @@
.Ar file
.Sh DESCRIPTION
.Nm
-creates
-.Xr db 3
-style secure and insecure databases for the specified file.
+creates a pair of Berkeley databases for the specified file.
These databases are then installed into
.Pa /etc/spwd.db
and
@@ -140,7 +138,7 @@ temporary file
.Sh SEE ALSO
.Xr chpass 1 ,
.Xr passwd 1 ,
-.Xr db 3 ,
+.Xr dbopen 3 ,
.Xr getpwent 3 ,
.Xr passwd 5 ,
.Xr vipw 8
diff --git a/usr.sbin/smtpd/table.5 b/usr.sbin/smtpd/table.5
index 334690e5456..e76d356a148 100644
--- a/usr.sbin/smtpd/table.5
+++ b/usr.sbin/smtpd/table.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: table.5,v 1.4 2014/02/04 16:32:36 eric Exp $
+.\" $OpenBSD: table.5,v 1.5 2015/11/30 17:03:05 jmc Exp $
.\"
.\" Copyright (c) 2013 Eric Faurot <eric@openbsd.org>
.\" Copyright (c) 2013 Gilles Chehade <gilles@poolp.org>
@@ -16,7 +16,7 @@
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.\"
-.Dd $Mdocdate: February 4 2014 $
+.Dd $Mdocdate: November 30 2015 $
.Dt TABLE 5
.Os
.Sh NAME
@@ -56,17 +56,13 @@ key2 value2
key3 value3
.Ed
.Pp
-A file table can be converted to a
-.Xr db 3
-database using the
+A file table can be converted to a Berkeley database using the
.Xr makemap 8
utility with no syntax change.
.Pp
Tables using a
.Ql file
-or
-.Xr db 3
-backend will be referenced as follows:
+or Berkeley DB backend will be referenced as follows:
.Bd -literal -offset indent
table name file:/path/to/file
table name db:/path/to/file.db
@@ -114,7 +110,7 @@ For
.Ql static ,
.Ql file
and
-.Xr db 3
+.Xr dbopen 3
backends, a wildcard may be used so the domain table may contain:
.Bd -literal -offset indent
example.org
diff --git a/usr.sbin/ypserv/makedbm/makedbm.8 b/usr.sbin/ypserv/makedbm/makedbm.8
index fd09027af1b..b6289ee84f6 100644
--- a/usr.sbin/ypserv/makedbm/makedbm.8
+++ b/usr.sbin/ypserv/makedbm/makedbm.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: makedbm.8,v 1.18 2013/07/16 11:13:34 schwarze Exp $
+.\" $OpenBSD: makedbm.8,v 1.19 2015/11/30 17:03:05 jmc Exp $
.\"
.\" Copyright (c) 1994-97 Mats O Jansson <moj@stacken.kth.se>
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: November 30 2015 $
.Dt MAKEDBM 8
.Os
.Sh NAME
@@ -78,14 +78,14 @@ that the YP map is going to be handled as secure.
.It Fl U
Same as
.Fl u
-but also try
-.Xr db 3
-hash format.
+but also try the
+.Xr hash 3
+format.
.It Fl u
Dump a database to standard output.
.El
.Sh SEE ALSO
-.Xr db 3 ,
+.Xr dbopen 3 ,
.Xr Makefile.yp 8 ,
.Xr yp 8 ,
.Xr ypserv 8 ,
diff --git a/usr.sbin/ypserv/ypinit/Makefile.yp.8 b/usr.sbin/ypserv/ypinit/Makefile.yp.8
index a3d640206c9..afbb22d50d9 100644
--- a/usr.sbin/ypserv/ypinit/Makefile.yp.8
+++ b/usr.sbin/ypserv/ypinit/Makefile.yp.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: Makefile.yp.8,v 1.7 2015/11/29 15:20:46 rpe Exp $
+.\" $OpenBSD: Makefile.yp.8,v 1.8 2015/11/30 17:03:05 jmc Exp $
.\"
.\" Copyright (c) 2008 Ingo Schwarze <schwarze@usta.de>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: November 29 2015 $
+.Dd $Mdocdate: November 30 2015 $
.Dt MAKEFILE.YP 8
.Os
.Sh NAME
@@ -67,9 +67,8 @@ To regenerate all maps for one single domain, run
in the respective domain subdirectory.
The
.Xr makedbm 8
-utility will be used to create the maps in
-.Xr db 3
-format, and they will be stored inside the appropriate domain subdirectory.
+utility will be used to create the maps in Berkeley DB format,
+and they will be stored inside the appropriate domain subdirectory.
.Pp
Whenever a YP map has been updated, it is automatically distributed to all
slave servers in the respective domain using the
@@ -279,7 +278,7 @@ Cookies controlling the operation of
.El
.Sh SEE ALSO
.Xr make 1 ,
-.Xr db 3 ,
+.Xr dbopen 3 ,
.Xr makedbm 8 ,
.Xr yp 8 ,
.Xr ypinit 8 ,
diff --git a/usr.sbin/ypserv/yppush/yppush.8 b/usr.sbin/ypserv/yppush/yppush.8
index 8d3ce32a57e..4e2e53d60cd 100644
--- a/usr.sbin/ypserv/yppush/yppush.8
+++ b/usr.sbin/ypserv/yppush/yppush.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: yppush.8,v 1.17 2015/10/09 10:13:48 jmc Exp $
+.\" $OpenBSD: yppush.8,v 1.18 2015/11/30 17:03:06 jmc Exp $
.\"
.\" Copyright (c) 1995 Mats O Jansson <moj@stacken.kth.se>
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: October 9 2015 $
+.Dd $Mdocdate: November 30 2015 $
.Dt YPPUSH 8
.Os
.Sh NAME
@@ -46,8 +46,7 @@ slave servers in the domain.
All servers of the domain are fetched from the YP map
.Pa ypservers .
Before starting distribution, the master server is told to reread its
-.Xr db 3
-map files from disk.
+Berkeley DB map files from disk.
.Pp
The options are as follows:
.Bl -tag -width Ds
@@ -66,6 +65,7 @@ Verbose.
Announce what the program is doing.
.El
.Sh SEE ALSO
+.Xr dbopen 3 ,
.Xr Makefile.yp 8 ,
.Xr yp 8 ,
.Xr ypserv 8
diff --git a/usr.sbin/ypserv/ypserv/ypserv.8 b/usr.sbin/ypserv/ypserv/ypserv.8
index d9d4671e738..11dc16876ab 100644
--- a/usr.sbin/ypserv/ypserv/ypserv.8
+++ b/usr.sbin/ypserv/ypserv/ypserv.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ypserv.8,v 1.28 2015/10/28 10:02:59 jmc Exp $
+.\" $OpenBSD: ypserv.8,v 1.29 2015/11/30 17:03:06 jmc Exp $
.\"
.\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: October 28 2015 $
+.Dd $Mdocdate: November 30 2015 $
.Dt YPSERV 8
.Os
.Sh NAME
@@ -40,9 +40,7 @@ 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.
.Pp
-A YP map is stored on the server as a
-.Xr db 3
-database.
+A YP map is stored on the server as a Berkeley database.
A number of YP maps are grouped together in a domain.
.Nm
determines the domains it serves by looking for a directory with
@@ -91,9 +89,7 @@ On receipt of a hangup signal,
.Dv SIGHUP ,
.Nm
will reopen the log file and reread its configuration,
-including both the
-.Xr db 3
-map files and the
+including both the map files and the
.Xr ypserv.acl 5
or
.Xr securenet 5
@@ -135,6 +131,7 @@ or
.It Pa /var/yp/securenet
.El
.Sh SEE ALSO
+.Xr dbopen 3 ,
.Xr securenet 5 ,
.Xr ypserv.acl 5 ,
.Xr Makefile.yp 8 ,