Marcus Rueckert
f270973a6c
Accepted submit request 57745 from user jeff_mahoney OBS-URL: https://build.opensuse.org/request/show/57745 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apparmor?expand=0&rev=1
108 lines
3.5 KiB
Plaintext
108 lines
3.5 KiB
Plaintext
---
|
|
utils/Reports.pm | 2 +-
|
|
utils/SubDomain.pm | 2 +-
|
|
utils/genprof | 4 ++--
|
|
utils/rc.sd-event-dispatch.suse | 10 +++++-----
|
|
utils/unconfined | 2 +-
|
|
5 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
|
--- a/utils/Reports.pm
|
|
+++ b/utils/Reports.pm
|
|
@@ -14,7 +14,7 @@ package Immunix::Reports;
|
|
################################################################################
|
|
# /usr/lib/perl5/site_perl/Reports.pm
|
|
#
|
|
-# - Parses /var/log/messages for SubDomain messages
|
|
+# - Parses /var/log/messages for AppArmor messages
|
|
# - Writes results to .html or comma-delimited (.csv) files (Optional)
|
|
#
|
|
# Requires:
|
|
--- a/utils/SubDomain.pm
|
|
+++ b/utils/SubDomain.pm
|
|
@@ -1590,7 +1590,7 @@ my %CMDS = (
|
|
CMD_GLOBEXT => "Glob w/(E)xt",
|
|
CMD_ADDHAT => "(A)dd Requested Hat",
|
|
CMD_USEDEFAULT => "(U)se Default Hat",
|
|
- CMD_SCAN => "(S)can system log for SubDomain events",
|
|
+ CMD_SCAN => "(S)can system log for AppArmor events",
|
|
CMD_HELP => "(H)elp",
|
|
CMD_VIEW_PROFILE => "(V)iew Profile",
|
|
CMD_USE_PROFILE => "(U)se Profile",
|
|
--- a/utils/genprof
|
|
+++ b/utils/genprof
|
|
@@ -52,7 +52,7 @@ GetOptions(
|
|
|
|
my $sd_mountpoint = check_for_subdomain();
|
|
unless ($sd_mountpoint) {
|
|
- fatal_error(gettext("SubDomain does not appear to be started. Please enable SubDomain and try again."));
|
|
+ fatal_error(gettext("AppArmor does not appear to be started. Please enable AppArmor and try again."));
|
|
}
|
|
|
|
# let's convert it to full path...
|
|
@@ -166,7 +166,7 @@ for my $p (sort keys %helpers) {
|
|
}
|
|
}
|
|
|
|
-UI_Info(gettext("Reloaded SubDomain profiles in enforce mode."));
|
|
+UI_Info(gettext("Reloaded AppArmor profiles in enforce mode."));
|
|
UI_Info(sprintf(gettext('Finished generating profile for %s.'), $fqdbin));
|
|
exit 0;
|
|
|
|
--- a/utils/rc.sd-event-dispatch.suse
|
|
+++ b/utils/rc.sd-event-dispatch.suse
|
|
@@ -7,14 +7,14 @@
|
|
# /usr/sbin/rcsd-event-dispatch
|
|
#
|
|
# chkconfig: 2345 01 99
|
|
-# description: SubDomain event dispatcher
|
|
+# description: AppArmor event dispatcher
|
|
#
|
|
### BEGIN INIT INFO
|
|
# Provides: sd-event-dispatch
|
|
# Required-Start: subdomain
|
|
# Default-Start: 3 4 5
|
|
# Default-Stop: 0 1 2 6
|
|
-# Description: Start the SubDomain event dispacher
|
|
+# Description: Start the AppArmor event dispacher
|
|
### END INIT INFO
|
|
|
|
SD_EV_BIN=/usr/sbin/sd-event-dispatch.pl
|
|
@@ -38,7 +38,7 @@ rc_reset
|
|
|
|
case "$1" in
|
|
start)
|
|
- echo -n "Starting SubDomain Event daemon"
|
|
+ echo -n "Starting AppArmor Event daemon"
|
|
## Start daemon with startproc(8). If this fails
|
|
## the echo return value is set appropriate.
|
|
|
|
@@ -48,7 +48,7 @@ case "$1" in
|
|
rc_status -v
|
|
;;
|
|
stop)
|
|
- echo -n "Shutting down SubDomain Event daemon"
|
|
+ echo -n "Shutting down AppArmor Event daemon"
|
|
## Stop daemon with killproc(8) and if this fails
|
|
## set echo the echo return value.
|
|
|
|
@@ -75,7 +75,7 @@ case "$1" in
|
|
rc_status
|
|
;;
|
|
status)
|
|
- echo -n "Checking for SubDomain Event daemon"
|
|
+ echo -n "Checking for AppArmor Event daemon"
|
|
## Check status with checkproc(8), if process is running
|
|
## checkproc will return with exit status 0.
|
|
|
|
--- a/utils/unconfined
|
|
+++ b/utils/unconfined
|
|
@@ -54,7 +54,7 @@ sub usage {
|
|
|
|
my $subdomainfs = check_for_subdomain();
|
|
|
|
-die gettext("SubDomain does not appear to be started. Please enable SubDomain and try again.") . "\n"
|
|
+die gettext("AppArmor does not appear to be started. Please enable AppArmor and try again.") . "\n"
|
|
unless $subdomainfs;
|
|
|
|
my @pids;
|