From 37670762bc8db26c2699e124cd391e7d06840ce0 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Mon, 10 Oct 2005 16:46:59 +0000 Subject: [PATCH] nuke trailing spaces --- ChangeLog | 2 +- INSTALL | 2 +- README.autofs | 2 +- README.sun2amd | 30 ++++++++++++------------ buildall | 2 +- commit | 2 +- ldap-id.ms | 62 +++++++++++++++++++++++++------------------------- 7 files changed, 51 insertions(+), 51 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d131be..89c497a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,7 +9,7 @@ * amd/sun_map.c (sun_entry2amd): Fix a comment. * README.sun2amd: Made a first pass at describing the status of - the sun2amd feature. + the sun2amd feature. Moved the date. 2005-10-09 Erez Zadok diff --git a/INSTALL b/INSTALL index 78f6b49..e431e25 100644 --- a/INSTALL +++ b/INSTALL @@ -105,7 +105,7 @@ FOOTNOTES: [1] Due to limitations in the Sun autofs v1 implementation, some amd features cannot be properly supported. More precisely, trying to access a link mount -pointing to another amd entry will result in failure and/or deadlock. +pointing to another amd entry will result in failure and/or deadlock. Ordinary nfs and link mounts work well, however. [2] AIX autofs appears to be a variant of the Sun autofs v1 protocol, but diff --git a/README.autofs b/README.autofs index d2f91ee..866cbca 100644 --- a/README.autofs +++ b/README.autofs @@ -10,7 +10,7 @@ - The autofs code in am-utils is gamma quality for Linux, beta quality for Solaris 2.5+ and non-working for all the other systems. -- Link, lofs, ufs, nfs, nfsl, and auto mounts were tested and work properly; +- Link, lofs, ufs, nfs, nfsl, and auto mounts were tested and work properly; the others should work, but were not tested. * Caveats: diff --git a/README.sun2amd b/README.sun2amd index 7113f3e..7b8a0de 100644 --- a/README.sun2amd +++ b/README.sun2amd @@ -1,7 +1,7 @@ Sun-style Automounter Syntax Support in Amd - -Last updated: $Date: 2005/10/10 01:40:16 $ + +Last updated: $Date: 2005/10/10 16:46:59 $ ********************************************************************** Summary @@ -27,22 +27,22 @@ Supported Sun map features: * Map Key Substitution: :/tmp/& the & expands to -* Wildcard Key: * :/tmp - This is is a catch-all entry. +* Wildcard Key: * :/tmp + This is is a catch-all entry. -* Variable Substitution: +* Variable Substitution: $ARCH, $CPU, $HOST, $OSNAME, $OSREL, $OSVERS, $NATISA -* Multiple Mount format: +* Multiple Mount format: [mount_options] [mountpoint] [mount-options locations...]... - - ex. + + ex. pluto -ro /tmp1 host1:/tmp1 /tmp2 host2:/tmp2 * HSFS file-system (cdrom): -fstype=hsfs,ro :/dev/cdrom -Not-yet supported Sun map features: +Not-yet supported Sun map features: * Replicated File Systems: ,...: This is a feature of Solaris that allows a user to specify a @@ -63,16 +63,16 @@ Not-yet supported Sun map features: Amd still relies and amd.conf. Any feature in auto.master must be duplicated using Amd equivalent features in amd.conf. -* /net mount point: +* /net mount point: The automounter is suppose to dynamically create map entries under this mount point corresponding to NFS server(s) exported file systems. -* Federated Naming Service (FNS): +* Federated Naming Service (FNS): A naming server that wraps a number of other naming service under one interface. -* -null map option: A way to cancel maps in the auto.master file. +* -null map option: A way to cancel maps in the auto.master file. * nsswitch.conf: This file provides a way to specify what lookup service to use @@ -126,8 +126,8 @@ functionality with Amd? A: In short, you must create the '/net' entry as a Amd entry of type autofs by hand. Below is an example of how to do this. See the Amd -documentation on type autofs for more information. - +documentation on type autofs for more information. + ex. # file: amd.conf @@ -141,6 +141,6 @@ net type:=auto;fs:=${map};pref:=${key}/ net/host1 type:=nfs;rhost:=host1;rfs:=/home net/host2 type:=nfs;rhost:=host2;rfs:=/home net/host3 type:=nfs;rhost:=host3;rfs:=/home - + more to come... diff --git a/buildall b/buildall index a47a986..50f3d64 100755 --- a/buildall +++ b/buildall @@ -271,7 +271,7 @@ if test -d ./A.${host_alias} ; then else mkdir ./A.${host_alias} fi -echo "Configuring/building am-utils in directory ./A.${host_alias} ..." +echo "Configuring/building am-utils in directory ./A.${host_alias} ..." echo cd ./A.${host_alias} cd ./A.${host_alias} || exit 1 diff --git a/commit b/commit index 591aa10..7680b58 100755 --- a/commit +++ b/commit @@ -32,7 +32,7 @@ # usage: commit [-v] [-h] [-f] [-l] [-n] [-q] [-z N] # [-m msg|-F msg_file] [--] [file|dir ...] -# -f --fast don't check (unless *followed* by -n), and just +# -f --fast don't check (unless *followed* by -n), and just # --force display commit message instead of running $PAGER # -l --local don't descend into subdirectories # -m msg --message=msg set commit message diff --git a/ldap-id.ms b/ldap-id.ms index 54ba0af..3c0d308 100644 --- a/ldap-id.ms +++ b/ldap-id.ms @@ -28,31 +28,31 @@ A directory (X.500 and LDAPv3) schema for Berkely automounter .fi .in 3 This memo describes a directory (LDAP or X.500) schema for storing -amd (Berkely-style automounter) mount info maps. The schema is currently -beeing supported by the (beta version of the) am-utils version 6 package -[AMUTILS]. +amd (Berkely-style automounter) mount info maps. The schema is currently +beeing supported by the (beta version of the) am-utils version 6 package +[AMUTILS]. .ti 0 2. Overview and Rationale Directory services such as X.500 [X500] or LDAP [RFC2251] are a natural -choice of repository for amd mount map databases. All Object Identifiers -in this document are prefixed by amdSchema-id to be assigned later. The -relation between this schema and the automount schema elements in [HOWARD] +choice of repository for amd mount map databases. All Object Identifiers +in this document are prefixed by amdSchema-id to be assigned later. The +relation between this schema and the automount schema elements in [HOWARD] are mostly superficial. The model for the elements in [HOWARD] was the SUN -automounter which has quite a different syntax for mount maps. Furthermore -the intended usage of this schema differs from that of [HOWARD] in many +automounter which has quite a different syntax for mount maps. Furthermore +the intended usage of this schema differs from that of [HOWARD] in many respects. .ti 0 3. DSA requirements -Directory servers implementing this schema SHOULD maintain the -modifyTimestamp operational attribute. If not the amdMapCacheTtl +Directory servers implementing this schema SHOULD maintain the +modifyTimestamp operational attribute. If not the amdMapCacheTtl attribute SHOULD be set to 0 indicating to clients that caching of -map entries SHOULD be turned off. Clients wishing to use the amdMap -schema MAY use the modifyTimestamp information to set the ttl for -internal caching schemes. A value of 0 for the amdMapCacheTtl must +map entries SHOULD be turned off. Clients wishing to use the amdMap +schema MAY use the modifyTimestamp information to set the ttl for +internal caching schemes. A value of 0 for the amdMapCacheTtl must result in clients turning off any local caching. .ti 0 @@ -70,11 +70,11 @@ in BNF using definitions from [RFC2252]: amdlocationselection = amdlocation | amdlocationselection whsp amdlocation - + amdlocation = amdlocationinfo | "-" amdlocationinfo | "-" - + amdlocationinfo = seloropt | amdlocationinfo ";" seloropt | ";" @@ -87,7 +87,7 @@ in BNF using definitions from [RFC2252]: optass = keystring \":=\" printablestring -X.500 servers or LDAPv3 servers (supporting the binary attribute +X.500 servers or LDAPv3 servers (supporting the binary attribute option) may use the following syntax definition: AmdLocationList ::= SEQUENCE OF { @@ -103,21 +103,21 @@ option) may use the following syntax definition: not [2] NULL } } - + AmdLocationInfo ::= SET OF { CHOICE { selection [0] AmdSelection option [1] AmdOption } } - + AmdSelection ::= CHOICE { eq [0] AttributeAndValue ne [1] AttributeAndValue } AmdOption ::= AttributeAndValue - + AttributeAndValue ::= SEQUENCE { attribute IA5String value IA5String @@ -127,7 +127,7 @@ option) may use the following syntax definition: 5. Attribute types The following attribute types are defined in this document: - + amdMapName amdMapCacheTtl amdMapEntry @@ -136,21 +136,21 @@ The following attribute types are defined in this document: amdSchema-a OBJECT IDENTIFIER ::= { amdSchema-id 1 } - amdMapName + amdMapName ATTRIBUTE ::= { WITH SYNTAX IA5String EQUALITY MATCHING RULE caseIgoreExactMatch --ID { amdSchema-a 1 } - DESCRIPTION + DESCRIPTION "This attribute is the symbolic and in the naming context unique name of an amd map. This corresponds in the case of a flat file database to the name of the file or the mount-point of the map." } - - amdMapCacheTtl - ATTRIBUTE ::= { + + amdMapCacheTtl + ATTRIBUTE ::= { WITH SYNTAX Integer EQUALITY MATCHING RULE integerExactMatch --ID { amdSchema-a 2 } @@ -213,7 +213,7 @@ The following attribute types are defined in this document: using the syntax described above." } -.ti 0 +.ti 0 6. Object classes The following object classes are defined in this document: @@ -251,13 +251,13 @@ defined as follows: .ti 0 7. Examples - + .ti 0 8. Security Considerations Due to the security problems posed by NFS care should be taken not to -advertise exported filesystems. Therefore it is often desirable to limit +advertise exported filesystems. Therefore it is often desirable to limit access to entries carrying amd mount map information to those systems to which the corresponding filesystems have been exported. @@ -282,13 +282,13 @@ to which the corresponding filesystems have been exported. Names", RFC 2253, December 1997. [HOWARD] - Luke Howard, "An Approach for Using LDAP as a Network + Luke Howard, "An Approach for Using LDAP as a Network Information Service", draft-howard-nis-schema-??.txt, Internet draft. - [X500] + [X500] ITU something or other. - + .in 3 -- 2.43.0