rpms/autofs/FC-5 autofs-4.1.3-ldap-auto-master.patch, NONE, 1.1 autofs-4.1.4-auto_net-escape-hash.patch, NONE, 1.1

[fedora-cvs-commits at redhat.com]

Author: ikent

Update of /cvs/dist/rpms/autofs/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26607

Added Files:
	autofs-4.1.3-ldap-auto-master.patch 
	autofs-4.1.4-auto_net-escape-hash.patch 
Log Message:
Oops forget to add autofs-4.1.3-ldap-auto-master.patch and autofs-4.1.4-auto_net-escape-hash.patch


autofs-4.1.3-ldap-auto-master.patch:
 redhat/autofs.sysconfig |    4 ++++
 samples/rc.autofs.in    |    3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE autofs-4.1.3-ldap-auto-master.patch ---
diff -Nurp autofs-4.1.4.orig/redhat/autofs.sysconfig autofs-4.1.4/redhat/autofs.sysconfig
--- autofs-4.1.4.orig/redhat/autofs.sysconfig	2005-01-17 09:53:17.000000000 -0500
+++ autofs-4.1.4/redhat/autofs.sysconfig	2006-04-11 07:17:34.000000000 -0400
@@ -19,3 +19,7 @@ DISABLE_DIRECT=1
 # this value.
 DAEMON_EXIT_WAIT=10
 
+# LDAPAUTOMASTER contains command line arguments for the
+# /usr/lib/autofs/autofs-ldap-auto-master program
+# Run the program with --help to see available options
+LDAPAUTOMASTER=""
diff -Nurp autofs-4.1.4.orig/samples/rc.autofs.in autofs-4.1.4/samples/rc.autofs.in
--- autofs-4.1.4.orig/samples/rc.autofs.in	2006-04-11 07:05:00.000000000 -0400
+++ autofs-4.1.4/samples/rc.autofs.in	2006-04-11 07:15:03.000000000 -0400
@@ -85,6 +85,7 @@ if [ "$system" = "redhat" ]; then
 	DISABLE_DIRECT=1
 	DAEMON_EXIT_WAIT=20
 	ONE_AUTO_MASTER=0
+	LDAPAUTOMASTER=""
 
 	[ -f /etc/sysconfig/autofs ] && . /etc/sysconfig/autofs
 
@@ -165,7 +166,7 @@ function getnismounts()
 function getldapmounts()
 {
     if [ -x @@autofslibdir@@/autofs-ldap-auto-master ]; then
-        @@autofslibdir@@/autofs-ldap-auto-master 2> /dev/null
+        @@autofslibdir@@/autofs-ldap-auto-master $LDAPAUTOMASTER 2> /dev/null
     fi
 }
 

autofs-4.1.4-auto_net-escape-hash.patch:
 auto.net |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE autofs-4.1.4-auto_net-escape-hash.patch ---
diff -Nurp autofs-4.1.4.orig/samples/auto.net autofs-4.1.4/samples/auto.net
--- autofs-4.1.4.orig/samples/auto.net	2006-04-11 09:24:17.000000000 -0400
+++ autofs-4.1.4/samples/auto.net	2006-04-11 09:27:24.000000000 -0400
@@ -42,4 +42,4 @@ $SHOWMOUNT | LC_ALL=C sort -k 1 | \
 	BEGIN	{ ORS=""; first=1 }
 		{ if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 }
 	END	{ if (!first) print "\n"; else exit 1 }
-	'
+	' | sed 's/#/\\#/g'