rpms/findutils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Change --context to use fnmatch instead of strcmp

Browse Source
This commit is contained in:
Daniel J Walsh 2005-01-04 21:47:55 +00:00
parent d0901b9fe2
commit 4f49fff183
2 changed files with 195 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

382
findutils-selinux.patch
View File

@ -1,74 +1,17 @@
--- findutils-4.1.20/find/Makefile.am.selinux 2003-05-26 19:02:34.000000000 +0100 --- findutils-4.1.20/find/util.c.selinux 2005-01-04 16:42:22.801468914 -0500
+++ findutils-4.1.20/find/Makefile.am 2004-06-25 15:41:32.551569936 +0100 +++ findutils-4.1.20/find/util.c 2005-01-04 16:42:23.006445691 -0500
@@ -3,8 +3,9 @@ @@ -67,6 +67,9 @@
bin_PROGRAMS = find last_pred->no_default_print = false;
find_SOURCES = find.c fstype.c parser.c pred.c tree.c util.c version.c last_pred->need_stat = PRED_NEED_STAT;
EXTRA_DIST = defs.h $(man_MANS) last_pred->args.str = NULL;
+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.1.20/find/defs.h.selinux 2004-06-25 15:39:56.115013659 +0100
+++ findutils-4.1.20/find/defs.h 2004-06-25 15:39:56.209995493 +0100
@@ -127,6 +127,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 +#ifdef WITH_SELINUX
+#include <selinux/selinux.h> + last_pred->args.scontext = NULL;
+#endif /*WITH_SELINUX*/ +#endif
+ last_pred->pred_next = NULL;
/* Not char because of type promotion; NeXT gcc can't handle it. */ last_pred->pred_left = NULL;
typedef int boolean; last_pred->pred_right = NULL;
#define true 1 --- findutils-4.1.20/find/find.c.selinux 2005-01-04 16:42:22.800469028 -0500
@@ -278,6 +282,9 @@ +++ findutils-4.1.20/find/find.c 2005-01-04 16:42:22.997446710 -0500
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;
@@ -323,6 +330,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.1.20/find/find.1.selinux 2004-06-25 15:39:56.087019013 +0100
+++ findutils-4.1.20/find/find.1 2004-06-25 15:39:56.211995111 +0100
@@ -230,6 +230,9 @@
file of type \fIc\fR; if \-follow 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 "\-exec \fIcommand\fR ;"
Execute \fIcommand\fR; true if 0 status is returned. All following
@@ -419,6 +422,8 @@
File's user name, or numeric user ID if the user has no name.
.IP %U
File's numeric user ID.
+.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.1.20/find/find.c.selinux 2004-06-25 15:39:56.123012130 +0100
+++ findutils-4.1.20/find/find.c 2004-06-25 15:39:56.213994729 +0100
@@ -154,6 +154,9 @@ @@ -154,6 +154,9 @@
/* Pointer to the function used to stat files. */ /* Pointer to the function used to stat files. */
@ -105,113 +48,29 @@
parse_function = find_parser (predicate_name); parse_function = find_parser (predicate_name);
if (parse_function == NULL) if (parse_function == NULL)
/* Command line option not recognized */ /* Command line option not recognized */
--- findutils-4.1.20/find/parser.c.selinux 2004-06-25 15:39:56.130010791 +0100 --- findutils-4.1.20/find/find.1.selinux 2005-01-04 16:42:22.905457133 -0500
+++ findutils-4.1.20/find/parser.c 2004-06-25 15:39:56.218993772 +0100 +++ findutils-4.1.20/find/find.1 2005-01-04 16:42:22.995446937 -0500
@@ -25,6 +25,10 @@ @@ -243,6 +243,9 @@
#include "modetype.h" file of type \fIc\fR; if \-follow has been given, true if \fIc\fR is
#include "xstrtol.h" `l'. In other words, for symbolic links, \-xtype checks the type of
the file that \-type does not check.
+#ifdef WITH_SELINUX +.IP "\-context \fIscontext\fR"
+#include <selinux/selinux.h> +.IP "\--context \fIscontext\fR"
+#endif /*WITH_SELINUX*/ +(SELinux only) File has the security context \fIscontext\fR.
+ .SS ACTIONS
#if ENABLE_NLS .IP "\-exec \fIcommand\fR ;"
# include <libintl.h> Execute \fIcommand\fR; true if 0 status is returned. All following
# define _(Text) gettext (Text) @@ -432,6 +435,8 @@
@@ -115,6 +119,9 @@ File's user name, or numeric user ID if the user has no name.
static boolean parse_version PARAMS((char *argv[], int *arg_ptr)); .IP %U
static boolean parse_xdev PARAMS((char *argv[], int *arg_ptr)); File's numeric user ID.
static boolean parse_xtype PARAMS((char *argv[], int *arg_ptr)); +.IP %Z
+#ifdef WITH_SELINUX +(SELinux only) file's security context.
+static boolean parse_scontext PARAMS((char *argv[], int *arg_ptr)); .PP
+#endif /*WITH_SELINUX*/ A `%' character followed by any other character is discarded (but the
other character is printed).
static boolean insert_regex PARAMS((char *argv[], int *arg_ptr, boolean ignore_case)); --- findutils-4.1.20/find/pred.c.selinux 2005-01-04 16:42:22.799469141 -0500
static boolean insert_type PARAMS((char *argv[], int *arg_ptr, boolean (*which_pred )())); +++ findutils-4.1.20/find/pred.c 2005-01-04 16:44:56.582045621 -0500
@@ -217,7 +224,11 @@
{"-version", parse_version}, /* GNU */
{"xdev", parse_xdev},
{"xtype", parse_xtype}, /* GNU */
- {0, 0}
+#ifdef WITH_SELINUX
+ {"context", parse_scontext}, /* SELINUX */
+ {"-context", parse_scontext}, /* SELINUX */
+#endif /*WITH_SELINUX*/
+ {0, 0}
};
/* Return a pointer to the parser function to invoke for predicate
@@ -467,7 +478,10 @@
{
dereference = true;
xstat = stat;
- no_leaf_check = true;
+#ifdef WITH_SELINUX
+ x_getfilecon = getfilecon;
+#endif /* WITH_SELINUX */
+ no_leaf_check = true;
return (true);
}
@@ -572,6 +586,10 @@
-nouser -nogroup -path PATTERN -perm [+-]MODE -regex PATTERN\n\
-size N[bckw] -true -type [bcdpfls] -uid N -used N -user NAME\n\
-xtype [bcdpfls]\n"));
+#ifdef WITH_SELINUX
+ puts (_("\
+ -context CONTEXT\n"));
+#endif /*WITH_SELINUX*/
puts (_("\
actions: -exec COMMAND ; -fprint FILE -fprint0 FILE -fprintf FILE FORMAT\n\
-ok COMMAND ; -print -print0 -printf FORMAT -prune -ls\n"));
@@ -1204,6 +1222,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 = 0;
+#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)
{
@@ -1363,7 +1407,11 @@
if (*scan2 == '.')
for (scan2++; ISDIGIT (*scan2); scan2++)
/* Do nothing. */ ;
- if (strchr ("abcdfFgGhHiklmnpPstuU", *scan2))
+#ifdef WITH_SELINUX
+ if (strchr ("abcdfFgGhHiklmnpPstuUZ", *scan2))
+#else /* WITH_SELINUX */
+ if (strchr ("abcdfFgGhHiklmnpPstuU", *scan2))
+#endif /* WITH_SELINUX */
{
segmentp = make_segment (segmentp, format, scan2 - format,
(int) *scan2);
--- findutils-4.1.20/find/pred.c.selinux 2004-06-25 15:39:56.120012703 +0100
+++ findutils-4.1.20/find/pred.c 2004-06-25 15:39:56.222993008 +0100
@@ -29,6 +29,14 @@ @@ -29,6 +29,14 @@
#include "modetype.h" #include "modetype.h"
#include "wait.h" #include "wait.h"
@ -297,7 +156,7 @@
+ return ( false ); + return ( false );
+ } + }
+ +
+ rv= (strcmp( scontext,pred_ptr->args.scontext) == 0 ); + rv = (fnmatch(pred_ptr->args.scontext, scontext,0)==0);
+ freecon(scontext); + freecon(scontext);
+ return rv; + return rv;
+} +}
@ -307,8 +166,8 @@
/* 1) fork to get a child; parent remembers the child pid /* 1) fork to get a child; parent remembers the child pid
2) child execs the command requested 2) child execs the command requested
--- findutils-4.1.20/find/Makefile.in.selinux 2003-05-26 19:18:11.000000000 +0100 --- findutils-4.1.20/find/Makefile.in.selinux 2003-05-26 14:18:11.000000000 -0400
+++ findutils-4.1.20/find/Makefile.in 2004-06-25 15:42:30.881421141 +0100 +++ findutils-4.1.20/find/Makefile.in 2005-01-04 16:42:23.004445917 -0500
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
@ -327,15 +186,156 @@
man_MANS = find.1 man_MANS = find.1
SUBDIRS = testsuite SUBDIRS = testsuite
subdir = find subdir = find
--- findutils-4.1.20/find/util.c.selinux 2004-06-25 15:39:56.124011938 +0100 --- findutils-4.1.20/find/defs.h.selinux 2005-01-04 16:42:22.795469594 -0500
+++ findutils-4.1.20/find/util.c 2004-06-25 15:39:56.228991860 +0100 +++ findutils-4.1.20/find/defs.h 2005-01-04 16:42:22.994447050 -0500
@@ -67,6 +67,9 @@ @@ -127,6 +127,10 @@
last_pred->no_default_print = false; #define MODE_RWX (S_IXUSR | S_IXGRP | S_IXOTH | MODE_RW)
last_pred->need_stat = PRED_NEED_STAT; #define MODE_ALL (S_ISUID | S_ISGID | S_ISVTX | MODE_RWX)
last_pred->args.str = NULL;
+#ifdef WITH_SELINUX +#ifdef WITH_SELINUX
+ last_pred->args.scontext = NULL; +#include <selinux/selinux.h>
+#endif +#endif /*WITH_SELINUX*/
last_pred->pred_next = NULL; +
last_pred->pred_left = NULL; /* Not char because of type promotion; NeXT gcc can't handle it. */
last_pred->pred_right = NULL; typedef int boolean;
#define true 1
@@ -278,6 +282,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;
@@ -323,6 +330,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.1.20/find/Makefile.am.selinux 2003-05-26 14:02:34.000000000 -0400
+++ findutils-4.1.20/find/Makefile.am 2005-01-04 16:42:22.992447277 -0500
@@ -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.1.20/find/parser.c.selinux 2005-01-04 16:42:22.971449656 -0500
+++ findutils-4.1.20/find/parser.c 2005-01-04 16:42:23.000446370 -0500
@@ -25,6 +25,10 @@
#include "modetype.h"
#include "xstrtol.h"
+#ifdef WITH_SELINUX
+#include <selinux/selinux.h>
+#endif /*WITH_SELINUX*/
+
#if ENABLE_NLS
# include <libintl.h>
# define _(Text) gettext (Text)
@@ -115,6 +119,9 @@
static boolean parse_version PARAMS((char *argv[], int *arg_ptr));
static boolean parse_xdev PARAMS((char *argv[], int *arg_ptr));
static boolean parse_xtype 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 )()));
@@ -217,7 +224,11 @@
{"-version", parse_version}, /* GNU */
{"xdev", parse_xdev},
{"xtype", parse_xtype}, /* GNU */
- {0, 0}
+#ifdef WITH_SELINUX
+ {"context", parse_scontext}, /* SELINUX */
+ {"-context", parse_scontext}, /* SELINUX */
+#endif /*WITH_SELINUX*/
+ {0, 0}
};
/* Return a pointer to the parser function to invoke for predicate
@@ -467,7 +478,10 @@
{
dereference = true;
xstat = stat;
- no_leaf_check = true;
+#ifdef WITH_SELINUX
+ x_getfilecon = getfilecon;
+#endif /* WITH_SELINUX */
+ no_leaf_check = true;
return (true);
}
@@ -572,6 +586,10 @@
-nouser -nogroup -path PATTERN -perm [+-]MODE -regex PATTERN\n\
-size N[bckw] -true -type [bcdpfls] -uid N -used N -user NAME\n\
-xtype [bcdpfls]\n"));
+#ifdef WITH_SELINUX
+ puts (_("\
+ -context CONTEXT\n"));
+#endif /*WITH_SELINUX*/
puts (_("\
actions: -exec COMMAND ; -fprint FILE -fprint0 FILE -fprintf FILE FORMAT\n\
-ok COMMAND ; -print -print0 -printf FORMAT -prune -ls\n"));
@@ -1198,6 +1216,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 = 0;
+#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)
{
@@ -1357,7 +1401,11 @@
if (*scan2 == '.')
for (scan2++; ISDIGIT (*scan2); scan2++)
/* Do nothing. */ ;
- if (strchr ("abcdfFgGhHiklmnpPstuU", *scan2))
+#ifdef WITH_SELINUX
+ if (strchr ("abcdfFgGhHiklmnpPstuUZ", *scan2))
+#else /* WITH_SELINUX */
+ if (strchr ("abcdfFgGhHiklmnpPstuU", *scan2))
+#endif /* WITH_SELINUX */
{
segmentp = make_segment (segmentp, format, scan2 - format,
(int) *scan2);

5
findutils.spec
View File

@ -4,7 +4,7 @@
Summary: The GNU versions of find utilities (find and xargs). Summary: The GNU versions of find utilities (find and xargs).
Name: findutils Name: findutils
Version: 4.1.20 Version: 4.1.20
Release: 7 Release: 8
Epoch: 1 Epoch: 1
License: GPL License: GPL
Group: Applications/File Group: Applications/File
@ -125,6 +125,9 @@ rm -rf %{buildroot}
%{_infodir}/find.info* %{_infodir}/find.info*
%changelog %changelog
* Tue Jan 4 2005 Dan Walsh <dwalsh@redhat.com> 1:4.1.20-8
- Change --context to use fnmatch instead of strcmp
* Tue Dec 7 2004 Tim Waugh <twaugh@redhat.com> * Tue Dec 7 2004 Tim Waugh <twaugh@redhat.com>
- Removed "G" and "M" size qualifiers from man page, since support for - Removed "G" and "M" size qualifiers from man page, since support for
those is not in the stable branch (bug #141987). those is not in the stable branch (bug #141987).