Lost patch

Lost patch

[Guillaume Rousse]

I tried two times already to send a patch to the list without success,
despite they were quite small (5Kb). What is the problem ?
-- 
Guillaume Rousse
Projet Estime, INRIA
Domaine de Voluceau
Rocquencourt - B.P. 105
78153 Le Chesnay Cedex - France

Re: Lost patch

[Ian Kent]

On Thu, 2006-08-03 at 17:12 +0200, Guillaume Rousse wrote:
> I tried two times already to send a patch to the list without success,
> despite they were quite small (5Kb). What is the problem ?

Don't know.
It looks like they never reached the list server.
I can't see anything waiting in the moderator queue.

Ian

Re: Lost patch

[Guillaume Rousse]

[-- Attachment #1: Type: text/plain, Size: 920 bytes --]

Ian Kent wrote:
> On Thu, 2006-08-03 at 17:12 +0200, Guillaume Rousse wrote:
>> I tried two times already to send a patch to the list without success,
>> despite they were quite small (5Kb). What is the problem ?
> 
> Don't know.
> It looks like they never reached the list server.
> I can't see anything waiting in the moderator queue.
Strange.
Here it is, keeping you in CC this time.

Current autofs code prefixes all its configuration directive with
DEFAULT, which is misleading: what you configure is actual value,
whereas default is what is used when no actual value is provided.

The attached patche remove the DEFAULT_ prefix for all these variables,
and rework the sample configuration file to have all its directives
commented with their default values, as openssh does, to make it clearer.

-- 
Guillaume Rousse
Projet Estime, INRIA
Domaine de Voluceau
Rocquencourt - B.P. 105
78153 Le Chesnay Cedex - France

[-- Attachment #2: autofs-5.0.1.config.patch --]
[-- Type: text/x-patch, Size: 4010 bytes --]

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

[-- Attachment #3: Type: text/plain, Size: 140 bytes --]

_______________________________________________
autofs mailing list
autofs@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/autofs

Re: Lost patch

[Ian Kent]

On Fri, 2006-08-04 at 16:02 +0200, Guillaume Rousse wrote:
> Ian Kent wrote:
> > On Thu, 2006-08-03 at 17:12 +0200, Guillaume Rousse wrote:
> >> I tried two times already to send a patch to the list without success,
> >> despite they were quite small (5Kb). What is the problem ?
> > 
> > Don't know.
> > It looks like they never reached the list server.
> > I can't see anything waiting in the moderator queue.
> Strange.
> Here it is, keeping you in CC this time.
> 
> Current autofs code prefixes all its configuration directive with
> DEFAULT, which is misleading: what you configure is actual value,
> whereas default is what is used when no actual value is provided.
> 
> The attached patche remove the DEFAULT_ prefix for all these variables,
> and rework the sample configuration file to have all its directives
> commented with their default values, as openssh does, to make it clearer.

Please don't send patches as attachments put them in-line with the mail.
It's a pain reply with comments.

Ian

Re: Lost patch

[Guillaume Rousse]

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

Re: Lost patch

[Ian Kent]

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

Re: Lost patch

[Guillaume Rousse]

Ian Kent wrote:
> 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?
Actually not, otherwise I would have noticed I've been confused between
redhat/ and samples/ directories :/. Is this really useful to keep
redhat-specific stuff there ?

Here is a corrected version that just change the DEFAULT_ prefixes
without altering default values, as it needs further discussion:
diff -Naur autofs-5.0.1/lib/defaults.c
autofs-5.0.1-drop-default-profix-from-config/lib/defaults.c
--- autofs-5.0.1/lib/defaults.c	2006-07-13 10:11:38.000000000 +0200
+++ autofs-5.0.1-drop-default-profix-from-config/lib/defaults.c
2006-08-23 14:21:55.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/samples/autofs.conf.default.in
autofs-5.0.1-drop-default-profix-from-config/samples/autofs.conf.default.in
--- autofs-5.0.1/samples/autofs.conf.default.in	2006-07-13
10:11:39.000000000 +0200
+++
autofs-5.0.1-drop-default-profix-from-config/samples/autofs.conf.default.in
2006-08-23 14:22:24.000000000 +0200
@@ -1,50 +1,50 @@
 #
 # Define default options for autofs.
 #
-# DEFAULT_MASTER_MAP_NAME - default map name for the master map.
+# MASTER_MAP_NAME - default map name for the master map.
 #
-#DEFAULT_MASTER_MAP_NAME="auto.master"
+#MASTER_MAP_NAME="auto.master"
 #
-# DEFAULT_TIMEOUT - set the default mount timeout (default 600).
+# TIMEOUT - set the default mount timeout (default 600).
 #
-DEFAULT_TIMEOUT=300
+TIMEOUT=300
 #
-# DEFAULT_BROWSE_MODE - maps are browsable by default.
+# BROWSE_MODE - maps are browsable by default.
 #
-DEFAULT_BROWSE_MODE="no"
+BROWSE_MODE="no"
 #
-# DEFAULT_LOGGING - set default log level "none", "verbose" or "debug"
+# LOGGING - set default log level "none", "verbose" or "debug"
 #
-#DEFAULT_LOGGING="none"
+#LOGGING="none"
 #
 # Define the default LDAP schema to use for lookups
 #
 # System default
 #
-#DEFAULT_MAP_OBJECT_CLASS="nisMap"
-#DEFAULT_ENTRY_OBJECT_CLASS="nisObject"
-#DEFAULT_MAP_ATTRIBUTE="nisMapName"
-#DEFAULT_ENTRY_ATTRIBUTE="cn"
-#DEFAULT_VALUE_ATTRIBUTE="nisMapEntry"
+#MAP_OBJECT_CLASS="nisMap"
+#ENTRY_OBJECT_CLASS="nisObject"
+#MAP_ATTRIBUTE="nisMapName"
+#ENTRY_ATTRIBUTE="cn"
+#VALUE_ATTRIBUTE="nisMapEntry"
 #
 # Other common LDAP nameing
 #
-#DEFAULT_MAP_OBJECT_CLASS="automountMap"
-#DEFAULT_ENTRY_OBJECT_CLASS="automount"
-#DEFAULT_MAP_ATTRIBUTE="ou"
-#DEFAULT_ENTRY_ATTRIBUTE="cn"
-#DEFAULT_VALUE_ATTRIBUTE="automountInformation"
-#
-#DEFAULT_MAP_OBJECT_CLASS="automountMap"
-#DEFAULT_ENTRY_OBJECT_CLASS="automount"
-#DEFAULT_MAP_ATTRIBUTE="automountMapName"
-#DEFAULT_ENTRY_ATTRIBUTE="automountKey"
-#DEFAULT_VALUE_ATTRIBUTE="automountInformation"
+#MAP_OBJECT_CLASS="automountMap"
+#ENTRY_OBJECT_CLASS="automount"
+#MAP_ATTRIBUTE="ou"
+#ENTRY_ATTRIBUTE="cn"
+#VALUE_ATTRIBUTE="automountInformation"
+#
+#MAP_OBJECT_CLASS="automountMap"
+#ENTRY_OBJECT_CLASS="automount"
+#MAP_ATTRIBUTE="automountMapName"
+#ENTRY_ATTRIBUTE="automountKey"
+#VALUE_ATTRIBUTE="automountInformation"
 #
-# DEFAULT_AUTH_CONF_FILE - set the default location for the SASL
+# AUTH_CONF_FILE - set the default location for the SASL
 #			   authentication configuration file.
 #
-#DEFAULT_AUTH_CONF_FILE="@@autofsmapdir@@/autofs_ldap_auth.conf"
+#AUTH_CONF_FILE="@@autofsmapdir@@/autofs_ldap_auth.conf"
 #
 # General global options
 #

[..]
>> -# System default
>> +# autofs server configuration
> 
> I always thought of autofs is a client not a server.
I just wanted to express the difference between daemon and service
script configuration. Feel free to express it differently.

> The config needs to reflect the setup of previous versions of autofs.
It depend what you want to achieve. If you want to make the transition
easier, you're right, but not if you want to provide quick references
about default values in the configuration file. I'd rather document the
changes in release notes, or eventually change the defaults values in
defaults.h.

[..]
>> -# Other common LDAP nameing
>> +#TIMEOUT=600
> 
> Should be 300 not 600.
600 is the default.

[..]
>> +#BROWSE_MODE="yes"
> 
> Should be set to "no".
yes is the default.

[..]
>> +# 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.
OK, but then I'd rather use a different formating, to have a better
visual identification of available configuration directives, such as:

# Name used for object class. Other common value may be "automountMap"
#MAP_OBJECT_CLASS="nisMap"

-- 
Guillaume Rousse
Projet Estime, INRIA
Domaine de Voluceau
Rocquencourt - B.P. 105
78153 Le Chesnay Cedex - France

Lost patch

[Simon Glass]

Hi Heinrich,

You apparently sent a patch[1] that is not in my email. Can you please
resend it?

Regards,
Simon

[1] https://patchwork.ozlabs.org/project/uboot/patch/20200531150927.538311-1-xypron.glpk at gmx.de/

Lost patch

[Patrick Venture]

[-- Attachment #1: Type: text/plain, Size: 274 bytes --]

Corey and Peter;

I was about to submit a fix to the at24c-eeprom device and noticed that my
v2 patch appears to have been lost to time.  Is there any way we can get
this pulled into 7.0?

https://lists.gnu.org/archive/html/qemu-devel/2021-12/msg03485.html

Thanks,
Patrick

[-- Attachment #2: Type: text/html, Size: 466 bytes --]

Re: Lost patch

[Philippe Mathieu-Daudé]

On 10/3/22 00:12, Patrick Venture wrote:
> Corey and Peter;
> 
> I was about to submit a fix to the at24c-eeprom device and noticed that 
> my v2 patch appears to have been lost to time.  Is there any way we can 
> get this pulled into 7.0?
> 
> https://lists.gnu.org/archive/html/qemu-devel/2021-12/msg03485.html 

Thanks for noticing.

It is a bugfix so it is still good to go. I'm queuing it (except if
Peter beats me via qemu-arm) and will send a pullreq for it on next
Monday.

Regards,

Phil.

Re: Lost patch

[Patrick Venture]

[-- Attachment #1: Type: text/plain, Size: 665 bytes --]

On Wed, Mar 9, 2022 at 4:16 PM Philippe Mathieu-Daudé <
philippe.mathieu.daude@gmail.com> wrote:

> On 10/3/22 00:12, Patrick Venture wrote:
> > Corey and Peter;
> >
> > I was about to submit a fix to the at24c-eeprom device and noticed that
> > my v2 patch appears to have been lost to time.  Is there any way we can
> > get this pulled into 7.0?
> >
> > https://lists.gnu.org/archive/html/qemu-devel/2021-12/msg03485.html
>
> Thanks for noticing.
>
> It is a bugfix so it is still good to go. I'm queuing it (except if
> Peter beats me via qemu-arm) and will send a pullreq for it on next
> Monday.
>
> Regards,
>

Thanks!

>
> Phil.
>

[-- Attachment #2: Type: text/html, Size: 1317 bytes --]