From: Guillaume Rousse <Guillaume.Rousse@inria.fr>
To: autofs@linux.kernel.org
Subject: Re: Lost patch
Date: Mon, 21 Aug 2006 16:47:33 +0200 [thread overview]
Message-ID: <44E9C785.5000104@inria.fr> (raw)
In-Reply-To: <1154934063.11586.3.camel@raven.themaw.net>
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:
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
+#
+
+# 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
+
+# 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"
+
+# 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"
+
+# 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
--
Guillaume Rousse
Projet Estime, INRIA
Domaine de Voluceau
Rocquencourt - B.P. 105
78153 Le Chesnay Cedex - France
next prev parent reply other threads:[~2006-08-21 14:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-03 15:12 Lost patch Guillaume Rousse
2006-08-04 13:58 ` Ian Kent
2006-08-04 14:02 ` Guillaume Rousse
2006-08-07 7:01 ` Ian Kent
2006-08-21 14:47 ` Guillaume Rousse [this message]
2006-08-23 3:20 ` Ian Kent
2006-08-23 14:26 ` Guillaume Rousse
-- strict thread matches above, loose matches on Subject: below --
2020-06-07 13:55 Simon Glass
2022-03-09 23:12 Patrick Venture
2022-03-10 0:16 ` Philippe Mathieu-Daudé
2022-03-10 0:44 ` Patrick Venture
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=44E9C785.5000104@inria.fr \
--to=guillaume.rousse@inria.fr \
--cc=autofs@linux.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.