31 lines
1005 B
Diff
31 lines
1005 B
Diff
|
------------------------------------------------------------
|
||
|
|
revno: 3615
|
||
|
|
committer: Christian Boltz <apparmor@cboltz.de>
|
||
|
|
branch nick: apparmor
|
||
|
|
timestamp: Thu 2017-01-12 22:01:11 +0100
|
||
|
|
message:
|
||
|
|
sshd profile: drop local/ include
|
||
|
|
|
||
|
|
The local/ include in the sshd profile in extras causes some trouble:
|
||
|
|
- it breaks "make check" because the parser can't find the local/ file
|
||
|
|
- it results in a broken profile if someone uses this profile as
|
||
|
|
starting point, but doesn't notice it needs the local include
|
||
|
|
|
||
|
|
|
||
|
|
Acked-by: Steve Beattie <steve@nxnw.org>
|
||
|
|
|
||
|
|
|
||
|
|
=== modified file 'profiles/apparmor/profiles/extras/usr.sbin.sshd'
|
||
|
|
--- profiles/apparmor/profiles/extras/usr.sbin.sshd 2016-12-07 19:00:06 +0000
|
||
|
|
+++ profiles/apparmor/profiles/extras/usr.sbin.sshd 2017-01-12 21:01:11 +0000
|
||
|
|
@@ -140,5 +140,5 @@
|
||
|
|
/usr/lib/openssh/sftp-server PUx,
|
||
|
|
|
||
|
|
# Site-specific additions and overrides. See local/README for details.
|
||
|
|
- #include <local/usr.sbin.sshd>
|
||
|
|
+ ## include <local/usr.sbin.sshd>
|
||
|
|
}
|
||
|
|
|
||
|
|
|
||
|
|
vim:ft=diff
|