Changeset 231

Timestamp:

May 13, 2009, 9:17:58 PM (15 years ago)

Author:

katerina

Message:

Recognize fdesc filesystem on MacOS X for suid check (ticket #153).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/sh_suidchk.c (modified) (4 diffs)

trunk/docs/Changelog

@@ +1 @@
+2.5.6:
+        * recognize fdesc filesystem on MacOS X for suid check (Problem
+          reported by David)
+
 2.5.5:
         * fix some warnings from gcc 4.4 (strict aliasing)

trunk/src/sh_suidchk.c

@@ -1006 +1006 @@
                 0 != strncmp (_("afs"),     fs, 3) && 
                 0 != strncmp (_("devfs"),   fs, 5) &&
+                0 != strncmp (_("fdesc"),   fs, 5) &&
                 0 != strncmp (_("iso9660"), fs, 7) &&
+                0 != strncmp (_("cd9660"),  fs, 6) &&
                 0 != strncmp (_("lustre"),  fs, 6) &&
                 0 != strncmp (_("mmfs"),    fs, 4) && 
@@ -1012 +1014 @@
                 0 != strncmp (_("nfs"),     fs, 3) &&
                 0 != strncmp (_("proc"),    fs, 4) &&
+                0 != strncmp (_("sysfs"),   fs, 5) &&
                 0 != strncmp (_("vfat"),    fs, 4)
 #endif 
@@ -1740 +1743 @@
   switch (t)
     {
+#ifdef MOUNT_UFS
     case MOUNT_UFS:
       return _("ufs");
+#endif
+#ifdef MOUNT_ISO9660
+    case MOUNT_ISO9660:
+      return _("iso9660fs");
+#endif
+#ifdef MOUNT_CD9660
+    case MOUNT_CD9660:
+      return _("cd9660");
+#endif
+#ifdef MOUNT_NFS
     case MOUNT_NFS:
       return _("nfs");
+#endif
 #ifdef MOUNT_PC
     case MOUNT_PC:
@@ -1768 +1783 @@
       return _("msdos");
 #endif
-#ifdef MOUNT_ISO9660
-    case MOUNT_ISO9660:
-      return _("iso9660fs");
+#ifdef MOUNT_LFS
+    case MOUNT_LFS:
+      return _("lfs");
+#endif
+#ifdef MOUNT_LOFS
+    case MOUNT_LOFS:
+      return _("lofs");
+#endif
+#ifdef MOUNT_FDESC
+    case MOUNT_FDESC:
+      return _("fdesc");
+#endif
+#ifdef MOUNT_PORTAL
+    case MOUNT_PORTAL:
+      return _("portal");
+#endif
+#ifdef MOUNT_NULL
+    case MOUNT_NULL:
+      return _("null");
+#endif
+#ifdef MOUNT_UMAP
+    case MOUNT_UMAP:
+      return _("umap");
+#endif
+#ifdef MOUNT_KERNFS
+    case MOUNT_KERNFS:
+      return _("kernfs");
+#endif
+#ifdef MOUNT_PROCFS
+    case MOUNT_PROCFS:
+      return _("procfs");
+#endif
+#ifdef MOUNT_DEVFS
+    case MOUNT_DEVFS:
+      return _("devfs");
+#endif
+#ifdef MOUNT_EXT2FS
+    case MOUNT_EXT2FS:
+      return _("ext2fs");
+#endif
+#ifdef MOUNT_UNION
+    case MOUNT_UNION:
+      return _("union");
 #endif
     default: