From 4abcfca8f523bfc1c22a64aad4cf1090da1940b2 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 4 Sep 2001 02:47:25 +0000
Subject: [PATCH] Clean up DNs and remove extraneous files

---
 doc/man/man5/ldaptemplates.conf.5 |   4 +-
 doc/man/man5/ldif.5               |  10 +-
 doc/man/man5/slapd.replog.5       |   6 +-
 doc/man/man8/go500.8              | 178 ------------------------------
 doc/man/man8/go500gw.8            | 178 ------------------------------
 doc/man/man8/rcpt500.8            |  94 ----------------
 6 files changed, 10 insertions(+), 460 deletions(-)
 delete mode 100644 doc/man/man8/go500.8
 delete mode 100644 doc/man/man8/go500gw.8
 delete mode 100644 doc/man/man8/rcpt500.8

diff --git a/doc/man/man5/ldaptemplates.conf.5 b/doc/man/man5/ldaptemplates.conf.5
index c42c5710ec..e526c04292 100644
--- a/doc/man/man5/ldaptemplates.conf.5
+++ b/doc/man/man5/ldaptemplates.conf.5
@@ -114,7 +114,7 @@ The next line is the default location under which new entries are created.
 It should be a string-represented Distringuished Name. E.g.,
 .nf
 .ft B
-    "dc=example, dc=com"
+    "dc=example,dc=com"
 .ft
 .fi
 .LP
@@ -246,7 +246,7 @@ for display of people entries and one for display of contries.
 
     #
     # default location when adding new entries (DN; "" means no default)
-    "dc=example, dc=com"
+    "dc=example,dc=com"
 
     #
     # rules used to define default values for new entries
diff --git a/doc/man/man5/ldif.5 b/doc/man/man5/ldif.5
index 62f63174a9..1f7423af84 100644
--- a/doc/man/man5/ldif.5
+++ b/doc/man/man5/ldif.5
@@ -33,8 +33,8 @@ or tab, e.g.,
 .LP
 .nf
 .ft tt
-	dn: cn=Barbara J Jensen, dc=exam
-	 ple, dc=com
+	dn: cn=Barbara J Jensen,dc=exam
+	 ple,dc=com
 .ft
 .fi
 .LP
@@ -78,20 +78,20 @@ Here is an example of an LDIF file containing three entries.
 .LP
 .nf
 .ft tt
-	dn: cn=Barbara J Jensen, dc=example, dc=com
+	dn: cn=Barbara J Jensen,dc=example,dc=com
 	cn: Barbara J Jensen
 	cn: Babs Jensen
 	objectclass: person
 	description:< file://tmp/babs
 	sn: Jensen
 
-	dn: cn=Bjorn J Jensen, dc=example, dc=com
+	dn: cn=Bjorn J Jensen,dc=example,dc=com
 	cn: Bjorn J Jensen
 	cn: Bjorn Jensen
 	objectclass: person
 	sn: Jensen
 
-	dn: cn=Jennifer J Jensen, dc=example, dc=com
+	dn: cn=Jennifer J Jensen,dc=example,dc=com
 	cn: Jennifer J Jensen
 	cn: Jennifer Jensen
 	objectclass: person
diff --git a/doc/man/man5/slapd.replog.5 b/doc/man/man5/slapd.replog.5
index 1fe1c0105c..5cb40c9ef7 100644
--- a/doc/man/man5/slapd.replog.5
+++ b/doc/man/man5/slapd.replog.5
@@ -128,7 +128,7 @@ on one of each type of change.
 	replica: truelies.rs.itd.umich.edu
 	replica: judgmentday.rs.itd.umich.edu
 	time: 797612941
-	dn: cn=Babs Jensen, o=U of M, c=US
+	dn: cn=Babs Jensen,dc=example,dc=com
 	changetype: add
 	objectclass: person
 	cn: babs
@@ -138,7 +138,7 @@ on one of each type of change.
 	replica: truelies.rs.itd.umich.edu
 	replica: judgmentday.rs.itd.umich.edu
 	time: 797612973
-	dn: cn=Babs Jensen, o=U of M, c=US
+	dn: cn=Babs Jensen,dc=example,dc=com
 	changetype: modify
 	add: description
 	description: the fabulous babs
@@ -146,7 +146,7 @@ on one of each type of change.
 	replica: truelies.rs.itd.umich.edu
 	replica: judgmentday.rs.itd.umich.edu
 	time: 797613020
-	dn: cn=Babs Jensen, o=U of M, c=US
+	dn: cn=Babs Jensen,dc=example,dc=com
 	changetype: modrdn
 	newrdn: cn=Barbara J Jensen
 	deleteoldrdn: 0
diff --git a/doc/man/man8/go500.8 b/doc/man/man8/go500.8
deleted file mode 100644
index 1ed2ef07e3..0000000000
--- a/doc/man/man8/go500.8
+++ /dev/null
@@ -1,178 +0,0 @@
-.TH GO500 8C "20 August 2000" "OpenLDAP LDVERSION"
-.\" $OpenLDAP$
-.\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
-.\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
-.SH NAME
-go500 \- Local Gopher index search to X.500 search gateway
-.SH SYNOPSIS
-.B LIBEXECDIR/go500 [\-b searchbase] [\-d level] [\-l]
-.B [\-x hostname] [\-c rdncount] [\-f filterfile]
-.B [\-t templatefile]
-.B [\-p port] [\-I]
-.SH DESCRIPTION
-.I go500
-is the local gopher index search to X.500 search daemon.
-It looks like a gopher index server to a gopher
-client, translating the search criteria it is given into a
-search of a pre-configured portion of the X.500 directory.
-It uses LDAP to talk to X.500.  By default, it listens on
-port 5555 for connections from gopher clients.
-.LP
-The
-.B go500
-server can be run either from
-.BR inetd (8)
-or as stand-alone server.
-.SH STAND-ALONE OPERATION
-To start
-.B go500
-as a stand-alone server, simply start it with no arguments
-.LP
-.nf
-.ft tt
-	LIBEXECDIR/go500
-.ft
-.fi
-.LP
-If you would like to start it at boot time add some lines like this to
-the
-.B etc/rc.local
-or equivalent file:
-.LP
-.nf
-.ft tt
-	if [ -f LIBEXECDIR/go500 ]; then
-		LIBEXECDIR/go500; echo ' go500'
-	fi
-.ft
-.fi
-.SH OPERATION WITH INETD
-To arrange to have
-.B go500
-started from
-.BR inetd (8),
-the Internet protocol
-daemon, add a line like the following to your
-.B /etc/services
-file, or the equivalent:
-.LP
-.nf
-.ft tt
-    go500           5555/tcp        go500
-.ft
-.fi
-.LP
-Next, add a line like this to your
-.B /etc/inetd.conf
-file, or the equivalent:
-.LP
-.nf
-.ft tt
-    go500   stream  tcp     nowait  nobody  LIBEXECDIR/go500    go500 -I
-.ft
-.fi
-.LP
-For these changes to take effect with inetd, you will probably have
-to send it it a HUP signal.  See
-.BR inetd (8)
-for more details.
-.SH GOPHER CONFIGURATION
-The next step is to configure your local gopher server to have an
-entry for
-.BR go500 .
-With the standard unix gopher server, this
-can be done with a
-.B .link
-file.
-A sample
-.B .link
-file is given below, with the things you should
-change given in <>'s:
-.LP
-.nf
-.ft tt
-	Name=<Label of your choice>
-	Type=7
-	Port=5555
-	Path=
-	Host=<host.running.go500.here>
-.ft
-.fi
-.LP
-You may also have to restart your gopher daemon, or remove the
-.B .cache
-file.
-See
-.BR gopherd (8)
-for more details.
-.SH OPTIONS
-.TP
-.BI \-b " searchbase"
-Specify an alternate starting point for searches.  The argument should
-be a Distinguished Name in the form defined by RFC 1485.  For example,
-the DN "o=University of Michigan, c=US" could be given to search the
-University of Michigan portion of the X.500 tree.
-.TP
-.BI \-d " level"
-Turn on debugging as defined by
-.I level.
-If this option is specified,
-.B go500
-will not fork or disassociate from the invoking terminal.  Some general
-operation and status messages are printed for any value of \fIlevel\fP.
-\fIlevel\fP is taken as a bit string, with each bit corresponding to a
-different kind of debugging information.
-.TP
-.BI \-f " filterfile"
-Specify an alternate filter configuration file for use with the
-.BR ldap_getfilter (3)
-facility, used by
-.BR go500 .
-.TP
-.B \-l
-Enable logging of various status and errors to the LOG_LOCAL3 facility via
-syslog(8).
-.TP
-.BI \-p " port"
-Specify an alternate port on which to listen for connections.
-.TP
-.BI \-t " templatefile"
-Specify an alternate template  configuration  file  for
-use  with  the
-.BR ldap_init_templates (3)
-facility, used by
-.BR go500 .
-.TP
-.BI \-c " rdncount"
-Specify the number of DN components to show for the names and DN attributes
-within entries matching the search.
-.TP
-.BI \-x " hostname"
-Specify an alternate host on which the ldap server is running.
-.TP
-.B \-I
-Run from
-.BR inetd (8).
-.SH NOTES
-Some implementations of inetd have a small limit on the number of arguments
-that can be specified in the
-.BR /etc/inetd.conf (5)
-file.  This can cause
-problems if you are using
-.B go500
-with a lot of arguments.
-.LP
-The default values for most of the things you can specify with
-options are configured at compile time in the
-.B include/ldapconfig.h.edit
-include file.
-.SH "SEE ALSO"
-.BR ldap (3),
-.BR inetd (8),
-.BR gopherd (8),
-.BR go500gw (8)
-.SH ACKNOWLEDGEMENTS
-.B	OpenLDAP
-is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B	OpenLDAP
-is derived from University of Michigan LDAP 3.3 Release.  
diff --git a/doc/man/man8/go500gw.8 b/doc/man/man8/go500gw.8
deleted file mode 100644
index 8223f41bab..0000000000
--- a/doc/man/man8/go500gw.8
+++ /dev/null
@@ -1,178 +0,0 @@
-.TH GO500GW 8C "20 August 2000" "OpenLDAP LDVERSION"
-.\" $OpenLDAP$
-.\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
-.\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
-.SH NAME
-go500gw \- General Gopher to X.500 gateway for browsing and searching
-.SH SYNOPSIS
-.B LIBEXECDIR/go500gw [\-a] [\-d level] [\-f filterfile]
-.B [\-t templatefile] [\-c rdncount]
-.B [\-h helpfile] [\-l] [\-p listenport]
-.B [\-P ldapport] [\-x ldaphost] [\-I]
-.SH DESCRIPTION
-.B go500gw
-is the general gopher to X.500 browsing and search gateway daemon.
-It speaks gopher on one side and X.500 (via LDAP)
-on the other.  It presents the X.500 DIT as a tree of menus,
-search items, and documents in gopher space, supporting both
-browsing and searching of X.500 via a gopher client.  By default,
-it listens on port 7777 for connections from gopher clients.
-.LP
-The
-.B go500gw
-server can be run either from
-.BR inetd (8)
-or as stand-alone server.
-.SH STAND-ALONE OPERATION
-To start
-.B go500gw
-as a stand-alone server, simply start it with no arguments
-.LP
-.nf
-.ft tt
-	LIBEXECDIR/go500gw
-.ft
-.fi
-.LP
-If you would like to start it at boot time add some lines like this to
-the
-.BR /etc/rc.local (5)
-or equivalent file:
-.LP
-.nf
-.ft tt
-	if [ -f LIBEXECDIR/go500gw ]; then
-		LIBEXECDIR/go500gw; echo ' go500gw'
-	fi
-.ft
-.fi
-.SH OPERATION WITH INETD
-To arrange to have
-.B go500gw
-started from
-.BR inetd (8), the Internet protocol
-daemon, add a line like the following to your
-.BR /etc/services (5)
-file, or the equivalent:
-.LP
-.nf
-.ft tt
-    go500gw           7777/tcp        go500gw
-.ft
-.fi
-.LP
-Next, add a line like this to your
-.BR /etc/inetd.conf (5)
-file, or the equivalent:
-.LP
-.nf
-.ft tt
-    go500gw  stream  tcp  nowait  nobody  LIBEXECDIR/go500gw    go500gw -I
-.ft
-.fi
-.LP
-For these changes to take effect with inetd, you will probably have
-to send it it a HUP signal.  See
-.BR inetd (8)
-for more details.
-.SH GOPHER CONFIGURATION
-The next step is to configure your local gopher server to have an
-entry for
-.BR go500gw .
-With the standard unix gopher server, this
-can be done with a
-.B .link
-file.  A sample
-.B .link
-file is given below, with the things you should change given in <>'s:
-.LP
-.nf
-.ft tt
-	Name=<Label of your choice>
-	Type=1
-	Port=7777
-	Path=1<optional RFC 2253-format DN at which to start browsing>
-	Host=<host.running.go500gw.here>
-.ft
-.fi
-.LP
-You may also have to restart your gopher daemon, or remove the
-.B .cache
-file.
-.SH OPTIONS
-.TP
-.B \-a
-Search aliases when doing LDAP searches.  The default is not to
-search aliases.
-.TP
-.BI \-d " level"
-Turn on debugging as defined by
-.I level.
-If this option is specified,
-.B go500gw
-will not fork or disassociate from the invoking terminal.  Some general
-operation and status messages are printed for any value of \fIlevel\fP.
-\fIlevel\fP is taken as a bit string, with each bit corresponding to a
-different kind of debugging information.
-.TP
-.BI \-f " filterfile"
-Specify an alternate filter configuration file for use with the
-.BR ldap_getfilter (3)
-facility, used by
-.BR go500gw .
-.TP
-.BI \-h " helpfile"
-Specify an alternate help file.  The help file is what is displayed
-in the "About the Gopher to X.500 Gateway" menu item.
-.TP
-.B \-l
-Enable logging of various status and errors to the LOG_LOCAL3 facility via
-.BR syslog (8).
-.TP
-.BI \-p " listenport"
-Specify an alternate port on which to listen for connections.
-.TP
-.BI \-P " ldapport"
-Specify an alternate port on which to contact the LDAP server.
-.TP
-.BI \-t " templatefile"
-Specify an alternate template  configuration  file  for
-use  with  the
-.BI ldap_init_templates (3)
-facility, used by
-.B go500gw .
-.TP
-.BI \-c " rdncount"
-Specify the number of DN components to show for the names and DN attributes
-within entries matching the search.
-.TP
-.BI \-x " hostname"
-Specify an alternate host on which the ldap server is running.
-.TP
-.B \-I
-Run from
-.BR inetd (8).
-.SH NOTES
-Some implementations of inetd have a small limit on the number of arguments
-that can be specified in the
-.BR /etc/inetd.conf (5)
-file.  This can cause
-problems if you are using
-.B go500gw
-with a lot of arguments.
-.LP
-The default values for most of the things you can specify with
-options are configured at compile time in the
-.B include/ldapconfig.h.edit
-include file.
-.SH "SEE ALSO"
-.BR ldap (3),
-.BR ldap_getfilter (3),
-.BR inetd (8),
-.BR gopherd (8),
-.BR go500 (8)
-.SH ACKNOWLEDGEMENTS
-.B	OpenLDAP
-is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B	OpenLDAP
-is derived from University of Michigan LDAP 3.3 Release.  
diff --git a/doc/man/man8/rcpt500.8 b/doc/man/man8/rcpt500.8
deleted file mode 100644
index 0539664b8a..0000000000
--- a/doc/man/man8/rcpt500.8
+++ /dev/null
@@ -1,94 +0,0 @@
-.TH RCPT500 8C "20 August 2000" "OpenLDAP LDVERSION"
-.\" $OpenLDAP$
-.\" Copyright 1998-2000 The OpenLDAP Foundation All Rights Reserved.
-.\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
-.SH NAME
-rcpt500 \- mail to X.500 gateway program
-.SH SYNOPSIS
-.B LIBEXECDIR/rcpt500 [\-l] [\-h ldaphost] [\-p ldapport]
-.B [\-b searchbase] [\-a] [\-U] [\-z sizelimit] [\-u dapuser]
-.B [\-f filterfile] [\-t templatefile] [\-c rdncount]
-.SH DESCRIPTION
-.B rcpt500
-is a mail-query server that answers X.500 white pages queries.  It is
-designed to be run out of your mail system alias file (or the equivalent).
-.B rcpt500
-accepts the entire contents (including headers) of an RFC 822
-message on standard input.  The message is parsed, and a search or help
-command found in the Subject: header of message body is recognized and
-a reply is sent to the sender.
-.LP
-If you are using
-.BR sendmail (8),
-you could add the following line to the
-.BR aliases (5)
-file
-.RB ( /etc/aliases )
-to have
-.B rcpt500
-invoked whenever mail is sent to the address \fInamelookup\fP on your host:
-.nf
-.fi
-.ft tt
-    namelookup:	"|LIBEXECDIR/rcpt500 -l"
-.ft
-.fi
-.SH OPTIONS
-.TP
-.B \-l
-Enable logging of requests to the LOG_DAEMON facility.
-.TP
-.BI \-h " ldaphost"
-Specify an alternate host on which the ldap server is running.
-.TP
-.BI \-p " ldapport"
-Specify and alternate TCP port where the ldap server is running.
-.TP
-.BI \-b " searchbase"
-Specify an alternate base for searches.  \fIsearchbase\fP should be
-a string-represented LDAP Distinguished Name.
-.TP
-.B \-a
-Turn off dereferencing of aliases for the LDAP search.
-.TP
-.B \-U
-Use Connectionless LDAP (over UDP).  This option is only available when
-.B rcpt500
-is compiled with -DCLDAP.
-.TP
-.BI \-z " sizelimit"
-Limit the maximum number of entries returned to \fIsizelimit\fP
-entries.
-.TP
-.BI \-t " templatefile"
-Specify an alternate template configuration file for use with the
-.BR ldap_init_templates (3)
-facility, used by rcpt500.
-.TP
-.BI \-c " rdncount"
-Specify the number of DN components to show for the names and DN attributes
-within entries matching the search.
-.SH NOTES
-The default values for most of the things you can specify with options
-are configured at compile time in the
-.B include/ldapconfig.h.edit
-include
-file.  Also included there are the pathname of the help file, the name
-of the command used to send replies, etc.  You should configure
-.B ldapconfig.h.edit
-for your site.
-.SH FILES
-.PD 0
-.TP 20
-.B DATADIR/rcpt500.help
-help file
-.PD
-.SH "SEE ALSO"
-.BR ldap (3),
-.BR aliases (5),
-.BR sendmail (8)
-.SH ACKNOWLEDGEMENTS
-.B	OpenLDAP
-is developed and maintained by The OpenLDAP Project (http://www.openldap.org/).
-.B	OpenLDAP
-is derived from University of Michigan LDAP 3.3 Release.  
-- 
2.39.5