From f0d4e8f53ef87dc26f895c74b8a9eb89f585dfa2 Mon Sep 17 00:00:00 2001 From: Gerd Behrmann Date: Fri, 12 Dec 2014 12:39:53 +0100 Subject: [PATCH] dcap: Fix regression in published protocol family Prior to 2.7, gsidcap was published as gsidcap and the SRM used this as the protocol name when negotiating the transfer protocol. 2.7 always publishes 'dcap', which is a regression compared to 2.6. This patch resolves the problem. Target: trunk Request: 2.11 Request: 2.10 Request: 2.9 Request: 2.8 Request: 2.7 Require-notes: yes Require-book: no Reported-by: Yvan Calas Acked-by: Paul Millar Patch: https://rb.dcache.org/r/7587/ --- skel/share/defaults/dcap.properties | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/skel/share/defaults/dcap.properties b/skel/share/defaults/dcap.properties index 271bb4bd10d..fa7cc7963e8 100644 --- a/skel/share/defaults/dcap.properties +++ b/skel/share/defaults/dcap.properties @@ -106,7 +106,11 @@ dcap.service.loginbroker.update-period=${dcache.service.loginbroker.update-perio (one-of?MILLISECONDS|SECONDS|MINUTES|HOURS|DAYS|${dcache.service.loginbroker.update-period.unit})\ dcap.service.loginbroker.update-period.unit=${dcache.service.loginbroker.update-period.unit} dcap.service.loginbroker.update-threshold=${dcache.service.loginbroker.update-threshold} -dcap.service.loginbroker.family=dcap +dcap.service.loginbroker.family=${dcap.service.loginbroker.family.${dcap.authn.protocol}} +dcap.service.loginbroker.family.plain=dcap +dcap.service.loginbroker.family.auth=dcap +dcap.service.loginbroker.family.gsi=gsidcap +dcap.service.loginbroker.family.kerberos=dcap dcap.service.loginbroker.version=1.3.0 # Cell address of pnfsmanager service