- updated to 1.16.1 (resolves CVE-2006-6097 by removing old and rare

[packages/tar.git] / tar-sock.patch

--- tar-1.16/src/create.c.orig	2006-10-16 08:33:55.000000000 +0200
+++ tar-1.16/src/create.c	2006-11-01 14:35:06.320460500 +0100
@@ -1464,6 +1464,16 @@
 
   if (is_avoided_name (p))
     return;
+  else if (S_ISSOCK (st->stat.st_mode))
+    {
+      WARN ((0, 0, _("%s: socket ignored"), quotearg_colon (p)));
+      return;
+    }
+  else if (S_ISDOOR (st->stat.st_mode))
+    {
+      WARN ((0, 0, _("%s: door ignored"), quotearg_colon (p)));
+      return;
+    }
 
   is_dir = S_ISDIR (st->stat.st_mode) != 0;
 
@@ -1636,16 +1646,6 @@
     type = BLKTYPE;
   else if (S_ISFIFO (st->stat.st_mode))
     type = FIFOTYPE;
-  else if (S_ISSOCK (st->stat.st_mode))
-    {
-      WARN ((0, 0, _("%s: socket ignored"), quotearg_colon (p)));
-      return;
-    }
-  else if (S_ISDOOR (st->stat.st_mode))
-    {
-      WARN ((0, 0, _("%s: door ignored"), quotearg_colon (p)));
-      return;
-    }
   else
     {
       unknown_file_error (p);