Don't try to verify capabilities of directories and non-regular files
authorPanu Matilainen <pmatilai@redhat.com>
Wed, 29 Oct 2008 08:39:00 +0000 (10:39 +0200)
committerPanu Matilainen <pmatilai@redhat.com>
Wed, 29 Oct 2008 08:39:00 +0000 (10:39 +0200)
lib/verify.c

index c4ce118..4658ce9 100644 (file)
@@ -58,23 +58,23 @@ int rpmVerifyFile(const rpmts ts, const rpmfi fi,
      */
     if (S_ISDIR(sb.st_mode))
        flags &= ~(RPMVERIFY_MD5 | RPMVERIFY_FILESIZE | RPMVERIFY_MTIME | 
-                       RPMVERIFY_LINKTO);
+                       RPMVERIFY_LINKTO | RPMVERIFY_CAPS);
     else if (S_ISLNK(sb.st_mode)) {
        flags &= ~(RPMVERIFY_MD5 | RPMVERIFY_FILESIZE | RPMVERIFY_MTIME |
-               RPMVERIFY_MODE);
+                       RPMVERIFY_MODE | RPMVERIFY_CAPS);
 #if CHOWN_FOLLOWS_SYMLINK
            flags &= ~(RPMVERIFY_USER | RPMVERIFY_GROUP);
 #endif
     }
     else if (S_ISFIFO(sb.st_mode))
        flags &= ~(RPMVERIFY_MD5 | RPMVERIFY_FILESIZE | RPMVERIFY_MTIME | 
-                       RPMVERIFY_LINKTO);
+                       RPMVERIFY_LINKTO | RPMVERIFY_CAPS);
     else if (S_ISCHR(sb.st_mode))
        flags &= ~(RPMVERIFY_MD5 | RPMVERIFY_FILESIZE | RPMVERIFY_MTIME | 
-                       RPMVERIFY_LINKTO);
+                       RPMVERIFY_LINKTO | RPMVERIFY_CAPS);
     else if (S_ISBLK(sb.st_mode))
        flags &= ~(RPMVERIFY_MD5 | RPMVERIFY_FILESIZE | RPMVERIFY_MTIME | 
-                       RPMVERIFY_LINKTO);
+                       RPMVERIFY_LINKTO | RPMVERIFY_CAPS);
     else 
        flags &= ~(RPMVERIFY_LINKTO);