[OpenAFS] openssh-3.7.1, pam and no token after login
Douglas E. Engert
deengert@anl.gov
Mon, 15 Mar 2004 10:18:23 -0600
This is a multi-part message in MIME format.
--------------18947210788547DE88D1126A
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Well, I had the same problems, and had proposed some solutions.
I am going with the attached mods to replace the k_afs calls
with a call to
Matthew Hoskins wrote:
>
> This thread seems to have died... Did anyone ever find a combination of
> patches/config options that allow a modern version of openssh to get a
> pag+token?
>
> I have tried just about every combination of UsePAM,
> UsePrivilegeSeparation, 3.7p and 3.8p versions. My platform is solaris 8.
Well, I had the same problems, and had proposed some solutions.
I am going with the attached mods to OPenSSH-3.8 to replace the k_afs calls
with a call to get_afs_token. This does a syscall and fork/execs
your favorite program to get a token using the passed environment.
(We are a K5 only so the environemt is exprected to have KRB5CCNAME
set from PAM the Kerberos user/password, or delegated GSSAPI credentials.)
Have it working on three releases of Solaris, 4 releases of HP UX,
SGI and Linux.
--
Douglas E. Engert <DEEngert@anl.gov>
Argonne National Laboratory
9700 South Cass Avenue
Argonne, Illinois 60439
(630) 252-5444
--------------18947210788547DE88D1126A
Content-Type: application/x-unknown-content-type-cfile;
name="gafstoken.c"
Content-Disposition: inline;
filename="gafstoken.c"
Content-Transfer-Encoding: base64
LyogZ2Fmc3Rva2VuLmMgCgoJQSBnZW5lcmljIHJvdXRpdWUgdG8gZ2V0IGFuIEFGUyB0b2tl
biBieSBjYWxsaW5nCglhbiBleHRlcm5hbCBwcm9ncmFtLiAKCglUaGlzIHJvdXRpbmUgaXMg
Z2VuZXJpYyBpbiB0aGF0IGl0IGRvZXMgbm90IGRlcGVuZCBvbiAKCWFueSBzcGVjaWZpYyBp
bXBsZW1lbnRhdGlvbiBvZiBBRlMsIG9yIEtlcmJlcm9zLgoJVGhpcyB3aWxsIGFsbG93IGEg
ZGVhbW9uIHRvIGJlIGNvbmZpZ3VyZWQsIGNvbXBpbGVkCglhbmQgbGlua2VkIHdpdGhvdXQg
YW55IEFGUyBvciBLZXJiZXJvcyBkZXBlbmRlbmNpZXMKCWFuZCBjYW4gdGh1cyBhdm9pZCBj
b25mbGljdHMgYmV0d2VlbiB0aGVzZSBwYWNrYWdlcy4KCVRoZSByZXN1bHRpbmcgZGVhbW9u
IGV4ZWN1dGFibGUgY2FuIGJlIHJ1biBvbiBhIHN5c3RlbSB3aXRoIAoJb3Igd2l0aG91dCBB
RlMuICAKCQoJRXhhbXBsZXMgb2YgZXh0ZXJuYWwgcHJvZ3JhbXMgdGhhdCBjb3VsZCBiZSBj
YWxsZWQKCWFyZSBha2xvZywgYWZzbG9nLCBnc3NrbG9nLCBrbG9nLCBhazVsb2cgb3IgZXZl
biBhIHNjcmlwdAoJdG8gY2FsbCBvbmUgb2YgdGhlc2UuIAoKCVRoZSBleHRlcm5hbCBwcm9n
cmFtIGlzIGV4cGVjdGVkIHRvIHN1cHBvcnQgCgkob3IgaWdub3JlKSB0aGUgIC1zZXRwYWcg
b3B0aW9uIGFuZCB0aGUgPGhvbWVkaXI+CgoJUGFyYW1ldGVycyB0byBnYWZzdG9rZW46IAoK
CQljaGFyICogZXh0ZXJuYWxfcHJvZ3JhbSAgLSBwYXRoIHRvIHRoZSBleGVjdXRhYmxlCgkJ
CXRoaXMgd291bGQgYmUgc2V0IGJ5IGNvbmZpZ3VyZSwgb3IgZGVmYXVsdGVkCgkJCWluIHNv
bWUgd2F5LiBJZiBOVUxMIGEgYnVpbHQgaW4gbG9jYXRpb24gaXMgdXNlZC4KCQkJCQkJCQoJ
CWNoYXIgKiplbnYgLSBFbnZpcm9ubWVudCB0byBydW4gdW5kZXIuIFRoaXMKCQkJc2hvdWxk
IGluY2x1ZGUgYW55IGVudmlyb25lbXQgdmFyaWFibGVzIG5lZWRlZAoJCQlieSB0aGUgZXh0
ZXJuYWwgcHJvZ3JhbSBzdWNoIGFzIEtSQjVDQ05BTUUKCQkJb3IgWDUwOV9VU0VSX1BST1hZ
IFRoZXNlIHdvdWxkIGhhdmUgYmVlbiBzZXQKCQkJYnkgR1NTQVBJIG9yIFBBTS4gIElmIE5V
TEwsIHRoZSBjdXJyZW50IGVudmlyb25tZW50CgkJCWlzIHVzZWQuIAoKCQljaGFyICogaG9t
ZWRpciAtIEEgZmlsZSBsb2NhdGlvbiwgaWYgaW4gQUZTIHRoZSAKCQkJZXh0ZXJuYWwgcHJv
Z3JhbSB3aWxsIGF0dGVtcHQgdG8gZ2V0IGEgdG9rZW4KCQkJZm9yIHRoZSBjZWxsIGNvbnRh
aW5pbmcgaXQuICBJZiBOVUxMIGF0ZW1wdAoJCQl0byBnZXQgYSB0b2tlbiBmb3IgdGhlIGRl
ZmF1bHQgY2VsbCBvZiB0aGUgY2xpZW50LgoKCQlpbnQgc2V0cGFnIC0gVXNlZCB0byBnZXQg
YSBQQUcgdXNpbmcgc3lzY2FsbCAKCQkJV2Ugbm8gbG9uZ2VyIHRyeSBhbmQgbGV0IHRoZSBl
eHRlcm5hbCBwcm9ncmFtIAoJCQl0cnkgYW5kIHNldCB0aGUgUEFHIG9mIHRoZSBwYXJlbnQu
IAoKCVJldHVybnM6CgkJLTEgLSBzb21lIHN5c3RlbSBlcnJvciwgc2VlIGVycm5vOwoJCSAw
IC0gdGhlIGV4dGVybmFsIHByb2dyYW0gaWYgcHJlc2VudCB3YXMgY2FsbGVkIGFuZCAKCQkJ
IE1BWSBoYXZlIHdvcmtlZC4gCgoJVGhlIGNhbGxlciBzaG91bGQgbm90IG5lZWQgdG8gdGVz
dCB0aGUgcmV0dXJuIGNvZGUsIGFuZCBzaG91bGQKCWNvbnRpbnVlIHdpdGggb3Igd2l0aG91
dCB0aGUgQUZTIHRva2VuIG9yIFBBRy4gCgoJKi8KCiNpbmNsdWRlIDxlcnJuby5oPgojaWZk
ZWYgSEFWRV9XQUlUX0gKI2luY2x1ZGUgPHdhaXQuaD4KI2VuZGlmCiNpbmNsdWRlIDxzeXMv
c3RhdC5oPiAKI2luY2x1ZGUgPGZjbnRsLmg+CiNpbmNsdWRlIDx1bmlzdGQuaD4KCiNpZmRl
ZiBQT1NJWF9TSUdOQUxTIAojZGVmaW5lIFBPU0lYX1NFVEpNUAojZW5kaWYKI2RlZmluZSBI
QVZFX1dBSVRQSUQKI2RlZmluZSBXQUlUX1VTRVNfSU5UCgojaW5jbHVkZSA8c2lnbmFsLmg+
CiNpbmNsdWRlIDxzZXRqbXAuaD4KCiNpZm5kZWYgX1BBVEhfQUZTX0VYVEVSTkFMX1BST0dS
QU0KI2RlZmluZSBfUEFUSF9BRlNfRVhURVJOQUxfUFJPR1JBTSAiL2tyYjUvbGliZXhlYy9n
ZXQtYWZzLXRva2VuIgojZW5kaWYgCgkKCi8qIAogKiBXZSBuZWVkIHRoZSBBRlNfU1lTQ0FM
TCBhbmQgQUZTQ0FMTF9TRVRQQUcgbnVtYmVycywgYnV0IHdlCiAqIHdhbnQgdG8gbWFrZSB0
aGlzIGluZGVwZW5kZW50IG9mIEFGUyBzbyBpdCBjYW4gYmUgYnVpbHQKICogYW5kIHVzZWQg
b24gc3lzdGVtcyB3aGljaCBkb24ndCBoYXZlIEFGUy4gCiAqIFNlZToKICogI2luY2x1ZGUg
ImFmcy9wYXJhbS5oIgogKiAjaW5jbHVkZSAiYWZzL2Fmcy5oIgogKi8KCiNkZWZpbmUgQUZT
Q0FMTF9TRVRQQUcgMjEKIAojaWYgZGVmaW5lZChzdW4pICYmIGRlZmluZWQoX19TVlI0KQoj
aW5jbHVkZSA8c3lzL3N5c3RlbWluZm8uaD4KLyogU29sYXJpcyAgNS42IGFuZCBiZWxvdyB1
c2VzIDEwNSAqLwovKiBCdXQgU29sYXJpcyA1Ljcgd2l0aCBBU0YgMy41IHVzZXMgNzMgKi8K
LyogYW5kIFNvbGFyaXMgNS44IHVzZXMgNjUgKi8KLyogd2Ugd2lsbCBkZXRlcm1pbmcgdGhl
IG51bWJlciBhdCBydW50aW1lIGJlbG93LiAqLwoKI2lmbmRlZiBBRlNfU1lTQ0FMTAojZGVm
aW5lIEFGU19TWVNDQUxMIDY1IAojZW5kaWYKCiNlbGlmIGRlZmluZWQoc3VuKQovKiBTdW5P
UyB1c2VzIDMxICovCiNkZWZpbmUgQUZTX1NZU0NBTEwgMzEKCiNlbGlmIGRlZmluZWQoc2dp
KSB8fCBkZWZpbmVkKF9zZ2kpCi8qIHNnaSBkb2VzIGl0IGRpZmZlcmVudCwgZWFjaCBBRlND
QUxMIGhhcyBpdHMgb3duIHN5c2NhbGwhCiAqIHNvIGRlZmluZSB0aGUgU0VUUEFHIG9uZQog
Ki8KI2RlZmluZSBBRlNfU1lTQ0FMTCA2NSsxMDAwCiN1bmRlZiBBRlNDQUxMX1NFVFBBRyAK
I2RlZmluZSBBRlNDQUxMX1NFVFBBRyAwCgojZWxpZiBkZWZpbmVkKGhwdXgpIHx8IGRlZmlu
ZWQoX2hwdXgpIHx8ZGVmaW5lZChfX2hwdXgpCiNkZWZpbmUgQUZTX1NZU0NBTEwgNDgKCiNl
bGlmIGRlZmluZWQoYWxwaGEpCiNkZWZpbmUgQUZTX1NZU0NBTEwgMjMyCgojZWxpZiBkZWZp
bmVkKGxpbnV4KQojZGVmaW5lIEFGU19TWVNDQUxMIDEzNwoKI2VsaWYgZGVmaW5lZChfQUlY
KQojZGVmaW5lIEFGU19TWVNDQUxMIC0xCi8qIEFGU19TWVNDQUxMIG5vdCByZWFsbHkgdXNl
ZCBmb3IgQUlYICovCgojZWxzZQojZGVmaW5lIEFGU19TWVNDQUxMIChVbmtub3duX0FGU19T
WVNDQUxMKQojZW5kaWYKCi8qIE9ubHkgcnVuIHRoaXMgQUZTIFBBRyBjb2RlIG9uIHN5c3Rl
bXMgd2l0aCBQT1NJWAogKiBBbGwgdGhhdCB3ZSBhcmUgaW50ZXJlc3RlZCBpbiBkbzogQUlY
IDQueCwKICogU29sYXJpcyAyLngsIEhQVVggMTAueCwgSFBVWCAxMSBhbmQgU0dJIDYuNS4K
ICogVGhpcyBzaW1wbGlmaWVzIHRoZSBidWlsZC9jb25maWd1cmUgd2hpY2ggSSBkb24ndCAK
ICogd2FudCB0byBjaGFuZ2Ugbm93LgogKiBUaGV5IGFsc28gYWxsIGhhdmUgd2FpdHBpZCAg
YW5kIHdhaXQgdXNlcyBpbnQgd2FzIHdlbGwuIAogKi8KCiNkZWZpbmUgSEFWRV9XQUlUUElE
CiNkZWZpbmUgV0FJVF9VU0VTX0lOVAoKI2luY2x1ZGUgPHNpZ25hbC5oPgojaW5jbHVkZSA8
c2V0am1wLmg+CiNpZm5kZWYgUE9TSVhfU0VUSk1QCiN1bmRlZiBzaWdqbXBfYnVmCiN1bmRl
ZiBzaWdzZXRqbXAKI3VuZGVmIHNpZ2xvbmdqbXAKI2RlZmluZSBzaWdqbXBfYnVmICBqbXBf
YnVmCiNkZWZpbmUgc2lnc2V0am1wKGoscykgIHNldGptcChqKQojZGVmaW5lIHNpZ2xvbmdq
bXAgIGxvbmdqbXAKI2VuZGlmCgovKiBMaW51eCBkb2VzIG5vdCBoYXZlIHRoZSBTSUdTWVMg
Ki8KI2lmbmRlZiBTSUdTWVMKI2RlZmluZSBTSUdTWVMgU0lHVVNSMgojZW5kaWYKCiNpZmRl
ZiBQT1NJWF9TSUdOQUxTCnR5cGVkZWYgdm9pZCBzaWd0eXBlOwp0eXBlZGVmIHN0cnVjdCBz
aWdhY3Rpb24gaGFuZGxlcjsKI2RlZmluZSBoYW5kbGVyX2luaXQoSCxGKSAgICAgICAoc2ln
ZW1wdHlzZXQoJihIKS5zYV9tYXNrKSwgXAogICAgICAgICAgICAgICAgICAgICAoSCkuc2Ff
ZmxhZ3M9MCwgXAogICAgICAgICAgICAgICAgICAgICAoSCkuc2FfaGFuZGxlcj0oRikpCiNk
ZWZpbmUgaGFuZGxlcl9zd2FwKFMsTkVXLE9MRCkgICAgIHNpZ2FjdGlvbihTLCAmTkVXLCAm
T0xEKQojZGVmaW5lIGhhbmRsZXJfc2V0KFMsT0xEKSAgICAgIHNpZ2FjdGlvbihTLCAmT0xE
LCBOVUxMKQojZWxzZQp0eXBlZGVmIHNpZ3R5cGUgKCpoYW5kbGVyKSgpOwojZGVmaW5lIGhh
bmRsZXJfaW5pdChILEYpICAgICAgICgoSCkgPSAoRikpCiNkZWZpbmUgaGFuZGxlcl9zd2Fw
KFMsTkVXLE9MRCkgICAgICgoT0xEKSA9IHNpZ25hbCAoKFMpLCAoTkVXKSkpCiNkZWZpbmUg
aGFuZGxlcl9zZXQoUyxPTEQpICAgICAgKHNpZ25hbCAoKFMpLCAoT0xEKSkpCiNlbmRpZgoK
I2lmZGVmICBXQUlUX1VTRVNfSU5UCiAgICAgICAgICAgICAgICBpbnQgd2FpdF9zdGF0dXM7
CiNlbHNlICAgLyogV0FJVF9VU0VTX0lOVCAqLwogICAgICAgICAgICAgICAgdW5pb24gd2Fp
dCB3YWl0X3N0YXR1czsKI2VuZGlmICAvKiBXQUlUX1VTRVNfSU5UICovCgoKc3RhdGljIHNp
Z2ptcF9idWYgc2V0cGFnX2J1ZjsKCnN0YXRpYyBzaWd0eXBlIG15c2lnKCkKewogIHNpZ2xv
bmdqbXAoc2V0cGFnX2J1ZiwgMSk7Cn0KCi8qIGxzZXRwYWd4IC0gZG8gdGhlIHN5c2NhbGwu
IElmIHRoZSBrZXJuZWwgZXh0ZW50aW9ucwogKiBhcmUgbm90IGxvYWRlZCwgb24gbW9zdCBz
eXN0ZW1zIGl0IHdpbGwgZ2V0IGEgU0lHU1lTCiAqIGZhaWx0LiBPbiBBSVggaXQgY2FuIGdl
dCBhIFNJR1NFR1YKICovCgppbnQgCmxzZXRwYWd4KCkKeyAKICBoYW5kbGVyIHNhMSwgb3Nh
MTsKICBoYW5kbGVyIHNhMiwgb3NhMjsKICBpbnQgcmV0ID0gLTI7CiAgaW50IHN5c2NhbGxf
bnVtID0gQUZTX1NZU0NBTEw7CgojaWYgZGVmaW5lZChzdW4pICYmIGRlZmluZWQoX19TVlI0
KQoJewoJCWNoYXIgYnVmWzI1Nl07CgkJbG9uZyBidWZfbGVuOwoJCWJ1Zl9sZW4gPSAyNTY7
CgkJc3lzY2FsbF9udW0gPSAxMDU7CgkJaWYgKHN5c2luZm8oU0lfUkVMRUFTRSxidWYsIGJ1
Zl9sZW4pID4gMCkgewoJCSAgICAgIGlmICghc3RyY21wKGJ1ZiwiNS42IikpICBzeXNjYWxs
X251bSA9IDEwNTsKCQkgZWxzZSBpZiAoIXN0cmNtcChidWYsIjUuNyIpKSAgc3lzY2FsbF9u
dW0gPSA3MzsKCQkgZWxzZSBpZiAoIXN0cmNtcChidWYsIjUuOCIpKSAgc3lzY2FsbF9udW0g
PSA2NTsKCQkgZWxzZSBpZiAoIXN0cmNtcChidWYsIjUuOSIpKSAgc3lzY2FsbF9udW0gPSA2
NTsKCQl9Cgl9CiNlbmRpZgoKICBoYW5kbGVyX2luaXQgKHNhMSwgbXlzaWcpOwogIGhhbmRs
ZXJfaW5pdCAoc2EyLCBteXNpZyk7CiAgaGFuZGxlcl9zd2FwIChTSUdTWVMsIHNhMSwgb3Nh
MSk7CiAgaGFuZGxlcl9zd2FwIChTSUdTRUdWLCBzYTIsIG9zYTIpOwoKICBpZiAoc2lnc2V0
am1wKHNldHBhZ19idWYsIDEpID09IDApIHsKCiNpZiBkZWZpbmVkKF9BSVgpCiAgICBzdGF0
aWMgaW50ICgqYXBhZ2FpeCkoKSA9IDA7CgogICAgaWYgKCFhcGFnYWl4KQogICAgICBhcGFn
YWl4ID0gbG9hZChfUEFUSF9BRlNfRVhURVJOQUxfUFJPR1JBTSAiL2FwYWdhaXgiLDAsMCk7
CiAgICBpZiAoYXBhZ2FpeCkKICAgICAgcmV0ID0gKCphcGFnYWl4KSgpOwojZWxzZQogICAg
cmV0ID0gIHN5c2NhbGwoc3lzY2FsbF9udW0sIEFGU0NBTExfU0VUUEFHLCAwLCAwLCAwLCAw
LCAwKTsKI2VuZGlmCgogICAgaGFuZGxlcl9zZXQgKFNJR1NZUywgb3NhMSk7CiAgICBoYW5k
bGVyX3NldCAoU0lHU0VHViwgb3NhMik7CiAgICByZXR1cm4ocmV0KTsKICB9CgogIC8qIHN5
c2NhbGwgZmFpbGVkISByZXR1cm4gLTIgKi8KICBoYW5kbGVyX3NldCAoU0lHU1lTLCBvc2Ex
KTsKICBoYW5kbGVyX3NldCAoU0lHU0VHViwgb3NhMik7CiAgcmV0dXJuKC0yKTsKfQoKaW50
CmdldF9hZnNfdG9rZW4oY2hhciAqIGV4dGVybmFsX3Byb2dyYW0sCgkJCSAgY2hhciAqKiBl
bnYsCgkJCSAgY2hhciAqIGhvbWVkaXIsCgkJCSAgaW50IHNldHBhZykKewoJcGlkX3QgcGlk
OwoJaW50IHN0YXR1czsKCXN0cnVjdCBzdGF0IHN0eDsKCWNoYXIgKiBwcGF0aCA9IF9QQVRI
X0FGU19FWFRFUk5BTF9QUk9HUkFNOwoJY2hhciAqIGFyZ3NbNV07ICAvKiBhcmcwLCAtcGF0
aCwgaG9tZWRpciwgTlVMTCAqLwoJaW50ICBhcmdpID0gMDsgCgkKCglpZiAoc2V0cGFnKSAg
IC8qIHRyeSB0byBnZXQgYSBQQUcgdXNpbmcgc3lzY2FsbCAqLwoJCWxzZXRwYWd4KCk7IAoK
CWlmIChleHRlcm5hbF9wcm9ncmFtKQoJCXBwYXRoID0gZXh0ZXJuYWxfcHJvZ3JhbTsKCgkv
KiB0ZXN0IGlmIGV4dGVybmFsIHByb2dyYW0gZXhpc3RzICovCglpZiAoc3RhdChwcGF0aCwg
JnN0eCkpCgkJcmV0dXJuIDA7IC8qIGRvZXMgbm90IGV4aXN0LCBza2lwIGdldHRpbmcgUEFH
IGFuZCB0b2tlbiAqLwoKCWFyZ3NbYXJnaSsrXSA9ICJnZXQtYWZzLXRva2VuIjsKCWlmICho
b21lZGlyKSB7CgkJYXJnc1thcmdpKytdID0gIi1wIjsKCQlhcmdzW2FyZ2krK10gPSBob21l
ZGlyOwoJfQoJYXJnc1thcmdpXSA9IE5VTEw7CgoJaWYgKChwaWQgPSBmb3JrKCkpIDwgMCkg
ewoJCXJldHVybiAtMTsgLyogc2VlIGVycm5vICovCgl9CgoJaWYgKHBpZCA9PSAwKSB7CQoJ
CS8qIERvbid0IHdhbnQgYW55IG91dHB1dCBjb25mdXNpbmcgdGhlIGRlYW1vbiAqLwoJCWNs
b3NlKDEpOwoJCW9wZW4oIi9kZXYvbnVsbCIsT19XUk9OTFkpOwoJCWNsb3NlKDIpOwoJCW9w
ZW4oIi9kZXYvbnVsbCIsT19XUk9OTFkpOwoKCQlpZiAoZW52KQoJCQlleGVjdmUocHBhdGgs
IGFyZ3MsIGVudik7CgkJZWxzZQoJCQlleGVjdihwcGF0aCwgYXJncyk7CgkJZXhpdCgxMjcp
OyAvKiBzaG91bGQgbmV2ZXIgZ2V0IGhlcmUgKi8KCX0KCQkKCXdoaWxlICh3YWl0cGlkKHBp
ZCwgJnN0YXR1cywgMCkgPCAwKSB7CgkJaWYgKGVycm5vICE9IEVJTlRSKQoJCWJyZWFrOwoJ
fQoKCS8qIHdlIGNvdWxkIHNldCBhIHJldHVybiBjb2RlIGJhc2VkIG9uIHN0YXR1cywKCSAq
IGJlIHdlIHdhbnQgdG8gZ28gb24gd2l0aCBvciB3aXRob3V0IGEgdG9rZW4gKi8KCglyZXR1
cm4gMDsKfQo=
--------------18947210788547DE88D1126A
Content-Type: text/plain; charset=us-ascii;
name="servconf.patch"
Content-Disposition: inline;
filename="servconf.patch"
Content-Transfer-Encoding: 7bit
*** ,servconf.c Wed Mar 3 13:21:19 2004
--- servconf.c Wed Mar 3 13:23:22 2004
***************
*** 308,314 ****
{ "kerberosauthentication", sKerberosAuthentication },
{ "kerberosorlocalpasswd", sKerberosOrLocalPasswd },
{ "kerberosticketcleanup", sKerberosTicketCleanup },
! #ifdef USE_AFS
{ "kerberosgetafstoken", sKerberosGetAFSToken },
#else
{ "kerberosgetafstoken", sUnsupported },
--- 308,314 ----
{ "kerberosauthentication", sKerberosAuthentication },
{ "kerberosorlocalpasswd", sKerberosOrLocalPasswd },
{ "kerberosticketcleanup", sKerberosTicketCleanup },
! #if defined(USE_AFS) || defined(ANL_AFS_PAG)
{ "kerberosgetafstoken", sKerberosGetAFSToken },
#else
{ "kerberosgetafstoken", sUnsupported },
--------------18947210788547DE88D1126A
Content-Type: text/plain; charset=us-ascii;
name="session.patch"
Content-Disposition: inline;
filename="session.patch"
Content-Transfer-Encoding: 7bit
*** ,session.c Wed Mar 3 13:31:56 2004
--- session.c Wed Mar 3 13:31:56 2004
***************
*** 58,66 ****
--- 58,70 ----
#include "session.h"
#include "monitor_wrap.h"
+ #ifdef ANL_AFS_PAG
+ int get_afs_token(char * pgm, char ** env, char *homedir, int setpag);
+ #else
#if defined(KRB5) && defined(USE_AFS)
#include <kafs.h>
#endif
+ #endif
#ifdef GSSAPI
#include "ssh-gss.h"
***************
*** 1453,1458 ****
--- 1457,1470 ----
*/
environ = env;
+ #ifdef ANL_AFS_PAG
+ /* Get PAG and AFS token using external program and KRB5CCNAME */
+ if (options.kerberos_get_afs_token) {
+ debug("Getting AFS PAG and token");
+ get_afs_token(NULL, env, pw->pw_dir, 1);
+ }
+ #else
+
#if defined(KRB5) && defined(USE_AFS)
/*
* At this point, we check to see if AFS is active and if we have
***************
*** 1477,1482 ****
--- 1489,1495 ----
krb5_afslog_home(s->authctxt->krb5_ctx,
s->authctxt->krb5_fwd_ccache, NULL, NULL, pw->pw_dir);
}
+ #endif
#endif
/* Change current directory to the user\'s home directory. */
--------------18947210788547DE88D1126A--