aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2012-09-27 11:03:40 +1000
committerJames Morris <james.l.morris@oracle.com>2012-09-27 11:03:40 +1000
commit3585e96cd1049682b8a19a0b699422156e9d735b (patch)
tree4d7df3950f5de97ca3b20f46a80a46005120df8f
parentima: change flags container data type (diff)
parentDocumentation: Update git repository URL for Smack userland tools (diff)
downloadlinux-dev-3585e96cd1049682b8a19a0b699422156e9d735b.tar.xz
linux-dev-3585e96cd1049682b8a19a0b699422156e9d735b.zip
Merge branch 'for-1209' of git://gitorious.org/smack-next/kernel into next
Requested by Casey.
-rw-r--r--Documentation/security/Smack.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/security/Smack.txt b/Documentation/security/Smack.txt
index e68536d85680..8a177e4b6e21 100644
--- a/Documentation/security/Smack.txt
+++ b/Documentation/security/Smack.txt
@@ -28,12 +28,11 @@ Smack kernels use the CIPSO IP option. Some network
configurations are intolerant of IP options and can impede
access to systems that use them as Smack does.
-The current git repositories for Smack user space are:
+The current git repository for Smack user space is:
- git@gitorious.org:meego-platform-security/smackutil.git
- git@gitorious.org:meego-platform-security/libsmack.git
+ git://github.com/smack-team/smack.git
-These should make and install on most modern distributions.
+This should make and install on most modern distributions.
There are three commands included in smackutil:
smackload - properly formats data for writing to /smack/load