From e1da43df94715f6a1d302abf6e6bf43236fd0331 Mon Sep 17 00:00:00 2001 From: Gerardo Ganis Date: Thu, 18 May 2017 14:09:13 +0200 Subject: [PATCH] secpwd: rename XrdSutCache to XrdSutPFCache --- src/XrdSecpwd/XrdSecProtocolpwd.cc | 20 ++++++++++---------- src/XrdSecpwd/XrdSecProtocolpwd.hh | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/XrdSecpwd/XrdSecProtocolpwd.cc b/src/XrdSecpwd/XrdSecProtocolpwd.cc index de2dc46e1ca..14ae17ba77f 100644 --- a/src/XrdSecpwd/XrdSecProtocolpwd.cc +++ b/src/XrdSecpwd/XrdSecProtocolpwd.cc @@ -70,7 +70,7 @@ void ka_StringToKey(char *str, char *cell, #include "XrdSys/XrdSysPriv.hh" -#include "XrdSut/XrdSutCache.hh" +#include "XrdSut/XrdSutPFCache.hh" #include "XrdSecpwd/XrdSecProtocolpwd.hh" #include "XrdSecpwd/XrdSecpwdPlatform.hh" @@ -199,10 +199,10 @@ String XrdSecProtocolpwd::cryptName[XrdCryptoMax] = {0}; // their names XrdCryptoCipher *XrdSecProtocolpwd::refcip[XrdCryptoMax] = {0}; // ref for session ciphers // // Caches for info files -XrdSutCache XrdSecProtocolpwd::cacheAdmin; // Admin file -XrdSutCache XrdSecProtocolpwd::cacheSrvPuk; // SrvPuk file -XrdSutCache XrdSecProtocolpwd::cacheUser; // User files -XrdSutCache XrdSecProtocolpwd::cacheAlog; // Autologin file +XrdSutPFCache XrdSecProtocolpwd::cacheAdmin; // Admin file +XrdSutPFCache XrdSecProtocolpwd::cacheSrvPuk; // SrvPuk file +XrdSutPFCache XrdSecProtocolpwd::cacheUser; // User files +XrdSutPFCache XrdSecProtocolpwd::cacheAlog; // Autologin file // // Running options / settings int XrdSecProtocolpwd::Debug = 0; // [CS] Debug level @@ -364,7 +364,7 @@ char *XrdSecProtocolpwd::Init(pwdOptions opt, XrdOucErrInfo *erp) // Static method to the configure the static part of the protocol // Called once by XrdSecProtocolpwdInit EPNAME("Init"); - XrdSutCacheRef pfeRef; + XrdSutPFCacheRef pfeRef; char *Parms = 0; // // Debug an tracing @@ -2241,7 +2241,7 @@ int XrdSecProtocolpwd::SaveCreds(XrdSutBucket *creds) // Save credentials in creds in the password file // Returns 0 if ok, -1 otherwise EPNAME("SaveCreds"); - XrdSutCacheRef pfeRef; + XrdSutPFCacheRef pfeRef; // Check inputs if ((hs->User.length() <= 0) || !hs->CF || !creds) { @@ -2442,7 +2442,7 @@ XrdSutBucket *XrdSecProtocolpwd::QueryCreds(XrdSutBuffer *bm, { // Get credential information to be sent to the server EPNAME("QueryCreds"); - XrdSutCacheRef pfeRef; + XrdSutPFCacheRef pfeRef; // Check inputs if (!bm || !hs->CF || hs->Tag.length() <= 0) { @@ -2817,7 +2817,7 @@ int XrdSecProtocolpwd::QueryUser(int &status, String &cmsg) { // Check that info about the defined user is available EPNAME("QueryUser"); - XrdSutCacheRef pfeRef; + XrdSutPFCacheRef pfeRef; DEBUG("Enter: " << hs->User); @@ -3175,7 +3175,7 @@ int XrdSecProtocolpwd::ParseClientInput(XrdSutBuffer *br, XrdSutBuffer **bm, // cipher and server public keys, if there // Result used to fill the handshake local variables EPNAME("ParseClientInput"); - XrdSutCacheRef pfeRef; + XrdSutPFCacheRef pfeRef; // Space for pointer to main buffer must be already allocated if (!br || !bm) { diff --git a/src/XrdSecpwd/XrdSecProtocolpwd.hh b/src/XrdSecpwd/XrdSecProtocolpwd.hh index 2f3c80b8add..f9204737bdf 100644 --- a/src/XrdSecpwd/XrdSecProtocolpwd.hh +++ b/src/XrdSecpwd/XrdSecProtocolpwd.hh @@ -330,10 +330,10 @@ private: static XrdCryptoCipher *refcip[XrdCryptoMax]; // ref for session ciphers // // Caches for info files - static XrdSutCache cacheAdmin; // Admin file - static XrdSutCache cacheSrvPuk; // SrvPuk file - static XrdSutCache cacheUser; // User files - static XrdSutCache cacheAlog; // Autologin file + static XrdSutPFCache cacheAdmin; // Admin file + static XrdSutPFCache cacheSrvPuk; // SrvPuk file + static XrdSutPFCache cacheUser; // User files + static XrdSutPFCache cacheAlog; // Autologin file // // Running options / settings static int Debug; // [CS] Debug level