rpms/autofs/devel autofs-5.0.0_beta3-hesiod-update.patch, 1.1, 1.2 autofs.spec, 1.90, 1.91

[fedora-cvs-commits at redhat.com]

Author: ikent

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

Modified Files:
	autofs-5.0.0_beta3-hesiod-update.patch autofs.spec 
Log Message:
* Sat May 27 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta3-4
- updated hesiod patch.


autofs-5.0.0_beta3-hesiod-update.patch:
 CHANGELOG               |    4 +++
 configure               |   20 +++++++++---------
 configure.in            |    2 -
 modules/lookup_hesiod.c |   53 +++++++++++++++++++++++++++++++++++++++---------
 4 files changed, 59 insertions(+), 20 deletions(-)

Index: autofs-5.0.0_beta3-hesiod-update.patch
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs-5.0.0_beta3-hesiod-update.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autofs-5.0.0_beta3-hesiod-update.patch	27 May 2006 07:59:47 -0000	1.1
+++ autofs-5.0.0_beta3-hesiod-update.patch	27 May 2006 09:23:21 -0000	1.2
@@ -1,5 +1,5 @@
 --- autofs-5.0.0_beta3/modules/lookup_hesiod.c.hesiod-update	2006-05-22 23:28:48.000000000 -0400
-+++ autofs-5.0.0_beta3/modules/lookup_hesiod.c	2006-05-27 03:53:13.000000000 -0400
++++ autofs-5.0.0_beta3/modules/lookup_hesiod.c	2006-05-27 04:53:45.000000000 -0400
 @@ -29,8 +29,11 @@
  
  struct lookup_context {
@@ -49,7 +49,7 @@
  	char **record, *best_record = NULL, *p;
  	int priority, lowest_priority = INT_MAX;	
  
-@@ -86,11 +98,16 @@
+@@ -86,11 +98,19 @@
  	chdir("/");		/* If this is not here the filesystem stays
  				   busy, for some reason... */
  
@@ -64,11 +64,14 @@
 +		 * the "no search results" case and other failures.  --JM */
  		warn(MODPREFIX "entry \"%s\" not found in map", name);
 -		return NSS_STATUS_UNAVAIL;
++		status = pthread_mutex_unlock(&hesiod_mutex);
++		if (status)
++			fatal(status);
 +		return NSS_STATUS_NOTFOUND;
  	}
  
  	/* autofs doesn't support falling back to alternate records, so just
-@@ -113,8 +130,21 @@
+@@ -113,8 +133,21 @@
  
  	rv = ctxt->parser->parse_mount(ap, name, name_len, best_record,
  				       ctxt->parser->context);
@@ -92,7 +95,7 @@
  }
  
  /* This destroys a context for queries to this module.  It releases the parser
-@@ -123,6 +153,8 @@
+@@ -123,6 +156,8 @@
  {
  	struct lookup_context *ctxt = (struct lookup_context *) context;
  	int rv = close_parse(ctxt->parser);
@@ -101,8 +104,8 @@
  	free(ctxt);
  	return rv;
  }
---- autofs-5.0.0_beta3/CHANGELOG.hesiod-update	2006-05-27 03:52:25.000000000 -0400
-+++ autofs-5.0.0_beta3/CHANGELOG	2006-05-27 03:54:40.000000000 -0400
+--- autofs-5.0.0_beta3/CHANGELOG.hesiod-update	2006-05-27 04:53:18.000000000 -0400
++++ autofs-5.0.0_beta3/CHANGELOG	2006-05-27 04:54:09.000000000 -0400
 @@ -4,6 +4,10 @@
  - add "_" to "." mapname translation to nis lookup module.
  - fix white space handling in replicated server selection code.
@@ -115,7 +118,7 @@
  23/5/2006 autofs-5.0.0_beta3
  ----------------------------
 --- autofs-5.0.0_beta3/configure.hesiod-update	2006-05-22 23:28:48.000000000 -0400
-+++ autofs-5.0.0_beta3/configure	2006-05-27 03:53:13.000000000 -0400
++++ autofs-5.0.0_beta3/configure	2006-05-27 04:53:44.000000000 -0400
 @@ -3168,9 +3168,9 @@
  if test -z "$HAVE_HESIOD"
  then
@@ -170,7 +173,7 @@
  fi
  
 --- autofs-5.0.0_beta3/configure.in.hesiod-update	2006-05-22 23:28:48.000000000 -0400
-+++ autofs-5.0.0_beta3/configure.in	2006-05-27 03:53:13.000000000 -0400
++++ autofs-5.0.0_beta3/configure.in	2006-05-27 04:53:45.000000000 -0400
 @@ -143,7 +143,7 @@
  if test -z "$HAVE_HESIOD"
  then


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- autofs.spec	27 May 2006 07:59:47 -0000	1.90
+++ autofs.spec	27 May 2006 09:23:21 -0000	1.91
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.0_beta3
-%define release 3
+%define release 4
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -125,6 +125,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Sat May 27 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta3-4
+- updated hesiod patch.
+
 * Sat May 27 2006 Ian Kent <ikent at redhat.com> - 5.0.0_beta3-3
 - update hesiod module (Jeff Moyer).
   - add mutex to protect against overlapping mount requests.