@@ -1,3 +1,7 @@

+Fri Nov  7 13:20:08 CET 2008 (tk)

+---------------------------------

+ * freshclam/manager.c: improve reporting of server failures (bb#777)

+

 Fri Nov  7 13:28:03 EET 2008 (edwin)

 ------------------------------------

  * contrib/clamdtop/clamdtop.c: fix wrong free (thanks Nigel!)

@@ -665,14 +665,21 @@ int submitstats(const char *clamdcfg, const struct cfgstruct *copt)

 	    }

 	    ret = 52;

-	    if(strstr(post, "SUBMIT_PERMANENT_FAILURE")) {

+	    if((pt = strstr(post, "SUBMIT_PERMANENT_FAILURE"))) {

 		if(!submitted) {

-		    logg("!SubmitDetectionStats: Permanent failure\n");

 		    permfail = 1;

+		    if((pt + 32 <= post + sizeof(post)) && pt[24] == ':')

+			logg("!SubmitDetectionStats: Remote server reported permanent failure: %s\n", &pt[25]);

+		    else

+			logg("!SubmitDetectionStats: Remote server reported permanent failure\n");

+		}

+	    } else if((pt = strstr(post, "SUBMIT_TEMPORARY_FAILURE"))) {

+		if(!submitted) {

+		    if((pt + 32 <= post + sizeof(post)) && pt[24] == ':')

+			logg("!SubmitDetectionStats: Remote server reported temporary failure: %s\n", &pt[25]);

+		    else

+			logg("!SubmitDetectionStats: Remote server reported temporary failure\n");

 		}

-	    } else if(strstr(post, "SUBMIT_TEMPORARY_FAILURE")) {

-		if(!submitted)

-		    logg("!SubmitDetectionStats: Temporary failure\n");

 	    } else {

 		if(!submitted)

 		    logg("!SubmitDetectionStats: Incorrect answer from server\n");