3f47a21
Change the absolute paths included in the man pages so that the correct
3f47a21
values can be dropped in by config.status.  After applying this patch,
3f47a21
these files should be renamed to their ".in" counterparts, and then the
2f5b672
configure scripts should be rebuilt.  RT#6525
eb5ae8d
3f47a21
Index: configure.in
3f47a21
===================================================================
eb5ae8d
--- configure.in	(revision 22425)
3f47a21
+++ configure.in	(working copy)
eb5ae8d
@@ -1043,6 +1043,16 @@
3c8f555
 KRB5_WITH_PAM
3f47a21
 
3f47a21
 AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config])
3f47a21
+
eb5ae8d
+V5_AC_OUTPUT_MANPAGE([
3f47a21
+	appl/sample/sserver/sserver.M
3f47a21
+	config-files/kdc.conf.M
3f47a21
+	config-files/krb5.conf.M
3f47a21
+	kadmin/cli/kadmin.M
3f47a21
+	slave/kpropd.M
3f47a21
+	slave/kprop.M
3f47a21
+])
3f47a21
+
3f47a21
 V5_AC_OUTPUT_MAKEFILE(.
3f47a21
 
3f47a21
 	util util/support util/profile util/send-pr
046244f
Index: appl/gssftp/configure.in
046244f
===================================================================
eb5ae8d
--- appl/gssftp/configure.in	(revision 22425)
046244f
+++ appl/gssftp/configure.in	(working copy)
eb5ae8d
@@ -65,4 +65,9 @@
046244f
 dnl
046244f
 dnl
046244f
 KRB5_BUILD_PROGRAM
046244f
+
eb5ae8d
+V5_AC_OUTPUT_MANPAGE([
eb5ae8d
+	ftpd/ftpd.M
eb5ae8d
+])
eb5ae8d
+
eb5ae8d
 V5_AC_OUTPUT_MAKEFILE(. ftp ftpd)
eb5ae8d
Index: appl/bsd/configure.in
eb5ae8d
===================================================================
eb5ae8d
--- appl/bsd/configure.in	(revision 22425)
eb5ae8d
+++ appl/bsd/configure.in	(working copy)
eb5ae8d
@@ -156,4 +156,10 @@
eb5ae8d
 
eb5ae8d
 KRB5_AC_LIBUTIL
eb5ae8d
 KRB5_BUILD_PROGRAM
eb5ae8d
+
eb5ae8d
+V5_AC_OUTPUT_MANPAGE([
eb5ae8d
+	klogind.M
eb5ae8d
+	kshd.M
eb5ae8d
+])
eb5ae8d
+
eb5ae8d
 V5_AC_OUTPUT_MAKEFILE
eb5ae8d
Index: appl/telnet/configure.in
eb5ae8d
===================================================================
eb5ae8d
--- appl/telnet/configure.in	(revision 22425)
eb5ae8d
+++ appl/telnet/configure.in	(working copy)
eb5ae8d
@@ -161,4 +161,9 @@
eb5ae8d
 LIBS="$old_LIBS"
eb5ae8d
 dnl
eb5ae8d
 KRB5_AC_LIBUTIL
eb5ae8d
+
eb5ae8d
+V5_AC_OUTPUT_MANPAGE([
eb5ae8d
+	telnetd/telnetd.8
eb5ae8d
+])
eb5ae8d
+
eb5ae8d
 V5_AC_OUTPUT_MAKEFILE(. libtelnet telnet telnetd)
eb5ae8d
Index: aclocal.m4
eb5ae8d
===================================================================
eb5ae8d
--- aclocal.m4	(revision 22425)
eb5ae8d
+++ aclocal.m4	(working copy)
eb5ae8d
@@ -1854,3 +1854,24 @@
eb5ae8d
 AC_SUBST(PAM_MAN)
eb5ae8d
 AC_SUBST(NON_PAM_MAN)
eb5ae8d
 ])dnl
eb5ae8d
+AC_DEFUN(V5_AC_OUTPUT_MANPAGE,[
046244f
+mansysconfdir=$sysconfdir
046244f
+mansysconfdir=`eval echo $mansysconfdir | sed -e "s,NONE,$prefix,g"`
046244f
+mansysconfdir=`eval echo $mansysconfdir | sed -e "s,NONE,$ac_default_prefix,g"`
046244f
+mansbindir=$sbindir
046244f
+mansbindir=`eval echo $mansbindir | sed -e "s,NONE,$exec_prefix,g"`
046244f
+mansbindir=`eval echo $mansbindir | sed -e "s,NONE,$prefix,g"`
046244f
+mansbindir=`eval echo $mansbindir | sed -e "s,NONE,$ac_default_prefix,g"`
046244f
+manlocalstatedir=$localstatedir
046244f
+manlocalstatedir=`eval echo $manlocalstatedir | sed -e "s,NONE,$prefix,g"`
046244f
+manlocalstatedir=`eval echo $manlocalstatedir | sed -e "s,NONE,$ac_default_prefix,g"`
046244f
+manlibexecdir=$libexecdir
046244f
+manlibexecdir=`eval echo $manlibexecdir | sed -e "s,NONE,$exec_prefix,g"`
046244f
+manlibexecdir=`eval echo $manlibexecdir | sed -e "s,NONE,$prefix,g"`
046244f
+manlibexecdir=`eval echo $manlibexecdir | sed -e "s,NONE,$ac_default_prefix,g"`
046244f
+AC_SUBST(mansysconfdir)
046244f
+AC_SUBST(mansbindir)
046244f
+AC_SUBST(manlocalstatedir)
046244f
+AC_SUBST(manlibexecdir)
eb5ae8d
+AC_CONFIG_FILES($1)
046244f
+])
eb5ae8d
Index: appl/sample/sserver/sserver.M
eb5ae8d
===================================================================
eb5ae8d
--- appl/sample/sserver/sserver.M	(revision 22425)
eb5ae8d
+++ appl/sample/sserver/sserver.M	(working copy)
eb5ae8d
@@ -59,7 +59,7 @@
eb5ae8d
 using a line in
eb5ae8d
 /etc/inetd.conf that looks like this:
eb5ae8d
 .PP
eb5ae8d
-sample  stream  tcp     nowait  root /usr/local/sbin/sserver	sserver
eb5ae8d
+sample  stream  tcp     nowait  root @mansbindir@/sserver	sserver
eb5ae8d
 .PP
eb5ae8d
 Since \fBsample\fP is normally not a port defined in /etc/services, you will
eb5ae8d
 usually have to add a line to /etc/services which looks like this:
3f47a21
Index: appl/bsd/klogind.M
3f47a21
===================================================================
eb5ae8d
--- appl/bsd/klogind.M	(revision 22425)
3f47a21
+++ appl/bsd/klogind.M	(working copy)
3f47a21
@@ -27,7 +27,7 @@
3f47a21
 the port indicated in /etc/inetd.conf.  A typical /etc/inetd.conf
3f47a21
 configuration line for \fIklogind\fP might be:
3f47a21
 
3f47a21
-klogin stream tcp nowait root /usr/cygnus/sbin/klogind klogind -e5c
3f47a21
+klogin stream tcp nowait root @mansbindir@/klogind klogind -e5c
3f47a21
 
3f47a21
 When a service request is received, the following protocol is initiated:
3f47a21
 
3f47a21
Index: appl/bsd/kshd.M
3f47a21
===================================================================
eb5ae8d
--- appl/bsd/kshd.M	(revision 22425)
3f47a21
+++ appl/bsd/kshd.M	(working copy)
3f47a21
@@ -8,7 +8,7 @@
3f47a21
 .SH NAME
3f47a21
 kshd \- kerberized remote shell server
3f47a21
 .SH SYNOPSIS
3f47a21
-.B /usr/local/sbin/kshd 
3f47a21
+.B @mansbindir@/kshd 
3f47a21
 [
3f47a21
 .B \-kr45ec
3f47a21
 ]
3f47a21
@@ -30,7 +30,7 @@
3f47a21
 on the port indicated in /etc/inetd.conf.  A typical /etc/inetd.conf
3f47a21
 configuration line for \fIkrshd\fP might be:
3f47a21
 
3f47a21
-kshell	stream	tcp	nowait	root	/usr/local/sbin/kshd	kshd -5c
3f47a21
+kshell	stream	tcp	nowait	root	@mansbindir@/kshd	kshd -5c
3f47a21
 
3f47a21
 When a service request is received, the following protocol is initiated:
3f47a21
 
3f47a21
Index: appl/telnet/telnetd/telnetd.8
3f47a21
===================================================================
eb5ae8d
--- appl/telnet/telnetd/telnetd.8	(revision 22425)
3f47a21
+++ appl/telnet/telnetd/telnetd.8	(working copy)
3f47a21
@@ -37,7 +37,7 @@
3f47a21
 .SM DARPA TELNET
3f47a21
 protocol server
3f47a21
 .SH SYNOPSIS
3f47a21
-.B /usr/libexec/telnetd
339ee13
+.B @mansbindir@/telnetd
3f47a21
 [\fB\-a\fP \fIauthmode\fP] [\fB\-B\fP] [\fB\-D\fP] [\fIdebugmode\fP]
3f47a21
 [\fB\-e\fP] [\fB\-h\fP] [\fB\-I\fP\fIinitid\fP] [\fB\-l\fP]
3f47a21
 [\fB\-k\fP] [\fB\-n\fP] [\fB\-r\fP\fIlowpty-highpty\fP] [\fB\-s\fP]
eb5ae8d
Index: appl/gssftp/ftpd/ftpd.M
046244f
===================================================================
eb5ae8d
--- appl/gssftp/ftpd/ftpd.M	(revision 22425)
eb5ae8d
+++ appl/gssftp/ftpd/ftpd.M	(working copy)
eb5ae8d
@@ -35,7 +35,7 @@
eb5ae8d
 .SH NAME
eb5ae8d
 ftpd \- DARPA Internet File Transfer Protocol server
eb5ae8d
 .SH SYNOPSIS
eb5ae8d
-.B ftpd
eb5ae8d
+.B @mansbindir@/ftpd
eb5ae8d
 [\fB\-A \fP|\fB -a\fP] [\fB\-C\fP] [\fB\-c\fP] [\fB\-d\fP] [\fB-E\fP]
eb5ae8d
 [\fB\-l\fP] [\fB\-v\fP] [\fB\-T\fP \fImaxtimeout\fP] [\fB\-t\fP \fItimeout\fP]
eb5ae8d
 [\fB\-p\fP \fIport\fP] [\fB\-U\fP \fIftpusers-file\fP] [\fB\-u\fP \fIumask\fP]
3f47a21
Index: kadmin/cli/kadmin.M
3f47a21
===================================================================
eb5ae8d
--- kadmin/cli/kadmin.M	(revision 22425)
3f47a21
+++ kadmin/cli/kadmin.M	(working copy)
046244f
@@ -850,9 +850,9 @@
3f47a21
 .RS
3f47a21
 .TP
3f47a21
 EXAMPLE:
3f47a21
-kadmin: ktremove -k /usr/local/var/krb5kdc/kadmind.keytab kadmin/admin
3f47a21
+kadmin: ktremove -k @manlocalstatedir@/krb5kdc/kadmind.keytab kadmin/admin
3f47a21
 Entry for principal kadmin/admin with kvno 3 removed
3f47a21
-	from keytab WRFILE:/usr/local/var/krb5kdc/kadmind.keytab.
3f47a21
+	from keytab WRFILE:@manlocalstatedir@/krb5kdc/kadmind.keytab.
3f47a21
 kadmin:
3f47a21
 .RE
3f47a21
 .fi
046244f
@@ -894,7 +894,7 @@
3f47a21
 .SH HISTORY
3f47a21
 The
3f47a21
 .B kadmin
3f47a21
-prorgam was originally written by Tom Yu at MIT, as an interface to the
3f47a21
+program was originally written by Tom Yu at MIT, as an interface to the
3f47a21
 OpenVision Kerberos administration program.
3f47a21
 .SH SEE ALSO
3f47a21
 .IR kerberos (1),
3f47a21
Index: config-files/kdc.conf.M
3f47a21
===================================================================
eb5ae8d
--- config-files/kdc.conf.M	(revision 22425)
3f47a21
+++ config-files/kdc.conf.M	(working copy)
3f47a21
@@ -82,14 +82,14 @@
3f47a21
 .B string
3f47a21
 specifies the location of the access control list (acl) file that
3f47a21
 kadmin uses to determine which principals are allowed which permissions
3f47a21
-on the database. The default value is /usr/local/var/krb5kdc/kadm5.acl.
3f47a21
+on the database. The default value is @manlocalstatedir@/krb5kdc/kadm5.acl.
3f47a21
 
3f47a21
 .IP admin_keytab
3f47a21
 This
3f47a21
 .B string
3f47a21
 Specifies the location of the keytab file that kadmin uses to
3f47a21
 authenticate to the database.  The default value is
3f47a21
-/usr/local/var/krb5kdc/kadm5.keytab.
3f47a21
+@manlocalstatedir@/krb5kdc/kadm5.keytab.
3f47a21
 
3f47a21
 .IP database_name
3f47a21
 This
046244f
@@ -257,7 +257,7 @@
3f47a21
 realm names and the [capaths] section of its krb5.conf file
3f47a21
 
3f47a21
 .SH FILES 
3f47a21
-/usr/local/var/krb5kdc/kdc.conf
3f47a21
+@manlocalstatedir@/krb5kdc/kdc.conf
3f47a21
 
3f47a21
 .SH SEE ALSO
3f47a21
 krb5.conf(5), krb5kdc(8)
eb5ae8d
Index: config-files/krb5.conf.M
eb5ae8d
===================================================================
eb5ae8d
--- config-files/krb5.conf.M	(revision 22425)
eb5ae8d
+++ config-files/krb5.conf.M	(working copy)
eb5ae8d
@@ -643,6 +643,6 @@
eb5ae8d
 This LDAP specific tag indicates the number of connections to be maintained per
eb5ae8d
 LDAP server.
eb5ae8d
 .SH FILES 
eb5ae8d
-/etc/krb5.conf
eb5ae8d
+@mansysconfdir@/krb5.conf
eb5ae8d
 .SH SEE ALSO
eb5ae8d
 syslog(3)
3f47a21
Index: slave/kprop.M
3f47a21
===================================================================
eb5ae8d
--- slave/kprop.M	(revision 22425)
3f47a21
+++ slave/kprop.M	(working copy)
3f47a21
@@ -39,7 +39,7 @@
3f47a21
 This is done by transmitting the dumped database file to the slave
3f47a21
 server over an encrypted, secure channel.  The dump file must be created
3f47a21
 by kdb5_util, and is normally KPROP_DEFAULT_FILE
3f47a21
-(/usr/local/var/krb5kdc/slave_datatrans).
3f47a21
+(@manlocalstatedir@/krb5kdc/slave_datatrans).
3f47a21
 .SH OPTIONS
3f47a21
 .TP
3f47a21
 \fB\-r\fP \fIrealm\fP
3f47a21
@@ -51,7 +51,7 @@
3f47a21
 \fB\-f\fP \fIfile\fP
3f47a21
 specifies the filename where the dumped principal database file is to be
3f47a21
 found; by default the dumped database file is KPROP_DEFAULT_FILE
3f47a21
-(normally /usr/local/var/krb5kdc/slave_datatrans).
3f47a21
+(normally @manlocalstatedir@/krb5kdc/slave_datatrans).
3f47a21
 .TP
3f47a21
 \fB\-P\fP \fIport\fP
3f47a21
 specifies the port to use to contact the
3f47a21
Index: slave/kpropd.M
3f47a21
===================================================================
eb5ae8d
--- slave/kpropd.M	(revision 22425)
3f47a21
+++ slave/kpropd.M	(working copy)
046244f
@@ -74,7 +74,7 @@
3f47a21
 This is done by adding a line to the inetd.conf file which looks like
3f47a21
 this:
3f47a21
 
3f47a21
-kprop	stream	tcp	nowait	root	/usr/local/sbin/kpropd	kpropd
3f47a21
+kprop	stream	tcp	nowait	root	@mansbindir@/kpropd	kpropd
3f47a21
 
3f47a21
 However, kpropd can also run as a standalone deamon, if the
3f47a21
 .B \-S
046244f
@@ -111,13 +111,13 @@
3f47a21
 \fB\-f\fP \fIfile\fP
3f47a21
 specifies the filename where the dumped principal database file is to be
3f47a21
 stored; by default the dumped database file is KPROPD_DEFAULT_FILE
3f47a21
-(normally /usr/local/var/krb5kdc/from_master).
3f47a21
+(normally @manlocalstatedir@/krb5kdc/from_master).
3f47a21
 .TP
3f47a21
 .B \-p
3f47a21
 allows the user to specify the pathname to the
3f47a21
 .IR kdb5_util (8)
3f47a21
 program; by default the pathname used is KPROPD_DEFAULT_KDB5_UTIL
3f47a21
-(normally /usr/local/sbin/kdb5_util).
3f47a21
+(normally @mansbindir@/kdb5_util).
3f47a21
 .TP
3f47a21
 .B \-S
3f47a21
 turn on standalone mode.  Normally, kpropd is invoked out of
046244f
@@ -148,14 +148,14 @@
3f47a21
 allows the user to specify the path to the
339ee13
 kpropd.acl
3f47a21
 file; by default the path used is KPROPD_ACL_FILE
3f47a21
-(normally /usr/local/var/krb5kdc/kpropd.acl).
3f47a21
+(normally @manlocalstatedir@/krb5kdc/kpropd.acl).
3f47a21
 .SH FILES
3f47a21
 .TP "\w'kpropd.acl\ \ 'u"
3f47a21
 kpropd.acl
3f47a21
 Access file for
3f47a21
 .BR kpropd ;
3f47a21
 the default location is KPROPD_ACL_FILE (normally
3f47a21
-/usr/local/var/krb5kdc/kpropd.acl).
3f47a21
+@manlocalstatedir@/krb5kdc/kpropd.acl).
3f47a21
 Each entry is a line containing the principal of a host from which the
3f47a21
 local machine will allow Kerberos database propagation via kprop.
3f47a21
 .SH SEE ALSO