Attachment 6465 Details for Bug 8157 – git-am fix for 3.6.0

[patch] git-am fix for 3.6.0

0001-Fix-bug-8157-std_pcap_cache_reload-fails-to-parse-a-.patch (text/plain), 1.62 KB, created by Jeremy Allison on 2011-05-20 19:53:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2011-05-20 19:53:18 UTC

Size: 1.62 KB

patch

obsolete

>From 3f7f4c642498dd6e7c5fc3d48d64d48c82c655ed Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Fri, 20 May 2011 12:27:02 -0700
>Subject: [PATCH] Fix bug #8157 - std_pcap_cache_reload() fails to parse a cups printcap file correctly.
>
>The parsing code made some strange assumptions about what is a printer
>name, and what is a comment.
>---
> source3/printing/print_standard.c |   13 +++++--------
> 1 files changed, 5 insertions(+), 8 deletions(-)
>
>diff --git a/source3/printing/print_standard.c b/source3/printing/print_standard.c
>index 6a86d84..c4f9c5b 100644
>--- a/source3/printing/print_standard.c
>+++ b/source3/printing/print_standard.c
>@@ -93,6 +93,10 @@ bool std_pcap_cache_reload(const char *pcap_name)
> 
> 			has_punctuation = (strchr_m(p, ' ') ||
> 			                   strchr_m(p, '\t') ||
>+					   strchr_m(p, '"') ||
>+					   strchr_m(p, '\'') ||
>+					   strchr_m(p, ';') ||
>+					   strchr_m(p, ',') ||
> 			                   strchr_m(p, '(') ||
> 			                   strchr_m(p, ')'));
> 
>@@ -101,11 +105,7 @@ bool std_pcap_cache_reload(const char *pcap_name)
> 				continue;
> 			}
> 
>-			if (strlen(p) <= MAXPRINTERLEN &&
>-			    strlen(p) > strlen(name) && !has_punctuation) {
>-				if (!*comment) {
>-					strlcpy(comment, name, sizeof(comment));
>-				}
>+			if (strlen(p) <= MAXPRINTERLEN && *name == '\0' && !has_punctuation) {
> 				strlcpy(name, p, sizeof(name));
> 				continue;
> 			}
>@@ -117,9 +117,6 @@ bool std_pcap_cache_reload(const char *pcap_name)
> 			}
> 		}
> 
>-		comment[60] = 0;
>-		name[MAXPRINTERLEN] = 0;
>-
> 		if (*name && !pcap_cache_add(name, comment, NULL)) {
> 			x_fclose(pcap_file);
> 			return false;
>-- 
>1.7.3.1
>

Flags:

gd: review+

Actions: View

Attachments on bug 8157: 6464 | 6465