mirror of
https://git.openafs.org/openafs.git
synced 2025-01-31 05:27:44 +00:00
DEVEL15-rcu-patch-fallout-20090629
LICENSE IPL10 FIXES 124996 massaging this for 1.5.x/head caused some fallout. fix doubled endif, and install_session_keyring arguments (cherry picked from commit 3d5415922ea4ede4ce538d7894a6062bf115c6bd)
This commit is contained in:
parent
3c36d66237
commit
6e25934482
@ -342,7 +342,7 @@ setpag(cred_t **cr, afs_uint32 pagvalue, afs_uint32 *newpag,
|
|||||||
|
|
||||||
#ifdef LINUX_KEYRING_SUPPORT
|
#ifdef LINUX_KEYRING_SUPPORT
|
||||||
if (code == 0 && (*cr)->cr_rgid != NFSXLATOR_CRED) {
|
if (code == 0 && (*cr)->cr_rgid != NFSXLATOR_CRED) {
|
||||||
(void) install_session_keyring(current, NULL);
|
(void) install_session_keyring(NULL);
|
||||||
|
|
||||||
if (current_session_keyring()) {
|
if (current_session_keyring()) {
|
||||||
struct key *key;
|
struct key *key;
|
||||||
|
@ -547,6 +547,5 @@ afs_osi_proc2cred(AFS_PROC * pr)
|
|||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* AFS_GCPAGS */
|
#endif /* AFS_GCPAGS */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user