- Upgrade to upstream
matchpathcon(8) man page update from Dan Walsh.
This commit is contained in:
parent
c4aa29e945
commit
b0195e100d
@ -1,6 +1,6 @@
|
|||||||
diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/av_permissions.h libselinux-2.0.42/include/selinux/av_permissions.h
|
diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/av_permissions.h libselinux-2.0.45/include/selinux/av_permissions.h
|
||||||
--- nsalibselinux/include/selinux/av_permissions.h 2007-11-15 15:52:46.000000000 -0500
|
--- nsalibselinux/include/selinux/av_permissions.h 2007-11-15 15:52:46.000000000 -0500
|
||||||
+++ libselinux-2.0.42/include/selinux/av_permissions.h 2007-11-15 16:30:48.000000000 -0500
|
+++ libselinux-2.0.45/include/selinux/av_permissions.h 2007-11-30 17:27:14.000000000 -0500
|
||||||
@@ -900,6 +900,8 @@
|
@@ -900,6 +900,8 @@
|
||||||
#define PACKET__SEND 0x00000001UL
|
#define PACKET__SEND 0x00000001UL
|
||||||
#define PACKET__RECV 0x00000002UL
|
#define PACKET__RECV 0x00000002UL
|
||||||
@ -10,9 +10,26 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/av_permission
|
|||||||
#define KEY__VIEW 0x00000001UL
|
#define KEY__VIEW 0x00000001UL
|
||||||
#define KEY__READ 0x00000002UL
|
#define KEY__READ 0x00000002UL
|
||||||
#define KEY__WRITE 0x00000004UL
|
#define KEY__WRITE 0x00000004UL
|
||||||
diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.42/src/matchpathcon.c
|
diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/matchpathcon.8 libselinux-2.0.45/man/man8/matchpathcon.8
|
||||||
|
--- nsalibselinux/man/man8/matchpathcon.8 2007-08-03 16:02:56.000000000 -0400
|
||||||
|
+++ libselinux-2.0.45/man/man8/matchpathcon.8 2007-12-06 11:22:40.000000000 -0500
|
||||||
|
@@ -6,7 +6,12 @@
|
||||||
|
.B matchpathcon [-V] [-N] [-n] [-f file_contexts_file ] [-p prefix ] filepath...
|
||||||
|
.SH "DESCRIPTION"
|
||||||
|
.B matchpathcon
|
||||||
|
-Prints the file path and the default security context associated with it.
|
||||||
|
+Queries the system and prints the default security context associated with the filepath.
|
||||||
|
+
|
||||||
|
+Note: Identical paths can have different security contexts, depending on the file type. (regular file, directory, link file, char file ...)
|
||||||
|
+
|
||||||
|
+matchpathcon will check the system default context using the file type if the file exists. If the file does not exist, it will get the context of a regular file.
|
||||||
|
+
|
||||||
|
.SH OPTIONS
|
||||||
|
.B \-n
|
||||||
|
Do not display path.
|
||||||
|
diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.45/src/matchpathcon.c
|
||||||
--- nsalibselinux/src/matchpathcon.c 2007-09-28 09:48:58.000000000 -0400
|
--- nsalibselinux/src/matchpathcon.c 2007-09-28 09:48:58.000000000 -0400
|
||||||
+++ libselinux-2.0.42/src/matchpathcon.c 2007-11-15 15:08:23.000000000 -0500
|
+++ libselinux-2.0.45/src/matchpathcon.c 2007-11-30 17:27:14.000000000 -0500
|
||||||
@@ -2,6 +2,7 @@
|
@@ -2,6 +2,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
@ -30,9 +47,9 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux
|
|||||||
va_end(ap);
|
va_end(ap);
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.42/utils/matchpathcon.c
|
diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.45/utils/matchpathcon.c
|
||||||
--- nsalibselinux/utils/matchpathcon.c 2007-07-16 14:20:45.000000000 -0400
|
--- nsalibselinux/utils/matchpathcon.c 2007-07-16 14:20:45.000000000 -0400
|
||||||
+++ libselinux-2.0.42/utils/matchpathcon.c 2007-11-15 15:08:23.000000000 -0500
|
+++ libselinux-2.0.45/utils/matchpathcon.c 2007-11-30 17:27:14.000000000 -0500
|
||||||
@@ -17,10 +17,24 @@
|
@@ -17,10 +17,24 @@
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user