[src/trunk]: src/crypto/dist/heimdal Do not work around ancient groff limits ...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d7b8de8b197d
branches:  trunk
changeset: 748149:d7b8de8b197d
user:      joerg <joerg%NetBSD.org@localhost>
date:      Wed Oct 14 23:37:33 2009 +0000

description:
Do not work around ancient groff limits with .Xo/.Xc.

diffstat:

 crypto/dist/heimdal/admin/ktutil.8        |  100 ++++++------------------
 crypto/dist/heimdal/kadmin/kadmin.8       |  123 +++++++++--------------------
 crypto/dist/heimdal/kadmin/kadmind.8      |   31 +-----
 crypto/dist/heimdal/kcm/kcm.8             |   87 ++++----------------
 crypto/dist/heimdal/kdc/hprop.8           |   63 +++-----------
 crypto/dist/heimdal/kdc/hpropd.8          |   31 +-----
 crypto/dist/heimdal/kdc/kdc.8             |   55 +++----------
 crypto/dist/heimdal/kdc/kstash.8          |   24 +----
 crypto/dist/heimdal/kdc/string2key.8      |   45 ++--------
 crypto/dist/heimdal/kpasswd/kpasswdd.8    |   29 +-----
 crypto/dist/heimdal/kuser/kgetcred.1      |   28 +-----
 crypto/dist/heimdal/kuser/kimpersonate.1  |   82 ++++---------------
 crypto/dist/heimdal/kuser/kinit.1         |   94 ++++------------------
 crypto/dist/heimdal/kuser/klist.1         |   33 +------
 crypto/dist/heimdal/lib/kadm5/iprop-log.8 |   61 +++-----------
 crypto/dist/heimdal/lib/kadm5/iprop.8     |   77 ++++--------------
 16 files changed, 232 insertions(+), 731 deletions(-)

diffs (truncated from 1693 to 300 lines):

diff -r 446fd5144d52 -r d7b8de8b197d crypto/dist/heimdal/admin/ktutil.8
--- a/crypto/dist/heimdal/admin/ktutil.8        Wed Oct 14 23:36:55 2009 +0000
+++ b/crypto/dist/heimdal/admin/ktutil.8        Wed Oct 14 23:37:33 2009 +0000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE. 
 .\" 
 .\" $Heimdal: ktutil.8 14792 2005-04-14 16:43:57Z lha $
-.\" $NetBSD: ktutil.8,v 1.8 2008/03/22 08:36:49 mlelstv Exp $
+.\" $NetBSD: ktutil.8,v 1.9 2009/10/14 23:37:33 joerg Exp $
 .\"
 .Dd April 14, 2005
 .Dt KTUTIL 8
@@ -54,72 +54,43 @@
 is a program for managing keytabs.
 Supported options:
 .Bl -tag -width Ds
-.It Xo
-.Fl v ,
-.Fl -verbose
-.Xc
+.It Fl v , Fl -verbose
 Verbose output.
 .El
 .Pp
 .Ar command
 can be one of the following:
-.Bl -tag -width srvconvert
-.It add Xo
-.Op Fl p Ar principal
-.Op Fl -principal= Ns Ar principal
-.Op Fl V Ar kvno
-.Op Fl -kvno= Ns Ar kvno
-.Op Fl e Ar enctype
-.Op Fl -enctype= Ns Ar enctype
-.Op Fl w Ar password
-.Op Fl -password= Ns Ar password
-.Op Fl r
-.Op Fl -random
-.Op Fl s
-.Op Fl -no-salt
-.Op Fl H
-.Op Fl -hex
-.Xc
+.Bl -tag -width srvconvert -width srvconvert
+.It add Oo Fl p Ar principal Oc Oo Fl -principal= Ns Ar principal Oc \
+Oo Fl V Ar kvno Oc Oo Fl -kvno= Ns Ar kvno Oc Oo Fl e Ar enctype Oc \
+Oo Fl -enctype= Ns Ar enctype Oc Oo Fl w Ar password Oc \
+Oo Fl -password= Ns Ar password Oc Oo Fl r Oc Oo Fl -random Oc \
+Oo Fl s Oc Oo Fl -no-salt Oc Oo Fl H Oc Op Fl -hex
 Adds a key to the keytab. Options that are not specified will be
 prompted for. This requires that you know the password or the hex key of the
 principal to add; if what you really want is to add a new principal to
 the keytab, you should consider the
 .Ar get
 command, which talks to the kadmin server.
-.It change Xo
-.Op Fl r Ar realm
-.Op Fl -realm= Ns Ar realm
-.Op Fl -a Ar host
-.Op Fl -admin-server= Ns Ar host
-.Op Fl -s Ar port
-.Op Fl -server-port= Ns Ar port
-.Xc
+.It change Oo Fl r Ar realm Oc Oo Fl -realm= Ns Ar realm Oc \
+Oo Fl -a Ar host Oc Oo Fl -admin-server= Ns Ar host Oc \
+Oo Fl -s Ar port Oc Op Fl -server-port= Ns Ar port
 Update one or several keys to new versions.  By default, use the admin
 server for the realm of a keytab entry.  Otherwise it will use the
 values specified by the options.
 .Pp
 If no principals are given, all the ones in the keytab are updated.
-.It copy Xo
-.Ar keytab-src
-.Ar keytab-dest
-.Xc
+.It copy Ar keytab-src Ar keytab-dest
 Copies all the entries from
 .Ar keytab-src
 to
 .Ar keytab-dest .
-.It get Xo
-.Op Fl p Ar admin principal
-.Op Fl -principal= Ns Ar admin principal
-.Op Fl e Ar enctype
-.Op Fl -enctypes= Ns Ar enctype
-.Op Fl r Ar realm
-.Op Fl -realm= Ns Ar realm
-.Op Fl a Ar admin server
-.Op Fl -admin-server= Ns Ar admin server
-.Op Fl s Ar server port
-.Op Fl -server-port= Ns Ar server port
-.Ar principal ...
-.Xc
+.It get Oo Fl p Ar admin principal Oc \
+Oo Fl -principal= Ns Ar admin principal Oc Oo Fl e Ar enctype Oc \
+Oo Fl -enctypes= Ns Ar enctype Oc Oo Fl r Ar realm Oc \
+Oo Fl -realm= Ns Ar realm Oc Oo Fl a Ar admin server Oc \
+Oo Fl -admin-server= Ns Ar admin server Oc Oo Fl s Ar server port Oc \
+Oo Fl -server-port= Ns Ar server port Oc Ar principal ...
 For each
 .Ar principal ,
 generate a new key for it (creating it if it doesn't already exist),
@@ -129,44 +100,28 @@
 .Ar realm
 is specified, the realm to operate on is taken from the first
 principal.
-.It list Xo
-.Op Fl -keys
-.Op Fl -timestamp
-.Xc
+.It list Oo Fl -keys Oc Op Fl -timestamp
 List the keys stored in the keytab.
-.It remove Xo
-.Op Fl p Ar principal
-.Op Fl -principal= Ns Ar principal
-.Op Fl V kvno
-.Op Fl -kvno= Ns Ar kvno
-.Op Fl e enctype
-.Op Fl -enctype= Ns Ar enctype
-.Xc
+.It remove Oo Fl p Ar principal Oc Oo Fl -principal= Ns Ar principal Oc \
+Oo Fl V kvno Oc Oo Fl -kvno= Ns Ar kvno Oc Oo Fl e enctype Oc \
+Oo Fl -enctype= Ns Ar enctype Oc
 Removes the specified key or keys. Not specifying a
 .Ar kvno
 removes keys with any version number. Not specifying an
 .Ar enctype
 removes keys of any type.
-.It rename Xo
-.Ar from-principal
-.Ar to-principal
-.Xc
+.It rename Ar from-principal Ar to-principal
 Renames all entries in the keytab that match the
 .Ar from-principal
 to
 .Ar to-principal .
-.It purge Xo
-.Op Fl -age= Ns Ar age
-.Xc
+.It purge Op Fl -age= Ns Ar age
 Removes all old versions of a key for which there is a newer version
 that is at least
 .Ar age
 (default one week) old.
 .It srvconvert
-.It srv2keytab Xo
-.Op Fl s Ar srvtab
-.Op Fl -srvtab= Ns Ar srvtab
-.Xc
+.It srv2keytab Oo Fl s Ar srvtab Oc Op Fl -srvtab= Ns Ar srvtab
 Converts the version 4 srvtab in
 .Ar srvtab
 to a version 5 keytab and stores it in
@@ -178,10 +133,7 @@
 .Ar keytab
 .Ed
 .It srvcreate
-.It key2srvtab Xo
-.Op Fl s Ar srvtab
-.Op Fl -srvtab= Ns Ar srvtab
-.Xc
+.It key2srvtab Oo Fl s Ar srvtab Oc Op Fl -srvtab= Ns Ar srvtab
 Converts the version 5 keytab in
 .Ar keytab
 to a version 4 srvtab and stores it in
diff -r 446fd5144d52 -r d7b8de8b197d crypto/dist/heimdal/kadmin/kadmin.8
--- a/crypto/dist/heimdal/kadmin/kadmin.8       Wed Oct 14 23:36:55 2009 +0000
+++ b/crypto/dist/heimdal/kadmin/kadmin.8       Wed Oct 14 23:37:33 2009 +0000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $Heimdal: kadmin.8 21739 2007-07-31 15:55:32Z lha $
-.\" $NetBSD: kadmin.8,v 1.9 2008/03/22 08:37:02 mlelstv Exp $
+.\" $NetBSD: kadmin.8,v 1.10 2009/10/14 23:37:33 joerg Exp $
 .\"
 .Dd Feb  22, 2007
 .Dt KADMIN 8
@@ -41,34 +41,13 @@
 .Sh SYNOPSIS
 .Nm
 .Bk -words
-.Oo Fl p Ar string \*(Ba Xo
-.Fl -principal= Ns Ar string
-.Xc
-.Oc
-.Oo Fl K Ar string \*(Ba Xo
-.Fl -keytab= Ns Ar string
-.Xc
-.Oc
-.Oo Fl c Ar file \*(Ba Xo
-.Fl -config-file= Ns Ar file
-.Xc
-.Oc
-.Oo Fl k Ar file \*(Ba Xo
-.Fl -key-file= Ns Ar file
-.Xc
-.Oc
-.Oo Fl r Ar realm \*(Ba Xo
-.Fl -realm= Ns Ar realm
-.Xc
-.Oc
-.Oo Fl a Ar host \*(Ba Xo
-.Fl -admin-server= Ns Ar host
-.Xc
-.Oc
-.Oo Fl s Ar port number \*(Ba Xo
-.Fl -server-port= Ns Ar port number
-.Xc
-.Oc
+.Op Fl p Ar string \*(Ba Fl -principal= Ns Ar string
+.Op Fl K Ar string \*(Ba Fl -keytab= Ns Ar string
+.Op Fl c Ar file \*(Ba Fl -config-file= Ns Ar file
+.Op Fl k Ar file \*(Ba Fl -key-file= Ns Ar file
+.Op Fl r Ar realm \*(Ba Fl -realm= Ns Ar realm
+.Op Fl a Ar host \*(Ba Fl -admin-server= Ns Ar host
+.Op Fl s Ar port number \*(Ba Fl -server-port= Ns Ar port number
 .Op Fl l | Fl -local
 .Op Fl h | Fl -help
 .Op Fl v | Fl -version
@@ -85,45 +64,21 @@
 .Pp
 Supported options:
 .Bl -tag -width Ds
-.It Xo
-.Fl p Ar string ,
-.Fl -principal= Ns Ar string
-.Xc
+.It Fl p Ar string , Fl -principal= Ns Ar string
 principal to authenticate as
-.It Xo
-.Fl K Ar string ,
-.Fl -keytab= Ns Ar string
-.Xc
+.It Fl K Ar string , Fl -keytab= Ns Ar string
 keytab for authentication principal
-.It Xo
-.Fl c Ar file ,
-.Fl -config-file= Ns Ar file
-.Xc
+.It Fl c Ar file , Fl -config-file= Ns Ar file
 location of config file
-.It Xo
-.Fl k Ar file ,
-.Fl -key-file= Ns Ar file
-.Xc
+.It Fl k Ar file , Fl -key-file= Ns Ar file
 location of master key file
-.It Xo
-.Fl r Ar realm ,
-.Fl -realm= Ns Ar realm
-.Xc
+.It Fl r Ar realm , Fl -realm= Ns Ar realm
 realm to use
-.It Xo
-.Fl a Ar host ,
-.Fl -admin-server= Ns Ar host
-.Xc
+.It Fl a Ar host , Fl -admin-server= Ns Ar host
 server to contact
-.It Xo
-.Fl s Ar port number ,
-.Fl -server-port= Ns Ar port number
-.Xc
+.It Fl s Ar port number , Fl -server-port= Ns Ar port number
 port to use
-.It Xo
-.Fl l ,
-.Fl -local
-.Xc
+.It Fl l , Fl -local
 local admin mode
 .El
 .Pp
@@ -145,14 +100,12 @@
 Commands include:
 .\" not using a list here, since groff apparently gets confused
 .\" with nested Xo/Xc
-.Bd -ragged -offset indent
+.Bl -item -offset indent
+.It
 .Nm add
 .Op Fl r | Fl -random-key
 .Op Fl -random-password
-.Oo Fl p Ar string \*(Ba Xo
-.Fl -password= Ns Ar string
-.Xc
-.Oc
+.Op Fl p Ar string \*(Ba Fl -password= Ns Ar string
 .Op Fl -key= Ns Ar string
 .Op Fl -max-ticket-life= Ns Ar lifetime
 .Op Fl -max-renewable-life= Ns Ar lifetime
@@ -165,7 +118,7 @@
 Adds a new principal to the database. The options not passed on the
 command line will be promped for.
 .Ed
-.Pp
+.It
 .Nm add_enctype
 .Op Fl r | Fl -random-key