You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2017/08/10 13:07:47 UTC

activemq-artemis git commit: [ARTEMIS-1310] addition of protocol to sample acceptor url to krb5 doc

Repository: activemq-artemis
Updated Branches:
  refs/heads/master a4fc94880 -> 840ff8d23


[ARTEMIS-1310] addition of protocol to sample acceptor url to krb5 doc


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/840ff8d2
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/840ff8d2
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/840ff8d2

Branch: refs/heads/master
Commit: 840ff8d23790d9d9d7a4549bc4ae8f9e367225e2
Parents: a4fc948
Author: gtully <ga...@gmail.com>
Authored: Thu Aug 10 14:07:26 2017 +0100
Committer: gtully <ga...@gmail.com>
Committed: Thu Aug 10 14:07:26 2017 +0100

----------------------------------------------------------------------
 docs/user-manual/en/security.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/840ff8d2/docs/user-manual/en/security.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/security.md b/docs/user-manual/en/security.md
index fafb8d8..2e0edb0 100644
--- a/docs/user-manual/en/security.md
+++ b/docs/user-manual/en/security.md
@@ -665,7 +665,7 @@ channel in the normal way.
 The `GSSAPI` SASL mechanism must be enabled  on the AMQP acceptor in `broker.xml` by adding it to the `saslMechanisms` list url parameter:
 `saslMechanisms="GSSAPI<,PLAIN, etc>`.
 
-    <acceptor name="amqp">tcp://0.0.0.0:5672?saslMechanisms=GSSAPI</acceptor>
+    <acceptor name="amqp">tcp://0.0.0.0:5672?protocols=AMQP;saslMechanisms=GSSAPI</acceptor>
 
 The GSSAPI mechanism implementation on the server will use a JAAS configuration scope named `amqp-sasl-gssapi` to
 obtain it's Kerberos acceptor credentials. An alternative configuration scope can be specified on the AMQP acceptor