From e304b566eb8d6858317eb5b41ecacd6f0fab65b5 Mon Sep 17 00:00:00 2001 From: Guilherme Amadio <amadio@cern.ch> Date: Mon, 13 May 2019 11:34:02 +0200 Subject: [PATCH] Remove more remnants of Globus support --- .gitignore | 3 --- README/INSTALL | 17 +---------------- config/Makefile.in | 3 +-- documentation/users-guide/InstallandBuild.md | 15 --------------- .../doc/confman/UsingVirtualAnalysisFacility.md | 2 +- 5 files changed, 3 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index 22d896f2e22..60a75f12821 100644 --- a/.gitignore +++ b/.gitignore @@ -358,9 +358,6 @@ tags # /misc/rootsl/ /misc/rootsl/build -# /net/globusauth/src/ -/net/globusauth/src/globus_gsi_credential.c - # /proof/proofbench/src/ /proof/proofbench/src/ProofBenchCPUSel.par /proof/proofbench/src/ProofBenchDataSel.par diff --git a/README/INSTALL b/README/INSTALL index 3074ca9fad8..214dc749dd2 100644 --- a/README/INSTALL +++ b/README/INSTALL @@ -353,22 +353,7 @@ individually. 7.13. Globus Authentication (LEGACY): ------------------------------------- -To build the Globus authentication module used by TServerSocket, -you first have to make sure that the Globus Tool Kit is installed -on the machine. See: - - http://www.globus.org/ - -for details and downloads. -Globus Tool Kit is available only for a subset of Unix platforms. -The variable GLOBUS_LOCATION should be defined as the directory -containing Globus lib, include and bin. For compilation purposes -you can pass this directory to the configure script with the option ---with-globus-dir=<globus_dir>. An experimental path is available -for versions 2.2.3 and 2.2.4 of the Globus Tool Kit to fix a small -bug preventing full functionality of the root implementation; this -is activated by setting --with-globus-patch-dir=<globus_src_dir> -where <globus_src_dir> is the globus tool kit source, +Not supported any longer 7.14. SSH Authentication: ------------------------- diff --git a/config/Makefile.in b/config/Makefile.in index d8b581cf929..556f2f05dec 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -74,8 +74,7 @@ WINRTDEBUG := @winrtdebug@ CTORSINITARRAY := @ctorsinitarray@ CXXMKDEPFLAGS := @cxxmkdepflags@ -GLBPATCHFLAGS := @glbpatchcflags@ -EXTRA_AUTHFLAGS:= @krb5extracflags@ @glbextracflags@ @sslextracflags@ +EXTRA_AUTHFLAGS:= @krb5extracflags@ @sslextracflags@ BINDIR := @bindir@ LIBDIR := @libdir@ diff --git a/documentation/users-guide/InstallandBuild.md b/documentation/users-guide/InstallandBuild.md index 996c65a826a..6f6e2517adc 100644 --- a/documentation/users-guide/InstallandBuild.md +++ b/documentation/users-guide/InstallandBuild.md @@ -627,13 +627,6 @@ PEAC.GmUrl: http://somewhere:8080/clarens/ PEAC.LmUrl: http://elsewhere:8080/clarens/ ``` -Certificate and key - -``` {.cpp} -Clarens.CertFile: $(HOME)/.globus/usercert.pem -Clarens.KeyFile: $(HOME)/.globus/userkey.pem -``` - #### Server Authentication in TServerSocket General setting: file with server access rules @@ -648,14 +641,6 @@ Check of host equivalence via `/etc/hosts`.`equiv` or `$HOME/.rhosts`. SrvAuth.CheckHostsEquivalence: 1 ``` -Globus/GSI: `hostcert` configuration file. - -``` {.cpp} -SrvAuth.HostCert: /etc/root/hostcert.conf -``` - -Globus/GSI: `gridmap` file. - Force file opening via **`TNetFile`** (**`TXNetFile`**) if a hostname is specified in the Url. By default, for local files `TFile::Open()` invokes directly **`TFile.`** diff --git a/proof/doc/confman/UsingVirtualAnalysisFacility.md b/proof/doc/confman/UsingVirtualAnalysisFacility.md index 1b623089a20..5ff30df111b 100644 --- a/proof/doc/confman/UsingVirtualAnalysisFacility.md +++ b/proof/doc/confman/UsingVirtualAnalysisFacility.md @@ -246,7 +246,7 @@ In our example we will assume that the remote server's name is `cloud-gw-213.to.infn.it`: substitute it with your remote endpoint. First, check that you have your Grid certificate and private key -installed both in your browser and in the `~/.globus` directory of your +installed both in your browser and in the home directory of your client. Point your browser to `https://cloud-gw-213.to.infn.it/auth/`: you'll -- GitLab