* scripts/amd.conf.5: Small fixes to typos in man page, from

Thomas Klausner <tk@giga.or.at>.

* ldap.schema: add this file to distribution.

diff --git a/AUTHORS b/AUTHORS
index b5a795399091a35bc06b7c1aa4464c3860467922..25e2c6c62a796c506b36bfc47141e3d71c578d17 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -310,11 +310,13 @@ January 25, 2000: allow browsable auto maps.
 * Wolfram Klaus        <klaus@physik.fu-berlin.de>.
 November 21, 2000: recognize proplist mnttab flag.
 
-* Thomas Klausner <wiz@danbala.ifoer.tuwien.ac.at>
+* Thomas Klausner <tk@giga.or.at>
 November 21, 2000: lots of NetBSD fixes (many of which are generic).
 
 April 18, 2003: patch to reference am-utils info pages in man page.
 
+November 28, 2004: small fixes to typos in amd.conf(5) man page.
+
 * Olaf Kirch <okir@caldera.de>
 February 1, 2001: important Linux NFS error number mapping fixed
 

diff --git a/ChangeLog b/ChangeLog
index 1a3a4616b875533f502a8fecee4586e3579ba9bf..19b617b6040f0c626e64add3fe336e0f85658120 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-11-29  Erez Zadok  <ezk@cs.sunysb.edu>
+
+       * scripts/amd.conf.5: Small fixes to typos in man page, from
+       Thomas Klausner <tk@giga.or.at>.
+
+2004-10-22  Erez Zadok  <ezk@cs.sunysb.edu>
+
+       * ldap.schema: add this file to distribution.
+
 2004-09-15  Erez Zadok  <ezk@cs.sunysb.edu>
 
        * doc/am-utils.texi: fix old URLs.

diff --git a/Makefile.am b/Makefile.am
index 936e1bbd228a22926f1166f20b095344d81dd041..a620c3caf11258f3e8c606e4778f21b2e742d518 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -285,6 +285,7 @@ EXTRA_DIST =                        \
        buildall                \
        config.guess.long       \
        depcomp                 \
+       ldap.schema             \
        ldap-id.ms              \
        ldap-id.txt             \
        stamp-h.in              \

diff --git a/ldap.schema b/ldap.schema
index 75aaa1dffa73c43c74ba53804e3df5810bc23e0b..1451436a1a2f09b36b99f63e818580a3b0a0f328 100644 (file)
--- a/ldap.schema
+++ b/ldap.schema
@@ -2,42 +2,42 @@
 # Authored by Erez Zadok and/or source maintainers
 # Definition by Tim Colles <timc@dai.ed.ac.uk>
 
-# OID Base is 1.3.6.1.4.1.aaa.bbb.ccc
+# OID Base is 1.3.6.1.4.1.10180
 #
-# Syntaxes are under 1.3.6.1.4.1.aaa.bbb.ccc.3.175-199
-# Attribute types are under 1.3.6.1.4.1.aaa.bbb.ccc.2.175-199
-# Object classes are under 1.3.6.1.4.1.aaa.bbb.ccc.1.175-199
+# Syntaxes are under 1.3.6.1.4.1.10180.3.175-199
+# Attribute types are under 1.3.6.1.4.1.10180.2.175-199
+# Object classes are under 1.3.6.1.4.1.10180.1.175-199
 
 # Atribute Type Definitions
 
-attributetype  ( 1.3.6.1.4.1.aaa.bbb.ccc.2.175 NAME 'amdmapTimestamp'
+attributetype  ( 1.3.6.1.4.1.10180.2.175 NAME 'amdmapTimestamp'
        DESC            'Probably the time the map was last modified'
        EQUALITY        integerMatch
        SYNTAX          1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
-attributetype  ( 1.3.6.1.4.1.aaa.bbb.ccc.2.176 NAME 'amdmapName'
+attributetype  ( 1.3.6.1.4.1.10180.2.176 NAME 'amdmapName'
        DESC            'The symbolic name of the map, ie. map_name'
        EQUALITY        caseIgnoreMatch
        SYNTAX          1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
-attributetype  ( 1.3.6.1.4.1.aaa.bbb.ccc.2.177 NAME 'amdmapKey'
+attributetype  ( 1.3.6.1.4.1.10180.2.177 NAME 'amdmapKey'
        DESC            'The key value for this entry'
        EQUALITY        caseIgnoreMatch
        SYNTAX          1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
-attributetype  ( 1.3.6.1.4.1.aaa.bbb.ccc.2.178 NAME 'amdmapValue'
+attributetype  ( 1.3.6.1.4.1.10180.2.178 NAME 'amdmapValue'
        DESC            'The mount information for this entry'
        EQUALITY        caseIgnoreMatch
        SYNTAX          1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
 # Object Class Definitions
 
-objectclass    ( 1.3.6.1.4.1.aaa.bbb.ccc.1.175 NAME 'amdmapTimestamp'
+objectclass    ( 1.3.6.1.4.1.10180.1.175 NAME 'amdmapTimestamp'
        SUP top STRUCTURAL
        DESC            'Timestamp for an AMD map'
        MUST            ( cn $ amdmapName $ amdmapTimestamp ) )
 
-objectclass    ( 1.3.6.1.4.1.aaa.bbb.ccc.1.176 NAME 'amdmap'
+objectclass    ( 1.3.6.1.4.1.10180.1.176 NAME 'amdmap'
        SUP top STRUCTURAL
        DESC            'Defines an AMD map entry'
        MUST            ( cn $ amdmapName $ amdmapKey $ amdmapValue ) )

diff --git a/scripts/amd.conf.5 b/scripts/amd.conf.5
index 68a41d068dc3ef6de2728e0a070a9c147f4a824a..6cfde1eb9063cb153da0181da4bc21c38eb14e39 100644 (file)
--- a/scripts/amd.conf.5
+++ b/scripts/amd.conf.5
@@ -38,7 +38,7 @@
 .\"
 .\"    %W% (Berkeley) %G%
 .\"
-.\" $Id: amd.conf.5,v 1.27 2004/01/22 05:01:06 ezk Exp $
+.\" $Id: amd.conf.5,v 1.28 2004/11/29 16:31:34 ezk Exp $
 .\"
 .TH AMD.CONF 5 "7 August 1997"
 .SH NAME
@@ -114,7 +114,7 @@ sections that follow.
 If "yes", then amd's top-level mount points will be browsable to
 .BR readdir (3)
 calls.  This means you could run for example
-.BR ls (3)
+.BR ls (1)
 and see what keys are available to mount in that directory.  Not all entries
 are made visible to readdir(3): the "/default" entry, wildcard
 entries, and those with a "/" in them are not included.  If you specify
@@ -274,7 +274,7 @@ amd binary, and run it on multiple machines, yet you want each one to get
 the correct
 .I karch
 variable set (for example, sun4c, sun4m, sun4u, etc.)  Note that if not
-specified, amd will use uname(2) to figure out the kernel architecture of
+specified, amd will use uname(3) to figure out the kernel architecture of
 the machine.
 
 .TP
@@ -366,7 +366,7 @@ have changed at their source (NIS servers, LDAP servers, files, etc.).  Amd
 will reload only those maps that have changed.
 
 .TP
-.BR nfs_allow_insecure_port " (string, default=no).
+.BR nfs_allow_insecure_port " (string, default=no)"
 Normally amd will refuse requests coming from unprivileged ports (i.e.
 ports >= 1024 on Unix systems), so that only privileged users and the kernel
 can send NFS requests to it. However, some kernels (certain versions of