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

+Mon Oct  8 17:12:52 CEST 2007 (tk)

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

+  * clamscan, clamdscan: check both st_dev and st_ino in move_infected()

+

 Mon Oct  8 17:02:30 CEST 2007 (tk)

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

   * clamconf: print version details for engine and databases

@@ -551,7 +551,7 @@ void move_infected(const char *filename, const struct optstruct *opt)

     }

     if(!stat(movefilename, &mfstat)) {

-        if(ofstat.st_ino == mfstat.st_ino) { /* It's the same file*/

+        if((ofstat.st_dev == mfstat.st_dev) && (ofstat.st_ino == mfstat.st_ino)) { /* It's the same file*/

             logg("File excluded '%s'\n", filename);

             notmoved++;

             free(movefilename);

@@ -578,7 +578,7 @@ static void move_infected(const char *filename, const struct optstruct *opt)

     stat(filename, &ofstat);

     if(!stat(movefilename, &mfstat)) {

-        if(ofstat.st_ino == mfstat.st_ino) { /* It's the same file*/

+        if((ofstat.st_dev == mfstat.st_dev) && (ofstat.st_ino == mfstat.st_ino)) { /* It's the same file*/

             logg("File excluded '%s'\n", filename);

             info.notmoved++;

             free(movefilename);