Attachment 228491 Details for Bug 333821 – Patch to add quoting for exports gathered by hosts map.

[patch] Patch to add quoting for exports gathered by hosts map.

autofs-5.0.2-quote-exports.patch (text/plain), 1.51 KB, created by Ian Kent on 2007-10-16 09:57:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Kent

Created: 2007-10-16 09:57:00 UTC

Size: 1.51 KB

patch

obsolete

>diff --git a/modules/lookup_hosts.c b/modules/lookup_hosts.c
>index a9a4c75..1f8fa15 100644
>--- a/modules/lookup_hosts.c
>+++ b/modules/lookup_hosts.c
>@@ -215,7 +215,7 @@ done:
> 		if (mapent) {
> 			int len = strlen(mapent) + 1;
> 
>-			len += strlen(name) + 2*strlen(exp->ex_dir) + 3;
>+			len += strlen(name) + 2*(strlen(exp->ex_dir) + 2) + 3;
> 			mapent = realloc(mapent, len);
> 			if (!mapent) {
> 				char *estr;
>@@ -224,10 +224,11 @@ done:
> 				rpc_exports_free(exp);
> 				return NSS_STATUS_UNAVAIL;
> 			}
>-			strcat(mapent, " ");
>+			strcat(mapent, " \"");
> 			strcat(mapent, exp->ex_dir);
>+			strcat(mapent, "\"");
> 		} else {
>-			int len = 2*strlen(exp->ex_dir) + strlen(name) + 3;
>+			int len = 2*(strlen(exp->ex_dir) + 2) + strlen(name) + 3;
> 
> 			mapent = malloc(len);
> 			if (!mapent) {
>@@ -237,12 +238,15 @@ done:
> 				rpc_exports_free(exp);
> 				return NSS_STATUS_UNAVAIL;
> 			}
>-			strcpy(mapent, exp->ex_dir);
>+			strcpy(mapent, "\"");
>+			strcat(mapent, exp->ex_dir);
>+			strcat(mapent, "\"");
> 		}
>-		strcat(mapent, " ");
>+		strcat(mapent, " \"");
> 		strcat(mapent, name);
> 		strcat(mapent, ":");
> 		strcat(mapent, exp->ex_dir);
>+		strcat(mapent, "\"");
> 
> 		exp = exp->ex_next;
> 	}
>@@ -260,13 +264,9 @@ done:
> 	cache_update(mc, source, name, mapent, now);
> 	cache_unlock(mc);
> 
>-	debug(LOGOPT_ANY, "source wait");
>-
> 	master_source_current_wait(ap->entry);
> 	ap->entry->current = source;
> 
>-	debug(LOGOPT_ANY, "do parse_mount");
>-
> 	ret = ctxt->parse->parse_mount(ap, name, name_len,
> 				 mapent, ctxt->parse->context);
> 	free(mapent);

Actions: View | Diff

Attachments on bug 333821: 228491