criu/lsm-prototype-fix.diff
Martin Pluskal 2b8d50c617 Accepting request 309628 from home:tiwai:branches:devel:tools
- update to version 1.6:
  * PowerPC 64bit LE support
  * Makefile.local for 3-rd party build rules
  * Ability to "enable" filesystem on dump (--enable-fs)
  * Ability to skip mountpoint on dump (--skip-mnt)
  * Prepare to deprecate "criu show" command
  * External mounts auto-detection
  * /dev/tty (current terminal) support
  * Netdev and netns (all/default) confs C/R
  * Images v1.1 with extra magic at head
  * Support fusectl (only ctl) mountpoint
  * Sub-version format is now as of git-describe
  * Apparamor labels C/R support
- Fix library path for aarch64 and ppc64le
- Fix the prototype for lsm.c (to fix build errors):
  lsm-prototype-fix.diff
- Refreshed crit-install-prefix.diff

OBS-URL: https://build.opensuse.org/request/show/309628
OBS-URL: https://build.opensuse.org/package/show/devel:tools/criu?expand=0&rev=25
2015-06-01 14:03:47 +00:00

52 lines
1.1 KiB
Diff

---
include/lsm.h | 6 +++---
lsm.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
--- a/include/lsm.h
+++ b/include/lsm.h
@@ -7,12 +7,12 @@
/*
* Get the Lsmtype for the current host.
*/
-extern Lsmtype host_lsm_type();
+extern Lsmtype host_lsm_type(void);
/*
* Initilize the Lsmtype for the current host
*/
-extern void kerndat_lsm();
+extern void kerndat_lsm(void);
/*
* Read the LSM profile for the pstree item
@@ -23,7 +23,7 @@ extern int collect_lsm_profile(pid_t, Cr
* Validate that the LSM profiles can be correctly applied (must happen after
* pstree is set up).
*/
-extern int validate_lsm();
+int validate_lsm(CredsEntry *ce);
/*
* Render the profile name in the way that the LSM wants it written to
--- a/lsm.c
+++ b/lsm.c
@@ -102,7 +102,7 @@ static int selinux_get_label(pid_t pid,
}
#endif
-void kerndat_lsm()
+void kerndat_lsm(void)
{
if (access("/sys/kernel/security/apparmor", F_OK) == 0) {
get_label = apparmor_get_label;
@@ -130,7 +130,7 @@ void kerndat_lsm()
name = "none";
}
-Lsmtype host_lsm_type()
+Lsmtype host_lsm_type(void)
{
return lsmtype;
}