Skip to content

Commit

Permalink
secpwd: rename XrdSutCache to XrdSutPFCache
Browse files Browse the repository at this point in the history
  • Loading branch information
gganis committed Jul 6, 2017
1 parent 31b317d commit e1da43d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
20 changes: 10 additions & 10 deletions src/XrdSecpwd/XrdSecProtocolpwd.cc
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions src/XrdSecpwd/XrdSecProtocolpwd.hh
Expand Up @@ -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
Expand Down

0 comments on commit e1da43d

Please sign in to comment.