|
 |
dbfbfbe |
Binary files nsalibselinux/utils/matchpathcon and libselinux-1.33.2/utils/matchpathcon differ
|
|
|
dbfbfbe |
diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-1.33.2/utils/matchpathcon.c
|
|
|
846f2ad |
--- nsalibselinux/utils/matchpathcon.c 2006-11-16 17:15:17.000000000 -0500
|
|
|
dbfbfbe |
+++ libselinux-1.33.2/utils/matchpathcon.c 2006-12-06 14:11:29.000000000 -0500
|
|
|
dbfbfbe |
@@ -4,20 +4,23 @@
|
|
|
dbfbfbe |
#include <getopt.h>
|
|
|
dbfbfbe |
#include <errno.h>
|
|
|
dbfbfbe |
#include <string.h>
|
|
|
dbfbfbe |
+#include <sys/types.h>
|
|
|
dbfbfbe |
+#include <sys/stat.h>
|
|
|
dbfbfbe |
+#include <sys/errno.h>
|
|
|
dbfbfbe |
#include <selinux/selinux.h>
|
|
|
dbfbfbe |
|
|
|
dbfbfbe |
void usage(const char *progname)
|
|
|
dbfbfbe |
{
|
|
|
dbfbfbe |
fprintf(stderr,
|
|
|
846f2ad |
- "usage: %s [-n] [-f file_contexts] [-p prefix] path...\n",
|
|
|
dbfbfbe |
+ "usage: %s [-N] [-n] [-f file_contexts] [-p prefix] [-V] path...\n",
|
|
|
dbfbfbe |
progname);
|
|
|
dbfbfbe |
exit(1);
|
|
|
dbfbfbe |
}
|
|
|
dbfbfbe |
|
|
|
846f2ad |
-int printmatchpathcon(char *path, int header)
|
|
|
dbfbfbe |
+int printmatchpathcon(char *path, int header, int mode)
|
|
|
dbfbfbe |
{
|
|
|
dbfbfbe |
char *buf;
|
|
|
846f2ad |
- int rc = matchpathcon(path, 0, &buf;;
|
|
|
dbfbfbe |
+ int rc = matchpathcon(path, mode, &buf;;
|
|
|
dbfbfbe |
if (rc < 0) {
|
|
|
dbfbfbe |
fprintf(stderr, "matchpathcon(%s) failed: %s\n", path,
|
|
|
dbfbfbe |
strerror(errno));
|
|
|
dbfbfbe |
@@ -92,6 +95,11 @@
|
|
|
dbfbfbe |
}
|
|
|
dbfbfbe |
}
|
|
|
dbfbfbe |
for (i = optind; i < argc; i++) {
|
|
|
dbfbfbe |
+ int mode=0;
|
|
|
dbfbfbe |
+ struct stat buf;
|
|
|
dbfbfbe |
+ if (lstat(argv[i], &buf) == 0)
|
|
|
dbfbfbe |
+ mode = buf.st_mode;
|
|
|
dbfbfbe |
+
|
|
|
dbfbfbe |
if (verify) {
|
|
|
dbfbfbe |
if (selinux_file_context_verify(argv[i], 0)) {
|
|
|
dbfbfbe |
printf("%s verified.\n", argv[i]);
|
|
|
dbfbfbe |
@@ -106,17 +114,17 @@
|
|
|
dbfbfbe |
if (rc >= 0) {
|
|
|
dbfbfbe |
printf("%s has context %s, should be ",
|
|
|
dbfbfbe |
argv[i], con);
|
|
|
846f2ad |
- error += printmatchpathcon(argv[i], 0);
|
|
|
dbfbfbe |
+ error += printmatchpathcon(argv[i], 0, mode);
|
|
|
dbfbfbe |
freecon(con);
|
|
|
dbfbfbe |
} else {
|
|
|
dbfbfbe |
printf
|
|
|
dbfbfbe |
("actual context unknown: %s, should be ",
|
|
|
dbfbfbe |
strerror(errno));
|
|
|
846f2ad |
- error += printmatchpathcon(argv[i], 0);
|
|
|
dbfbfbe |
+ error += printmatchpathcon(argv[i], 0,mode);
|
|
|
dbfbfbe |
}
|
|
|
dbfbfbe |
}
|
|
|
dbfbfbe |
} else {
|
|
|
846f2ad |
- error += printmatchpathcon(argv[i], header);
|
|
|
dbfbfbe |
+ error += printmatchpathcon(argv[i], header, mode);
|
|
|
dbfbfbe |
}
|
|
|
dbfbfbe |
}
|
|
|
dbfbfbe |
matchpathcon_fini();
|