[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/autofs/FC-5 autofs-4.1.4-discard-bg-nofg-options.patch, NONE, 1.1 autofs-4.1.4-no-first-message.patch, NONE, 1.1 autofs.spec, 1.80, 1.81



Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-4.1.4-discard-bg-nofg-options.patch 
	autofs-4.1.4-no-first-message.patch 
Log Message:
* Mon Jun 19 2006 Ian Kent <ikent redhat com> - 1:4.1.4-27
- Change LDAP message severity from crit to degug (bz# 183893).
- Add patch to ignore the "bg" and "fg" mount options as they
  aren't relevant for autofs mounts (bz# 184386).


autofs-4.1.4-discard-bg-nofg-options.patch:
 parse_sun.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE autofs-4.1.4-discard-bg-nofg-options.patch ---
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 43d6717..da5f63f 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -589,6 +589,9 @@ static int sun_mount(struct autofs_point
 				nonstrict = 0;
 			} else if (strncmp("nonstrict", cp, 9) == 0) {
 				nonstrict = 1;
+			} else if (strncmp("bg", cp, 2) == 0 ||
+				   strncmp("nofg", cp, 4) == 0) {
+				continue;
 			} else {
 				memcpy(np, cp, comma - cp + 1);
 				np += comma - cp + 1;

autofs-4.1.4-no-first-message.patch:
 lookup_ldap.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE autofs-4.1.4-no-first-message.patch ---
--- autofs-4.1.4_beta2/modules/lookup_ldap.c.no-first-message	2005-06-27 23:41:03.000000000 +0800
+++ autofs-4.1.4_beta2/modules/lookup_ldap.c	2005-06-27 23:42:38.000000000 +0800
@@ -429,7 +429,7 @@ static int lookup_one(const char *root, 
 
 	e = ldap_first_entry(ldap, result);
 	if (!e) {
-		crit(MODPREFIX "got answer, but no first entry for %s", query);
+		debug(MODPREFIX "got answer, but no first entry for %s", query);
 		ldap_msgfree(result);
 		ldap_unbind(ldap);
 		return CHE_MISSING;
@@ -537,7 +537,7 @@ static int lookup_wild(const char *root,
 
 	e = ldap_first_entry(ldap, result);
 	if (!e) {
-		crit(MODPREFIX "got answer, but no first entry for %s", query);
+		debug(MODPREFIX "got answer, but no first entry for %s", query);
 		ldap_msgfree(result);
 		ldap_unbind(ldap);
 		return CHE_MISSING;


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-5/autofs.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- autofs.spec	30 May 2006 04:10:45 -0000	1.80
+++ autofs.spec	19 Jun 2006 07:13:42 -0000	1.81
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.4
-%define release 25
+%define release 27
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -39,6 +39,8 @@
 Patch26: autofs-4.1.4-auto_net-escape-hash.patch
 Patch27: autofs-4.1.4-auto.smb-cifs.patch
 Patch28: autofs-4.1.4-get_best_mount-white-space.patch
+Patch29: autofs-4.1.4-discard-bg-nofg-options.patch
+Patch30:  autofs-4.1.4-no-first-message.patch
 
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
@@ -106,6 +108,8 @@
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+%patch29 -p1
+%patch30 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -159,6 +163,11 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Mon Jun 19 2006 Ian Kent <ikent redhat com> - 1:4.1.4-27
+- Change LDAP message severity from crit to degug (bz# 183893).
+- Add patch to ignore the "bg" and "fg" mount options as they
+  aren't relevant for autofs mounts (bz# 184386).
+
 * Tue May 30 2006 Ian Kent <ikent redhat com> - 1:4.1.4-25
 - add patch to fix white space handling in get_best_mount
   function (bz #163999).


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]