On Mon, 21 Aug 2006, Guillaume Rousse wrote: > Ian Kent wrote: > > Please don't send patches as attachments put them in-line with the mail. > > It's a pain reply with comments. > OK. It's a bit more difficult to ensure patch integrity, but here is it > again:
OK. I'll merge it during the next round of cleanups. Have you tested this? > diff -Naur autofs-5.0.1/lib/defaults.c autofs-5.0.1.config/lib/defaults.c > --- autofs-5.0.1/lib/defaults.c 2006-07-13 10:11:38.000000000 +0200 > +++ autofs-5.0.1.config/lib/defaults.c 2006-07-26 09:15:30.000000000 > +0200 > @@ -24,21 +24,21 @@ > #define DEFAULTS_CONFIG_FILE AUTOFS_CONF_DIR "/autofs" > #define MAX_LINE_LEN 256 > > -#define ENV_NAME_MASTER_MAP "DEFAULT_MASTER_MAP_NAME" > +#define ENV_NAME_MASTER_MAP "MASTER_MAP_NAME" > > -#define ENV_NAME_TIMEOUT "DEFAULT_TIMEOUT" > -#define ENV_NAME_BROWSE_MODE "DEFAULT_BROWSE_MODE" > -#define ENV_NAME_LOGGING "DEFAULT_LOGGING" > +#define ENV_NAME_TIMEOUT "TIMEOUT" > +#define ENV_NAME_BROWSE_MODE "BROWSE_MODE" > +#define ENV_NAME_LOGGING "LOGGING" > > -#define ENV_LDAP_SERVER "DEFAULT_LDAP_SERVER" > +#define ENV_LDAP_SERVER "LDAP_SERVER" > > -#define ENV_NAME_MAP_OBJ_CLASS "DEFAULT_MAP_OBJECT_CLASS" > -#define ENV_NAME_ENTRY_OBJ_CLASS "DEFAULT_ENTRY_OBJECT_CLASS" > -#define ENV_NAME_MAP_ATTR "DEFAULT_MAP_ATTRIBUTE" > -#define ENV_NAME_ENTRY_ATTR "DEFAULT_ENTRY_ATTRIBUTE" > -#define ENV_NAME_VALUE_ATTR "DEFAULT_VALUE_ATTRIBUTE" > +#define ENV_NAME_MAP_OBJ_CLASS "MAP_OBJECT_CLASS" > +#define ENV_NAME_ENTRY_OBJ_CLASS "ENTRY_OBJECT_CLASS" > +#define ENV_NAME_MAP_ATTR "MAP_ATTRIBUTE" > +#define ENV_NAME_ENTRY_ATTR "ENTRY_ATTRIBUTE" > +#define ENV_NAME_VALUE_ATTR "VALUE_ATTRIBUTE" > > -#define ENV_AUTH_CONF_FILE "DEFAULT_AUTH_CONF_FILE" > +#define ENV_AUTH_CONF_FILE "AUTH_CONF_FILE" > > static const char *default_master_map_name = DEFAULT_MASTER_MAP_NAME; > > diff -Naur autofs-5.0.1/redhat/autofs.sysconfig.in > autofs-5.0.1.config/redhat/autofs.sysconfig.in > --- autofs-5.0.1/redhat/autofs.sysconfig.in 2006-07-13 > 10:11:39.000000000 +0200 > +++ autofs-5.0.1.config/redhat/autofs.sysconfig.in 2006-07-26 > 09:21:22.000000000 +0200 > @@ -1,56 +1,43 @@ > # > -# Define default options for autofs. > -# > -# DEFAULT_MASTER_MAP_NAME - default map name for the master map. > -# > -#DEFAULT_MASTER_MAP_NAME="auto.master" > -# > -# DEFAULT_TIMEOUT - set the default mount timeout (default 600). > -# > -DEFAULT_TIMEOUT=300 > -# > -# DEFAULT_BROWSE_MODE - maps are browsable by default. > -# > -DEFAULT_BROWSE_MODE="no" > -# > -# DEFAULT_LOGGING - set default log level "none", "verbose" or "debug" > -# > -#DEFAULT_LOGGING="none" > -# > -# Define the default LDAP schema to use for lookups > -# > -# System default > +# autofs server configuration I always thought of autofs is a client not a server. The config needs to reflect the setup of previous versions of autofs. > +# > + > +# MASTER_MAP_NAME - map name for the master map. > # > -#DEFAULT_MAP_OBJECT_CLASS="nisMap" > -#DEFAULT_ENTRY_OBJECT_CLASS="nisObject" > -#DEFAULT_MAP_ATTRIBUTE="nisMapName" > -#DEFAULT_ENTRY_ATTRIBUTE="cn" > -#DEFAULT_VALUE_ATTRIBUTE="nisMapEntry" > +#MASTER_MAP_NAME="auto.master" > + > +# TIMEOUT - set the mount timeout > # > -# Other common LDAP nameing > +#TIMEOUT=600 Should be 300 not 600. > + > +# BROWSE_MODE - maps are browsable by default. > # > -#DEFAULT_MAP_OBJECT_CLASS="automountMap" > -#DEFAULT_ENTRY_OBJECT_CLASS="automount" > -#DEFAULT_MAP_ATTRIBUTE="ou" > -#DEFAULT_ENTRY_ATTRIBUTE="cn" > -#DEFAULT_VALUE_ATTRIBUTE="automountInformation" > +#BROWSE_MODE="yes" Should be set to "no". > + > +# LOGGING - set log level "none", "verbose" or "debug" > # > -#DEFAULT_MAP_OBJECT_CLASS="automountMap" > -#DEFAULT_ENTRY_OBJECT_CLASS="automount" > -#DEFAULT_MAP_ATTRIBUTE="automountMapName" > -#DEFAULT_ENTRY_ATTRIBUTE="automountKey" > -#DEFAULT_VALUE_ATTRIBUTE="automountInformation" > +#LOGGING="none" > + > +# Define the LDAP schema to use for lookups > # > -# DEFAULT_AUTH_CONF_FILE - set the default location for the SASL > +#MAP_OBJECT_CLASS="nisMap" > +#ENTRY_OBJECT_CLASS="nisObject" > +#MAP_ATTRIBUTE="nisMapName" > +#ENTRY_ATTRIBUTE="cn" > +#VALUE_ATTRIBUTE="nisMapEntry" The two other common LDAP schema should be present in the config file somewhere for a quick reference for people needing that information. > + > +# AUTH_CONF_FILE - set the location for the SASL > # authentication configuration file. > # > -#DEFAULT_AUTH_CONF_FILE="@@autofsmapdir@@/autofs_ldap_auth.conf" > +#AUTH_CONF_FILE="@@autofsmapdir@@/autofs_ldap_auth.conf" > + > # > +# autofs service configuration > +# > + > # General global options > # > #OPTIONS="" > -# > -# > -# UNDERSCORETODOT changes auto_home to auto.home and auto_mnt to auto.mnt > -UNDERSCORETODOT=1 > > +# UNDERSCORETODOT changes auto_home to auto.home and auto_mnt to auto.mnt > +#UNDERSCORETODOT=1 Is no longer used and will be removed shortly. Ian _______________________________________________ autofs mailing list [email protected] http://linux.kernel.org/mailman/listinfo/autofs
