|
 |
f8ad33e |
diff --git a/net/globusauth/src/GlobusAuth.cxx b/net/globusauth/src/GlobusAuth.cxx
|
|
|
f8ad33e |
index 6e0a00a..0b778bf 100644
|
|
|
f8ad33e |
--- a/net/globusauth/src/GlobusAuth.cxx
|
|
|
f8ad33e |
+++ b/net/globusauth/src/GlobusAuth.cxx
|
|
|
f8ad33e |
@@ -139,7 +139,7 @@ Int_t GlobusAuthenticate(TAuthenticate * tAuth, TString & user,
|
|
|
f8ad33e |
return -1;
|
|
|
f8ad33e |
}
|
|
|
f8ad33e |
if (gDebug > 3)
|
|
|
f8ad33e |
- Info("GlobusAuthenticate", " Credential Handle is 0x%x",
|
|
|
f8ad33e |
+ Info("GlobusAuthenticate", " Credential Handle is %p",
|
|
|
f8ad33e |
gGlbCredHandle);
|
|
|
f8ad33e |
|
|
|
f8ad33e |
// Inquire credentials for subject name and convert it in human readable form ...
|
|
|
f8ad33e |
@@ -193,7 +193,7 @@ Int_t GlobusAuthenticate(TAuthenticate * tAuth, TString & user,
|
|
|
f8ad33e |
if (gDebug > 0)
|
|
|
f8ad33e |
Error("GlobusAuthenticate",
|
|
|
f8ad33e |
"Length of Issuer name not send correctly: bytes sent: %d (tot len: %d)",
|
|
|
f8ad33e |
- bsnd - 1, strlen(buf));
|
|
|
f8ad33e |
+ bsnd - 1, (int) strlen(buf));
|
|
|
f8ad33e |
return 0;
|
|
|
f8ad33e |
}
|
|
|
f8ad33e |
// Now we send it to the server daemon
|
|
|
f8ad33e |
@@ -240,7 +240,7 @@ Int_t GlobusAuthenticate(TAuthenticate * tAuth, TString & user,
|
|
|
f8ad33e |
"recv host subj: did not receive all the bytes"
|
|
|
f8ad33e |
" (recv: %d, due >%d)", brcv, retval);
|
|
|
f8ad33e |
Error("GlobusAuthenticate", "recv host subj: (%d) %s",
|
|
|
f8ad33e |
- strlen(host_subj), host_subj);
|
|
|
f8ad33e |
+ (int) strlen(host_subj), host_subj);
|
|
|
f8ad33e |
}
|
|
|
f8ad33e |
if (host_subj) delete[] host_subj;
|
|
|
f8ad33e |
return 0;
|
|
|
f8ad33e |
@@ -262,7 +262,7 @@ Int_t GlobusAuthenticate(TAuthenticate * tAuth, TString & user,
|
|
|
f8ad33e |
0 ? (GSS_C_DELEG_FLAG | GSS_C_MUTUAL_FLAG) : GSS_C_MUTUAL_FLAG;
|
|
|
f8ad33e |
if (gDebug > 3)
|
|
|
f8ad33e |
Info("GlobusAuthenticate",
|
|
|
f8ad33e |
- " gssReqFlags: %p, GlbCredentials: %p", gssReqFlags, gGlbCredHandle);
|
|
|
f8ad33e |
+ " gssReqFlags: 0x%x, GlbCredentials: %p", gssReqFlags, gGlbCredHandle);
|
|
|
f8ad33e |
|
|
|
f8ad33e |
// Now we are ready to start negotiating with the Server
|
|
|
f8ad33e |
if ((majStat =
|
|
|
f8ad33e |
@@ -417,7 +417,7 @@ int GlobusGetDelCred()
|
|
|
f8ad33e |
return 1;
|
|
|
f8ad33e |
} else if (gDebug > 3)
|
|
|
f8ad33e |
Info("GlobusGetDelCred:",
|
|
|
f8ad33e |
- "Globus Credentials successfully imported (0x%x)",
|
|
|
f8ad33e |
+ "Globus Credentials successfully imported (%p)",
|
|
|
f8ad33e |
gGlbDelCredHandle);
|
|
|
f8ad33e |
|
|
|
f8ad33e |
if (credential) delete[] credential;
|
|
|
f8ad33e |
@@ -494,7 +494,7 @@ Int_t GlobusGetLocalEnv(Int_t *localEnv, TString protocol)
|
|
|
f8ad33e |
Info("GlobusGetLocalEnv",
|
|
|
f8ad33e |
"PROOF environment, called by the MASTER/SLAVE");
|
|
|
f8ad33e |
Info("GlobusGetLocalEnv",
|
|
|
f8ad33e |
- "string with pointer to del cred is 0x%x",
|
|
|
f8ad33e |
+ "string with pointer to del cred is %p",
|
|
|
f8ad33e |
gGlbDelCredHandle);
|
|
|
f8ad33e |
}
|
|
|
f8ad33e |
*localEnv = 2;
|
|
|
f8ad33e |
@@ -542,7 +542,7 @@ Int_t GlobusGetLocalEnv(Int_t *localEnv, TString protocol)
|
|
|
f8ad33e |
Int_t GlobusNameFromCred(gss_cred_id_t cred, TString &subjName)
|
|
|
f8ad33e |
{
|
|
|
f8ad33e |
if (gDebug > 2)
|
|
|
f8ad33e |
- Info("GlobusNamesFromCred", "Enter: Handle: 0x%p", cred);
|
|
|
f8ad33e |
+ Info("GlobusNamesFromCred", "Enter: Handle: %p", cred);
|
|
|
f8ad33e |
|
|
|
f8ad33e |
// Inquire credentials for Subject name and convert it in human readable form ...
|
|
|
f8ad33e |
OM_uint32 majStat = 0;
|
|
|
f8ad33e |
@@ -662,7 +662,7 @@ void GlobusCleanupShm()
|
|
|
f8ad33e |
if ((rc == EINVAL) || (rc == EIDRM)) {
|
|
|
f8ad33e |
if (gDebug > 3)
|
|
|
f8ad33e |
Info("GlobusCleanupShm:",
|
|
|
f8ad33e |
- "credentials shared memory segment %s"
|
|
|
f8ad33e |
+ "credentials shared memory segment "
|
|
|
f8ad33e |
"already marked as destroyed");
|
|
|
f8ad33e |
} else {
|
|
|
f8ad33e |
Warning("GlobusCleanupShm:",
|
|
|
f8ad33e |
@@ -730,7 +730,7 @@ Int_t GlobusCheckSecContext(const char *subjName, gss_ctx_id_t ctx)
|
|
|
f8ad33e |
theName[nameBuffer.length]= '\0';
|
|
|
f8ad33e |
if (gDebug > 2)
|
|
|
f8ad33e |
Info("GlobusCheckSecContext","with subject name: %s (%d)",
|
|
|
f8ad33e |
- theName, nameBuffer.length);
|
|
|
f8ad33e |
+ theName, (int) nameBuffer.length);
|
|
|
f8ad33e |
if (!strcmp(theName, subjName)) {
|
|
|
f8ad33e |
if (gDebug > 2)
|
|
|
f8ad33e |
Info("GlobusCheckSecContext",
|
|
|
f8ad33e |
@@ -1010,7 +1010,7 @@ Int_t GlobusIssuerName(TString &issuerName)
|
|
|
f8ad33e |
fn = Form("%s/.globus/usercert.pem",gSystem->HomeDirectory());
|
|
|
f8ad33e |
if (gSystem->AccessPathName(fn, kReadPermission)) {
|
|
|
f8ad33e |
emsg += fn;
|
|
|
f8ad33e |
- Error("GlobusIssuerName", emsg.Data());
|
|
|
f8ad33e |
+ Error("GlobusIssuerName", "%s", emsg.Data());
|
|
|
f8ad33e |
return 1;
|
|
|
f8ad33e |
}
|
|
|
f8ad33e |
}
|