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

+Wed Jan 31 14:21:36 CET 2007 (tk)

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

+  * freshclam: disable mirror manager when using proxy (bb#223)

+

 Tue Jan 30 22:25:36 CET 2007 (tk)

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

   * clamd: minor code cleanup

@@ -421,7 +421,7 @@ int main(int argc, char **argv)

     if(opt_check(opt, "list-mirrors")) {

-	if(mirman_read("mirrors.dat", &mdat) == -1) {

+	if(mirman_read("mirrors.dat", &mdat, 1) == -1) {

 	    printf("Can't read mirrors.dat\n");

 	    return 55;

 	}

@@ -1123,7 +1123,10 @@ int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, c

 	localip = cpt->strarg;

     }

-    mirman_read("mirrors.dat", &mdat);

+    if(cfgopt(copt, "HTTPProxyServer")->enabled)

+	mirman_read("mirrors.dat", &mdat, 0);

+    else

+	mirman_read("mirrors.dat", &mdat, 1);

     memset(ipaddr, 0, sizeof(ipaddr));

@@ -56,7 +56,7 @@ void mirman_free(struct mirdat *mdat)

     }

 }

-int mirman_read(const char *file, struct mirdat *mdat)

+int mirman_read(const char *file, struct mirdat *mdat, uint8_t active)

 {

 	struct mirdat_ip mip;

 	int fd, bread;

@@ -64,6 +64,9 @@ int mirman_read(const char *file, struct mirdat *mdat)

     memset(mdat, 0, sizeof(struct mirdat));

+    if(!(mdat->active = active))

+	return 0;

+

     if((fd = open(file, O_RDONLY|O_BINARY)) == -1)

 	return -1;

@@ -96,6 +99,9 @@ int mirman_check(uint32_t ip, struct mirdat *mdat)

 	unsigned int i, flevel = cl_retflevel();

+    if(!mdat->active)

+	return 0;

+

     for(i = 0; i < mdat->num; i++) {

 	if(mdat->mirtab[i].ip == ip) {

@@ -122,6 +128,9 @@ int mirman_update(uint32_t ip, struct mirdat *mdat, uint8_t broken)

 	unsigned int i, found = 0;

+    if(!mdat->active)

+	return 0;

+

     for(i = 0; i < mdat->num; i++) {

 	if(mdat->mirtab[i].ip == ip) {

 	    found = 1;

@@ -31,13 +31,14 @@ struct mirdat_ip {

 };

 struct mirdat {

+    uint8_t active;

     unsigned int num;

     uint32_t currip;

     uint32_t dbflevel;

     struct mirdat_ip *mirtab;

 };

-int mirman_read(const char *file, struct mirdat *mdat);

+int mirman_read(const char *file, struct mirdat *mdat, uint8_t active);

 int mirman_check(uint32_t ip, struct mirdat *mdat);

 int mirman_update(uint32_t ip, struct mirdat *mdat, uint8_t broken);

 void mirman_list(const struct mirdat *mdat);