- updated for 4.2.7

[packages/findutils.git] / findutils-selinux.patch

--- findutils-4.1.20/find/Makefile.am.orig	Mon May 26 20:02:34 2003
+++ findutils-4.1.20/find/Makefile.am	Wed Jan 28 15:15:13 2004
@@ -3,8 +3,9 @@
 bin_PROGRAMS = find
 find_SOURCES = find.c fstype.c parser.c pred.c tree.c util.c version.c
 EXTRA_DIST = defs.h $(man_MANS)
+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX
 INCLUDES = -I../gnulib/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gnulib/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
-LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@
+LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ -lselinux
 man_MANS = find.1
 SUBDIRS = testsuite
 
--- findutils-4.2.4/find/defs.h.orig	2004-11-08 20:34:16.000000000 +0100
+++ findutils-4.2.4/find/defs.h	2004-11-09 00:40:03.771236728 +0100
@@ -120,6 +120,10 @@
 #define MODE_RWX	(S_IXUSR | S_IXGRP | S_IXOTH | MODE_RW)
 #define MODE_ALL	(S_ISUID | S_ISGID | S_ISVTX | MODE_RWX)
 
+#ifdef WITH_SELINUX
+#include <selinux/selinux.h>
+#endif /*WITH_SELINUX*/
+
 #if 1
 #include <stdbool.h>
 typedef bool boolean;
@@ -272,6 +276,9 @@
     struct perm_val perm;	/* perm */
     mode_t type;		/* type */
     FILE *stream;		/* fprint fprint0 */
+#ifdef WITH_SELINUX
+    security_context_t scontext; /* scontext */
+#endif /*WITH_SELINUX*/
     struct format_val printf_vec; /* printf fprintf */
   } args;
 
@@ -317,6 +324,11 @@
 VOID *xmalloc PARAMS((size_t n));
 VOID *xrealloc PARAMS((VOID *p, size_t n));
 
+#ifdef WITH_SELINUX
+boolean pred_scontext PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr));
+extern int (*x_getfilecon) ();
+#endif /*WITH_SELINUX*/
+
 /* xstrdup.c */
 char *xstrdup PARAMS((char *string));
 
--- findutils-4.2.6/find/find.1.orig	2004-11-21 10:52:17.000000000 +0100
+++ findutils-4.2.6/find/find.1	2004-11-21 22:52:25.469719184 +0100
@@ -396,6 +396,9 @@
 link to a file of type \fIc\fR; if the \-L option has been given, true
 if \fIc\fR is `l'.  In other words, for symbolic links, \-xtype checks
 the type of the file that \-type does not check.
+.IP "\-context \fIscontext\fR"
+.IP "\--context \fIscontext\fR"
+(SELinux only) File has the security context \fIscontext\fR.
 
 .SS ACTIONS
 .IP "\-delete\fR"
@@ -633,6 +636,8 @@
 File's type (like in ls -l), U=unknown type (shouldn't happen)
 .IP %Y
 File's type (like %y), plus follow symlinks: L=loop, N=nonexistent
+.IP %Z
+(SELinux only) file's security context.
 .PP
 A `%' character followed by any other character is discarded (but the
 other character is printed).
--- findutils-4.2.6/find/find.c.orig	2004-11-21 13:18:59.000000000 +0100
+++ findutils-4.2.6/find/find.c	2004-11-21 23:04:25.185305784 +0100
@@ -147,6 +147,9 @@
 
 /* Pointer to the function used to stat files. */
 int (*xstat) ();
+#ifdef WITH_SELINUX
+int (*x_getfilecon) ();
+#endif /* WITH_SELINUX */
 
 /* Status value to return to system. */
 int exit_status;
@@ -257,11 +260,17 @@
     {
     case SYMLINK_ALWAYS_DEREF:  /* -L */
       xstat = optionl_stat;
+#ifdef WITH_SELINUX
+      x_getfilecon = getfilecon;
+#endif /* WITH_SELINUX */
       no_leaf_check = false;
       break;
       
     case SYMLINK_NEVER_DEREF:	/* -P (default) */
       xstat = optionp_stat;
+#ifdef WITH_SELINUX
+      x_getfilecon = lgetfilecon;
+#endif /* WITH_SELINUX */
       /* Can't turn on no_leaf_check because the user might have specified 
        * -noleaf anyway
        */
@@ -269,6 +278,9 @@
       
     case SYMLINK_DEREF_ARGSONLY: /* -H */
       xstat = optionh_stat;
+#ifdef WITH_SELINUX
+      x_getfilecon = getfilecon;
+#endif /* WITH_SELINUX */
       no_leaf_check = true;
     }
   
@@ -289,6 +301,9 @@
   struct predicate *cur_pred;
   char *predicate_name;		/* Name of predicate being parsed. */
   int end_of_leading_options = 0; /* First arg after any -H/-L etc. */
+#ifdef WITH_SELINUX
+  int is_selinux_enabled_flag;
+#endif /* WITH_SELINUX */
   program_name = argv[0];
 
 #ifdef HAVE_SETLOCALE
@@ -318,6 +333,9 @@
   stay_on_filesystem = false;
   ignore_readdir_race = false;
   exit_status = 0;
+#ifdef WITH_SELINUX
+  is_selinux_enabled_flag = (is_selinux_enabled() > 0);
+#endif /* WITH_SELINUX */
 
 #if defined(DEBUG_STAT)
   xstat = debug_stat;
@@ -403,6 +421,14 @@
       if (strchr ("-!(),", argv[i][0]) == NULL)
 	usage (_("paths must precede expression"));
       predicate_name = argv[i];
+#ifdef WITH_SELINUX
+      if (! is_selinux_enabled_flag) {
+	if ((strncmp(predicate_name,"-context",strlen("-context"))==0) ||
+	    (strncmp(predicate_name,"--context",strlen("--context"))==0)) {
+	  error (1, 0,_("Error: invalid predicate %s: the kernel is not SELinux-enabled.\n"),predicate_name);
+	}
+      }
+#endif
       parse_function = find_parser (predicate_name);
       if (parse_function == NULL)
 	/* Command line option not recognized */
--- findutils-4.2.6/find/parser.c.orig	2004-11-15 01:22:30.000000000 +0100
+++ findutils-4.2.6/find/parser.c	2004-11-21 23:00:45.121760528 +0100
@@ -27,6 +27,10 @@
 #include "../gnulib/lib/xstrtol.h"
 
 
+#ifdef WITH_SELINUX
+#include <selinux/selinux.h>
+#endif /*WITH_SELINUX*/
+
 #if ENABLE_NLS
 # include <libintl.h>
 # define _(Text) gettext (Text)
@@ -127,6 +131,9 @@
 static boolean parse_warn PARAMS((char *argv[], int *arg_ptr));
 static boolean parse_xtype PARAMS((char *argv[], int *arg_ptr));
 static boolean parse_quit PARAMS((char *argv[], int *arg_ptr));
+#ifdef WITH_SELINUX
+static boolean parse_scontext PARAMS((char *argv[], int *arg_ptr));
+#endif /*WITH_SELINUX*/
 
 static boolean insert_regex PARAMS((char *argv[], int *arg_ptr, boolean ignore_case));
 static boolean insert_type PARAMS((char *argv[], int *arg_ptr, boolean (*which_pred )()));
@@ -251,6 +258,10 @@
   {ARG_TEST,               "wholename",             parse_wholename},   /* GNU, replaces -path */
   {ARG_TEST,               "xdev",                  parse_xdev},
   {ARG_TEST,               "xtype",                 parse_xtype},	/* GNU */
+#ifdef WITH_SELINUX
+  {ARG_TEST,               "context",               parse_scontext},    /* SELINUX */
+  {ARG_TEST,               "-context",              parse_scontext},    /* SELINUX */
+#endif /*WITH_SELINUX*/
   {0, 0, 0}
 };
 \f
@@ -720,6 +731,10 @@
       -nouser -nogroup -path PATTERN -perm [+-]MODE -regex PATTERN\n\
       -wholename PATTERN -size N[bcwkMG] -true -type [bcdpflsD] -uid N\n\
       -used N -user NAME -xtype [bcdpfls]"));
+#ifdef WITH_SELINUX
+  puts (_("\
+      -context CONTEXT\n"));
+#endif /*WITH_SELINUX*/
   puts (_("\
 actions: -exec COMMAND ; -fprint FILE -fprint0 FILE -fprintf FILE FORMAT\n\
       -fls FILE -ok COMMAND ; -print -print0 -printf FORMAT -prune -ls -delete\n\
@@ -1515,6 +1530,32 @@
   return true;
 }
 
+#ifdef WITH_SELINUX
+
+static boolean
+parse_scontext ( argv, arg_ptr )
+     char *argv[];
+     int *arg_ptr;
+{
+  struct predicate *our_pred;
+
+  if ( (argv == NULL) || (argv[*arg_ptr] == NULL) )
+    return( false );
+
+  our_pred = insert_primary(pred_scontext);
+  our_pred->need_stat = false;
+#ifdef DEBUG
+  our_pred->p_name = find_pred_name (pred_scontext);
+#endif /*DEBUG*/
+
+  our_pred->args.scontext = argv[*arg_ptr];;
+
+  (*arg_ptr)++;
+  return( true );
+}
+
+#endif /*WITH_SELINUX*/
+
 static boolean
 parse_xtype (char **argv, int *arg_ptr)
 {
@@ -1675,7 +1716,11 @@
 	  if (*scan2 == '.')
 	    for (scan2++; ISDIGIT (*scan2); scan2++)
 	      /* Do nothing. */ ;
+#ifdef WITH_SELINUX
+	  if (strchr ("abcdDfFgGhHiklmMnpPstuUyYZ", *scan2))
+#else  /* WITH_SELINUX */
 	  if (strchr ("abcdDfFgGhHiklmMnpPstuUyY", *scan2))
+#endif /* WITH_SELINUX */
 	    {
 	      segmentp = make_segment (segmentp, format, scan2 - format,
 				       (int) *scan2);
--- findutils-4.1.7/find/pred.c.selinux	2001-05-20 16:39:37.000000000 -0400
+++ findutils-4.1.7/find/pred.c	2003-10-10 13:15:13.752422594 -0400
@@ -27,6 +27,14 @@
 #include "modetype.h"
 #include "wait.h"
 
+#ifdef WITH_SELINUX
+#include <selinux/selinux.h>
+#endif /*WITH_SELINUX*/
+
+#ifndef FNM_CASEFOLD
+#define FNM_CASEFOLD (1<<4)
+#endif  /*FNM_CASEFOLD*/
+
 #if ENABLE_NLS
 # include <libintl.h>
 # define _(Text) gettext (Text)
@@ -69,7 +77,6 @@
 
 extern int yesno ();
 
-
 /* Get or fake the disk device blocksize.
    Usually defined by sys/param.h (if at all).  */
 #ifndef DEV_BSIZE
@@ -196,6 +203,9 @@
   {pred_used, "used    "},
   {pred_user, "user    "},
   {pred_xtype, "xtype   "},
+#ifdef WITH_SELINUX
+  {pred_scontext, "context"},
+#endif /*WITH_SELINUX*/
   {0, "none    "}
 };
 
@@ -719,6 +729,26 @@
 	  fprintf (fp, segment->text,
 		   human_readable ((uintmax_t) stat_buf->st_uid, hbuf, 1, 1));
 	  break;
+#ifdef WITH_SELINUX
+      case 'Z':               /* SELinux security context */
+        {
+          security_context_t scontext;
+          int rv;
+          rv = (*x_getfilecon)(rel_pathname, &scontext);
+
+          if ( rv < 0 ) {
+            (void) fprintf(stderr, "getfileconf(%s): %s",
+                           pathname, strerror(errno));
+            (void) fflush(stderr);
+          }
+          else {
+	      segment->text[segment->text_len] = 's';
+	      (void) fprintf (fp, segment->text, scontext);
+	      freecon(scontext);
+          }
+        }
+        break ;
+#endif /* WITH_SELINUX */
 	}
     }
   return (true);
@@ -1220,6 +1250,34 @@
     }
   return (pred_type (pathname, &sbuf, pred_ptr));
 }
+  
+
+#ifdef WITH_SELINUX
+
+boolean
+pred_scontext ( pathname, stat_buf, pred_ptr )
+     char *pathname;
+     struct stat *stat_buf;
+     struct predicate *pred_ptr;
+{
+  int rv;
+  security_context_t scontext;
+
+  rv = (* x_getfilecon)(rel_pathname, &scontext);
+
+  if ( rv < 0 ) {
+    (void) fprintf(stderr, "getfilecon(%s): %s\n", pathname, strerror(errno));
+    (void) fflush(stderr);
+    return ( false );
+  }
+
+  rv= (strcmp( scontext,pred_ptr->args.scontext) == 0 );
+  freecon(scontext);
+  return rv;
+}
+
+#endif /*WITH_SELINUX*/
+
 \f
 /*  1) fork to get a child; parent remembers the child pid
     2) child execs the command requested
--- findutils-4.1.7/find/util.c.selinux	2001-05-20 16:39:37.000000000 -0400
+++ findutils-4.1.7/find/util.c	2003-10-10 13:19:10.869534272 -0400
@@ -65,6 +65,9 @@
   last_pred->no_default_print = false;
   last_pred->need_stat = true;
   last_pred->args.str = NULL;
+#ifdef WITH_SELINUX
+  last_pred->args.scontext = NULL;
+#endif
   last_pred->pred_next = NULL;
   last_pred->pred_left = NULL;
   last_pred->pred_right = NULL;
--- findutils-4.2.7/po/pl.po.orig	2004-11-09 00:39:40.614757048 +0100
+++ findutils-4.2.7/po/pl.po	2004-11-09 00:44:33.436241416 +0100
@@ -216,6 +216,11 @@
 msgid "paths must precede expression"