Attachment 309862 Details for Bug 450844 – Fix the previous patch to not loop infinitely upon finding a negative mapent.

[patch] Fix the previous patch to not loop infinitely upon finding a negative mapent.

autofs-4.1.3-teach-cache-about-negative-mapents.patch (text/plain), 1.26 KB, created by Jeff Moyer on 2008-06-19 16:04:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Moyer

Created: 2008-06-19 16:04:47 UTC

Size: 1.26 KB

patch

obsolete

>--- autofs-4.1.3/lib/cache.c.orig	2008-06-19 11:49:44.000000000 -0400
>+++ autofs-4.1.3/lib/cache.c	2008-06-19 11:50:57.000000000 -0400
>@@ -272,7 +272,7 @@ int cache_update(const char *root, const
> 		if (me->age == age)
> 			return CHE_OK;
> 
>-		if (strcmp(me->mapent, mapent) != 0) {
>+		if (!me->mapent || strcmp(me->mapent, mapent) != 0) {
> 			pent = malloc(strlen(mapent) + 1);
> 			if (pent == NULL) {
> 				return CHE_FAIL;
>@@ -432,10 +432,19 @@ int cache_ghost(const char *root, int gh
> 	for (i = 0; i < HASHSIZE; i++) {
> 		me = mapent_hash[i];
> 
>-		if (me == NULL)
>-			continue;
>-
> 		while (me != NULL) {
>+			/*
>+			 * Don't create directories for negative cache
>+			 * entries.  This shouldn't actually happen, as this
>+			 * function is only called after a cache_clean()
>+			 * which should clear out all negative entries.
>+			 */
>+			if (me->mapent == NULL) {
>+				debug("%s: unexpected negative entry found "
>+				      "for %s", __func__, me->key);
>+				me = me->next;
>+				continue;
>+			}
> 			strcpy(gc.key, me->key);
> 			strcpy(gc.mapent, me->mapent);
> 
>@@ -450,7 +459,7 @@ int cache_ghost(const char *root, int gh
> 					error("cache_ghost: wildcard map key "
> 					      "not valid in direct map");
> 				me = me->next;
>-				continue;;
>+				continue;
> 			}
> 
> 			switch (match) {

Actions: View | Diff

Attachments on bug 450844: 308945 | 309516 | 309862