|
 |
fa84285 |
From e9fd60840eb125dcd55aab859dd838a47c02931f Mon Sep 17 00:00:00 2001
|
|
|
fa84285 |
From: Jeremie Corbier <jeremie+debian@famille-corbier.net>
|
|
|
fa84285 |
Date: Tue, 6 Apr 2010 15:51:03 +0200
|
|
|
fa84285 |
Subject: [PATCH] Fix manpages
|
|
|
fa84285 |
|
|
|
fa84285 |
This patch fixes wide-dhcpv6 manpages (paths, typos, ...).
|
|
|
fa84285 |
|
|
|
fa84285 |
Signed-off-by: Jeremie Corbier <jeremie@famille-corbier.net>
|
|
|
fa84285 |
---
|
|
|
fa84285 |
dhcp6c.8 | 8 ++++----
|
|
|
fa84285 |
dhcp6c.conf.5 | 4 ++--
|
|
|
fa84285 |
dhcp6ctl.8 | 13 ++++++-------
|
|
|
fa84285 |
dhcp6relay.8 | 1 -
|
|
|
fa84285 |
dhcp6s.8 | 10 +++++-----
|
|
|
fa84285 |
dhcp6s.conf.5 | 2 +-
|
|
|
fa84285 |
6 files changed, 18 insertions(+), 20 deletions(-)
|
|
|
fa84285 |
|
|
|
fa84285 |
diff --git a/dhcp6c.8 b/dhcp6c.8
|
|
|
fa84285 |
index 6824ae0..1d69c9d 100644
|
|
|
fa84285 |
--- a/dhcp6c.8
|
|
|
fa84285 |
+++ b/dhcp6c.8
|
|
|
fa84285 |
@@ -114,13 +114,13 @@ In either case,
|
|
|
fa84285 |
will send DHCPv6 Release messages to release resources assigned from servers.
|
|
|
fa84285 |
.\"
|
|
|
fa84285 |
.Sh FILES
|
|
|
fa84285 |
-.Bl -tag -width /usr/local/etc/dhcp6c.conf -compact
|
|
|
fa84285 |
+.Bl -tag -width /etc/wide-dhcpv6/dhcp6c.conf -compact
|
|
|
fa84285 |
.It Pa /var/run/dhcp6c.pid
|
|
|
fa84285 |
is the default file that contains pid of the currently running
|
|
|
fa84285 |
.Nm dhcp6c .
|
|
|
fa84285 |
-.It Pa /usr/local/etc/dhcp6c.conf
|
|
|
fa84285 |
+.It Pa /etc/wide-dhcpv6/dhcp6c.conf
|
|
|
fa84285 |
is the default configuration file.
|
|
|
fa84285 |
-.It Pa /var/db/dhcp6c_duid
|
|
|
fa84285 |
+.It Pa /var/lib/dhcpv6/dhcp6c_duid
|
|
|
fa84285 |
is the file to store the client's DUID.
|
|
|
fa84285 |
.El
|
|
|
fa84285 |
.Sh Configuration Script
|
|
|
fa84285 |
@@ -203,6 +203,6 @@ command first appeared in WIDE/KAME IPv6 protocol stack kit.
|
|
|
fa84285 |
is incomplete and violates DHCPv6 protocol spec, in several aspects.
|
|
|
fa84285 |
In particular, temporary address assignment is intentionally omitted.
|
|
|
fa84285 |
.Pp
|
|
|
fa84285 |
-Information Refresh Time Option is not recognied in Info-req mode, since
|
|
|
fa84285 |
+Information Refresh Time Option is not recognized in Info-req mode, since
|
|
|
fa84285 |
.Nm
|
|
|
fa84285 |
terminates after it receives a REPLY message.
|
|
|
fa84285 |
diff --git a/dhcp6c.conf.5 b/dhcp6c.conf.5
|
|
|
fa84285 |
index 611ab4f..5fc03d3 100644
|
|
|
fa84285 |
--- a/dhcp6c.conf.5
|
|
|
fa84285 |
+++ b/dhcp6c.conf.5
|
|
|
fa84285 |
@@ -36,7 +36,7 @@
|
|
|
fa84285 |
.Nd DHCPv6 client configuration file
|
|
|
fa84285 |
.\"
|
|
|
fa84285 |
.Sh SYNOPSIS
|
|
|
fa84285 |
-.Pa /usr/local/etc/dhcp6c.conf
|
|
|
fa84285 |
+.Pa /etc/wide-dhcpv6/dhcp6c.conf
|
|
|
fa84285 |
.\"
|
|
|
fa84285 |
.Sh DESCRIPTION
|
|
|
fa84285 |
The
|
|
|
fa84285 |
@@ -630,7 +630,7 @@ execute the
|
|
|
fa84285 |
.Xr openssl 1
|
|
|
fa84285 |
command (when available) as follows,
|
|
|
fa84285 |
.Bd -literal -offset
|
|
|
fa84285 |
-% openssl rand -base64 16
|
|
|
fa84285 |
+% openssl rand \-base64 16
|
|
|
fa84285 |
.Ed
|
|
|
fa84285 |
.Pp
|
|
|
fa84285 |
and copy the output to the
|
|
|
fa84285 |
diff --git a/dhcp6ctl.8 b/dhcp6ctl.8
|
|
|
fa84285 |
index 86ea0e1..e11889b 100644
|
|
|
fa84285 |
--- a/dhcp6ctl.8
|
|
|
fa84285 |
+++ b/dhcp6ctl.8
|
|
|
fa84285 |
@@ -85,12 +85,11 @@ Use
|
|
|
fa84285 |
.Ar keyfile
|
|
|
fa84285 |
to provide the shared secret to communicate with the process.
|
|
|
fa84285 |
The default file name used when unspecified is
|
|
|
fa84285 |
-.Pa /usr/local/etc/dhcp6cctlkey
|
|
|
fa84285 |
+.Pa /etc/wide-dhcpv6/dhcp6cctlkey
|
|
|
fa84285 |
with a client,
|
|
|
fa84285 |
and
|
|
|
fa84285 |
-.Pa /usr/local/etc/dhcp6sctlkey
|
|
|
fa84285 |
+.Pa /etc/wide-dhcpv6/dhcp6sctlkey
|
|
|
fa84285 |
with a server.
|
|
|
fa84285 |
-
|
|
|
fa84285 |
.It Fl p Ar port
|
|
|
fa84285 |
Specify
|
|
|
fa84285 |
.Ar port
|
|
|
fa84285 |
@@ -99,7 +98,7 @@ The default port number used when unspecified is 5546 for a client,
|
|
|
fa84285 |
and 5547 for a server.
|
|
|
fa84285 |
.It Fl s Ar address
|
|
|
fa84285 |
Specify
|
|
|
fa84285 |
-.A address
|
|
|
fa84285 |
+.Ar address
|
|
|
fa84285 |
as the listening address of the process.
|
|
|
fa84285 |
The default address used when unspecified is ::1.
|
|
|
fa84285 |
.El
|
|
|
fa84285 |
@@ -183,10 +182,10 @@ information (if any) and exits.
|
|
|
fa84285 |
.El
|
|
|
fa84285 |
.\"
|
|
|
fa84285 |
.Sh FILES
|
|
|
fa84285 |
-.Bl -tag -width /usr/local/etc/dhcp6cctlkey -compact
|
|
|
fa84285 |
-.It Pa /usr/local/etc/dhcp6cctlkey
|
|
|
fa84285 |
+.Bl -tag -width /etc/wide-dhcpv6/dhcp6cctlkey -compact
|
|
|
fa84285 |
+.It Pa /etc/wide-dhcpv6/dhcp6cctlkey
|
|
|
fa84285 |
is the default key file to communicate with a client.
|
|
|
fa84285 |
-.It Pa /usr/local/etc/dhcp6sctlkey
|
|
|
fa84285 |
+.It Pa /etc/wide-dhcpv6/dhcp6sctlkey
|
|
|
fa84285 |
is the default key file to communicate with a server.
|
|
|
fa84285 |
.El
|
|
|
fa84285 |
.\"
|
|
|
fa84285 |
diff --git a/dhcp6relay.8 b/dhcp6relay.8
|
|
|
fa84285 |
index 4f761b0..7ad8ada 100644
|
|
|
fa84285 |
--- a/dhcp6relay.8
|
|
|
fa84285 |
+++ b/dhcp6relay.8
|
|
|
fa84285 |
@@ -107,7 +107,6 @@ to dump the process ID of
|
|
|
fa84285 |
is the default file that contains pid of the currently running
|
|
|
fa84285 |
.Nm .
|
|
|
fa84285 |
.El
|
|
|
fa84285 |
-
|
|
|
fa84285 |
.Sh SEE ALSO
|
|
|
fa84285 |
.Xr dhcp6c 8 ,
|
|
|
fa84285 |
.Xr dhcp6s 8
|
|
|
fa84285 |
diff --git a/dhcp6s.8 b/dhcp6s.8
|
|
|
fa84285 |
index 888117a..29dcc7b 100644
|
|
|
fa84285 |
--- a/dhcp6s.8
|
|
|
fa84285 |
+++ b/dhcp6s.8
|
|
|
fa84285 |
@@ -102,7 +102,7 @@ Use
|
|
|
fa84285 |
to store the shared secret to authenticate the communication with
|
|
|
fa84285 |
.Nm dhcp6ctl .
|
|
|
fa84285 |
The default file name used when unspecified is
|
|
|
fa84285 |
-.Pa /usr/local/etc/dhcp6sctlkey .
|
|
|
fa84285 |
+.Pa /etc/wide-dhcpv6/dhcp6sctlkey .
|
|
|
fa84285 |
The default name is intentionally same as that for
|
|
|
fa84285 |
.Nm dhcp6ctl
|
|
|
fa84285 |
so that the server and the control command can share the file when
|
|
|
fa84285 |
@@ -122,12 +122,12 @@ to dump the process ID of
|
|
|
fa84285 |
.El
|
|
|
fa84285 |
.\"
|
|
|
fa84285 |
.Sh FILES
|
|
|
fa84285 |
-.Bl -tag -width /usr/local/etc/dhcp6s.conf -compact
|
|
|
fa84285 |
-.It Pa /usr/local/etc/dhcp6s.conf
|
|
|
fa84285 |
+.Bl -tag -width /etc/wide-dhcpv6/dhcp6s.conf -compact
|
|
|
fa84285 |
+.It Pa /etc/wide-dhcpv6/dhcp6s.conf
|
|
|
fa84285 |
is the default configuration file.
|
|
|
fa84285 |
-.It Pa /var/db/dhcp6s_duid
|
|
|
fa84285 |
+.It Pa /var/lib/dhcpv6/dhcp6s_duid
|
|
|
fa84285 |
is the default file to store the server's DUID.
|
|
|
fa84285 |
-.It Pa /usr/local/etc/dhcp6sctlkey
|
|
|
fa84285 |
+.It Pa /etc/wide-dhcpv6/dhcp6sctlkey
|
|
|
fa84285 |
is the default key file to communicate with the control command.
|
|
|
fa84285 |
See
|
|
|
fa84285 |
.Xr dhcp6ctl 8
|
|
|
fa84285 |
diff --git a/dhcp6s.conf.5 b/dhcp6s.conf.5
|
|
|
fa84285 |
index 1206764..2cb08ce 100644
|
|
|
fa84285 |
--- a/dhcp6s.conf.5
|
|
|
fa84285 |
+++ b/dhcp6s.conf.5
|
|
|
fa84285 |
@@ -36,7 +36,7 @@
|
|
|
fa84285 |
.Nd DHCPv6 server configuration file
|
|
|
fa84285 |
.\"
|
|
|
fa84285 |
.Sh SYNOPSIS
|
|
|
fa84285 |
-.Pa /usr/local/etc/dhcp6s.conf
|
|
|
fa84285 |
+.Pa /etc/wide-dhcpv6/dhcp6s.conf
|
|
|
fa84285 |
.\"
|
|
|
fa84285 |
.Sh DESCRIPTION
|
|
|
fa84285 |
The
|
|
|
fa84285 |
--
|
|
|
fa84285 |
1.5.6.5
|
|
|
fa84285 |
|