Attachment 147465 Details for Bug 193771 – Squidguard 1.4 helper protocol patch.

[patch] Squidguard 1.4 helper protocol patch.

squidGuard-1.4_upgrade.patch (text/plain), 2.56 KB, created by adrik on 2014-09-19 14:24:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: adrik

Created: 2014-09-19 14:24:15 UTC

Size: 2.56 KB

patch

obsolete

>diff -urN squidGuard-1.4.orig/src/main.c squidGuard-1.4.upgraded/src/main.c
>--- squidGuard-1.4.orig/src/main.c	2013-12-11 17:42:15.000000000 +1300
>+++ squidGuard-1.4.upgraded/src/main.c	2013-12-11 19:04:09.000000000 +1300
>@@ -175,7 +175,7 @@
> 	sgReloadConfig();
>       }
>       if(failsafe_mode) {
>-	puts("");
>+	puts("ERR message=\"squidGuard failsafe mode\"");
> 	fflush(stdout);
> 	if(sig_hup){
>           sgReloadConfig();
>@@ -184,7 +184,7 @@
>       }
>       if(parseLine(buf,&squidInfo) != 1){
> 	sgLogError("Error parsing squid line: %s",buf);
>-	puts("");
>+	puts("BH message=\"squidGuard error parsing squid line\"");
>       }
>         else {
> 	src = Source;
>@@ -196,14 +196,14 @@
> 	  acl = sgAclCheckSource(src);
> 	  if((redirect = sgAclAccess(src,acl,&squidInfo)) == NULL){
> 	    if(src == NULL || src->cont_search == 0){
>-	      puts(""); 
>+	      puts("ERR");
> 	      break;
> 	    } else
> 	      if(src->next != NULL){
> 		src = src->next;
> 		continue;
> 	      } else {
>-		puts("");
>+		puts("ERR");
> 		break;
> 	      }
> 	  } else {
>@@ -215,9 +215,10 @@
> 	      squidInfo.ident[0] = '-';
> 	      squidInfo.ident[1] = '\0';
> 	    }
>-	    fprintf(stdout,"%s %s/%s %s %s\n",redirect,squidInfo.src,
>-		    squidInfo.srcDomain,squidInfo.ident,
>-		    squidInfo.method);
>+	    if (isdigit(redirect[0]) && isdigit(redirect[1]) && isdigit(redirect[2]) && redirect[3]==':') {
>+	      fprintf(stdout,"OK status=%c%c%c url=\"%s\"\n", redirect[0], redirect[1], redirect[2], &redirect[4]);
>+	    } else
>+	      fprintf(stdout,"OK rewrite-url=\"%s\"\n",redirect);
>             /* sgLogError("%s %s/%s %s %s\n",redirect,squidInfo.src,squidInfo.srcDomain,squidInfo.ident,squidInfo.method);  */
> 	    break;
> 	  }
>diff -urN squidGuard-1.4.orig/src/sgDiv.c squidGuard-1.4.upgraded/src/sgDiv.c
>--- squidGuard-1.4.orig/src/sgDiv.c	2013-12-11 17:42:15.000000000 +1300
>+++ squidGuard-1.4.upgraded/src/sgDiv.c	2013-12-11 18:58:33.000000000 +1300
>@@ -771,7 +771,7 @@
>   }
>   sgLogError("Going into emergency mode");
>   while(fgets(buf, MAX_BUF, stdin) != NULL){
>-    puts("");
>+    puts("ERR");
>     fflush(stdout);
>   }
>   sgLogError("ending emergency mode, stdin empty");
>diff -urN squidGuard-1.4.orig/src/sgDiv.c.in squidGuard-1.4.upgraded/src/sgDiv.c.in
>--- squidGuard-1.4.orig/src/sgDiv.c.in	2013-12-11 17:42:15.000000000 +1300
>+++ squidGuard-1.4.upgraded/src/sgDiv.c.in	2013-12-11 18:58:40.000000000 +1300
>@@ -782,7 +782,7 @@
>   }
>   sgLogError("Going into emergency mode");
>   while(fgets(buf, MAX_BUF, stdin) != NULL){
>-    puts("");
>+    puts("ERR");
>     fflush(stdout);
>   }
>   sgLogError("ending emergency mode, stdin empty");

Actions: View | Diff

Attachments on bug 193771: 147465