[OpenAFS-devel] patch: make jafs work again (at least the libadmin portion)

[Adam Megacz]

--=-=-=


This patch fixes some problems with jafs; after applying it I'm able
to use the portion that corresponds to libadmin. 

Changes:

  - Add a Token(cellname) constructor which extracts the token from
    the kernel cache manager (assumes we're on a system that has a
    cache manager).  This calls afsclient_TokenGetExisting().  Use
    this if you're in a non-kaserver cell.

  - Updates to make the Java 1.5 compiler happy.

  - Updates to command-line include options

  - Link with libafsutil.a (for strlcpy())



--=-=-=
Content-Type: application/octet-stream
Content-Disposition: attachment;
 filename=openafs-jafs-token-from-kernel-patch
Content-Transfer-Encoding: base64

PyBjb25mLnNoCj8gbm9odXAub3V0Cj8gc3JjL2NvbmYuc2gKPyBzcmMvSkFWQS9jbGFzc2VzL29y
Zy9vcGVuYWZzL2phZnMvQUNMJEVudHJ5LmNsYXNzCj8gc3JjL0pBVkEvY2xhc3Nlcy9vcmcvb3Bl
bmFmcy9qYWZzL0FDTC5jbGFzcwo/IHNyYy9KQVZBL2NsYXNzZXMvb3JnL29wZW5hZnMvamFmcy9B
RlNFeGNlcHRpb24uY2xhc3MKPyBzcmMvSkFWQS9jbGFzc2VzL29yZy9vcGVuYWZzL2phZnMvQUZT
RmlsZUV4Y2VwdGlvbi5jbGFzcwo/IHNyYy9KQVZBL2NsYXNzZXMvb3JnL29wZW5hZnMvamFmcy9B
RlNMaWJyYXJ5TG9hZGVyLmNsYXNzCj8gc3JjL0pBVkEvY2xhc3Nlcy9vcmcvb3BlbmFmcy9qYWZz
L0FGU1NlY3VyaXR5RXhjZXB0aW9uLmNsYXNzCj8gc3JjL0pBVkEvY2xhc3Nlcy9vcmcvb3BlbmFm
cy9qYWZzL0FGU1NodXRkb3duSGFuZGxlci5jbGFzcwo/IHNyYy9KQVZBL2NsYXNzZXMvb3JnL29w
ZW5hZnMvamFmcy9DZWxsLmNsYXNzCj8gc3JjL0pBVkEvY2xhc3Nlcy9vcmcvb3BlbmFmcy9qYWZz
L0Vycm9yVGFibGUuY2xhc3MKPyBzcmMvSkFWQS9jbGFzc2VzL29yZy9vcGVuYWZzL2phZnMvRmls
ZS5jbGFzcwo/IHNyYy9KQVZBL2NsYXNzZXMvb3JnL29wZW5hZnMvamFmcy9GaWxlSW5wdXRTdHJl
YW0uY2xhc3MKPyBzcmMvSkFWQS9jbGFzc2VzL29yZy9vcGVuYWZzL2phZnMvRmlsZU91dHB1dFN0
cmVhbS5jbGFzcwo/IHNyYy9KQVZBL2NsYXNzZXMvb3JnL29wZW5hZnMvamFmcy9Hcm91cC5jbGFz
cwo/IHNyYy9KQVZBL2NsYXNzZXMvb3JnL29wZW5hZnMvamFmcy9LZXkuY2xhc3MKPyBzcmMvSkFW
QS9jbGFzc2VzL29yZy9vcGVuYWZzL2phZnMvUFRTRW50cnkuY2xhc3MKPyBzcmMvSkFWQS9jbGFz
c2VzL29yZy9vcGVuYWZzL2phZnMvUGFydGl0aW9uLmNsYXNzCj8gc3JjL0pBVkEvY2xhc3Nlcy9v
cmcvb3BlbmFmcy9qYWZzL1Byb2Nlc3MuY2xhc3MKPyBzcmMvSkFWQS9jbGFzc2VzL29yZy9vcGVu
YWZzL2phZnMvU2VydmVyJEV4ZWN1dGFibGVUaW1lLmNsYXNzCj8gc3JjL0pBVkEvY2xhc3Nlcy9v
cmcvb3BlbmFmcy9qYWZzL1NlcnZlci5jbGFzcwo/IHNyYy9KQVZBL2NsYXNzZXMvb3JnL29wZW5h
ZnMvamFmcy9Ub2tlbi5jbGFzcwo/IHNyYy9KQVZBL2NsYXNzZXMvb3JnL29wZW5hZnMvamFmcy9V
c2VyLmNsYXNzCj8gc3JjL0pBVkEvY2xhc3Nlcy9vcmcvb3BlbmFmcy9qYWZzL1ZlcnNpb25JbmZv
LmNsYXNzCj8gc3JjL0pBVkEvY2xhc3Nlcy9vcmcvb3BlbmFmcy9qYWZzL1ZvbHVtZS5jbGFzcwo/
IHNyYy9KQVZBL2xpYmphZnMvVGVzdC5jbGFzcwo/IHNyYy9KQVZBL2xpYmphZnMvVGVzdC5qYXZh
Cj8gc3JjL0pBVkEvbGliamFmcy9qYWZzLmphcgo/IHNyYy9KQVZBL2xpYmphZnMvb3JnX29wZW5h
ZnNfamFmc19BQ0wuaAo/IHNyYy9KQVZBL2xpYmphZnMvb3JnX29wZW5hZnNfamFmc19BQ0xfRW50
cnkuaAo/IHNyYy9KQVZBL2xpYmphZnMvb3JnX29wZW5hZnNfamFmc19DZWxsLmgKPyBzcmMvSkFW
QS9saWJqYWZzL29yZ19vcGVuYWZzX2phZnNfRmlsZS5oCj8gc3JjL0pBVkEvbGliamFmcy9vcmdf
b3BlbmFmc19qYWZzX0ZpbGVJbnB1dFN0cmVhbS5oCj8gc3JjL0pBVkEvbGliamFmcy9vcmdfb3Bl
bmFmc19qYWZzX0ZpbGVPdXRwdXRTdHJlYW0uaAo/IHNyYy9KQVZBL2xpYmphZnMvb3JnX29wZW5h
ZnNfamFmc19Hcm91cC5oCj8gc3JjL0pBVkEvbGliamFmcy9vcmdfb3BlbmFmc19qYWZzX0tleS5o
Cj8gc3JjL0pBVkEvbGliamFmcy9vcmdfb3BlbmFmc19qYWZzX1BhcnRpdGlvbi5oCj8gc3JjL0pB
VkEvbGliamFmcy9vcmdfb3BlbmFmc19qYWZzX1Byb2Nlc3MuaAo/IHNyYy9KQVZBL2xpYmphZnMv
b3JnX29wZW5hZnNfamFmc19TZXJ2ZXIuaAo/IHNyYy9KQVZBL2xpYmphZnMvb3JnX29wZW5hZnNf
amFmc19TZXJ2ZXJfRXhlY3V0YWJsZVRpbWUuaAo/IHNyYy9KQVZBL2xpYmphZnMvb3JnX29wZW5h
ZnNfamFmc19Ub2tlbi5oCj8gc3JjL0pBVkEvbGliamFmcy9vcmdfb3BlbmFmc19qYWZzX1VzZXIu
aAo/IHNyYy9KQVZBL2xpYmphZnMvb3JnX29wZW5hZnNfamFmc19WZXJzaW9uSW5mby5oCj8gc3Jj
L0pBVkEvbGliamFmcy9vcmdfb3BlbmFmc19qYWZzX1ZvbHVtZS5oCj8gc3JjL3BhY2thZ2luZy9N
YWNPUy9PcGVuQUZTLkluZm8ucGxpc3QKPyBzcmMvcGFja2FnaW5nL01hY09TL09wZW5BRlMuaW5m
bwo/IHNyYy9wYWNrYWdpbmcvTWFjT1MvYnVpbGRwa2cuc2gKPyBzcmMvcGFja2FnaW5nL1JlZEhh
dC9vcGVuYWZzLnNwZWMKSW5kZXg6IHNyYy9KQVZBL2NsYXNzZXMvb3JnL29wZW5hZnMvamFmcy9U
b2tlbi5qYXZhCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvb3BlbmFmcy9zcmMvSkFWQS9jbGFz
c2VzL29yZy9vcGVuYWZzL2phZnMvVG9rZW4uamF2YSx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4z
CmRpZmYgLXUgLXIxLjMgVG9rZW4uamF2YQotLS0gc3JjL0pBVkEvY2xhc3Nlcy9vcmcvb3BlbmFm
cy9qYWZzL1Rva2VuLmphdmEJMTUgT2N0IDIwMDUgMDI6MTI6MjMgLTAwMDAJMS4zCisrKyBzcmMv
SkFWQS9jbGFzc2VzL29yZy9vcGVuYWZzL2phZnMvVG9rZW4uamF2YQkxNCBEZWMgMjAwNyAyMDo1
NDozMCAtMDAwMApAQCAtMTQ0LDYgKzE0NCwyMCBAQAogICB9CiAKICAgLyoqCisgICAqIENvbnN0
cnVjdHMgYSBuZXcgPENPREU+VG9rZW48L0NPREU+IG9iamVjdCBpbnN0YW5jZSBnaXZlbiB0aGUK
KyAgICogbmFtZSBvZiB0aGUgQUZTIGNlbGwgaXQgcmVwcmVzZW50czsgdGhlIHRva2VuIGZvciBh
ZG1pbmlzdHJhdGl2ZQorICAgKiBhY2Nlc3Mgd2lsbCBiZSBleHRyYWN0ZWQgZnJvbSB0aGUga2Vy
bmVsIGNhY2hlIG1hbmFnZXIgaWYgcG9zc2libGUuCisgICAqCisgICAqIEBwYXJhbSBjZWxsTmFt
ZSAgICB0aGUgbmFtZSBvZiB0aGUgY2VsbCB0byBUb2tlbiBpbnRvCisgICAqIEBleGNlcHRpb24g
QUZTRXhjZXB0aW9uICBJZiBhbiBlcnJvciBvY2N1cnMgaW4gdGhlIG5hdGl2ZSBjb2RlCisgICAq
LworICBwdWJsaWMgVG9rZW4oU3RyaW5nIGNlbGxOYW1lKSAKKyAgICAgIHRocm93cyBBRlNFeGNl
cHRpb24KKyAgeworICAgICAgdGhpcyhudWxsLCBudWxsLCBjZWxsTmFtZSk7CisgIH0KKworICAv
KioKICAgICogQ29uc3RydWN0cyBhIG5ldyA8Q09ERT5Ub2tlbjwvQ09ERT4gb2JqZWN0IGluc3Rh
bmNlIGdpdmVuIAogICAgKiB0aGUgbmFtZSBvZiB0aGUgQUZTIGNlbGwgaXQgcmVwcmVzZW50cyBh
bmQgdGhlIHVzZXJuYW1lIGFuZCBwYXNzd29yZCAKICAgICogb2YgdGhlIHVzZXIgdG8gYmUgVG9r
ZW5kIGZvciAKSW5kZXg6IHNyYy9KQVZBL2xpYmphZnMvQWRtaW5Ub2tlbi5jCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
UkNTIGZpbGU6IC9jdnMvb3BlbmFmcy9zcmMvSkFWQS9saWJqYWZzL0FkbWluVG9rZW4uYyx2CnJl
dHJpZXZpbmcgcmV2aXNpb24gMS40CmRpZmYgLXUgLXIxLjQgQWRtaW5Ub2tlbi5jCi0tLSBzcmMv
SkFWQS9saWJqYWZzL0FkbWluVG9rZW4uYwkxNSBPY3QgMjAwNSAwMjoxMjoyNCAtMDAwMAkxLjQK
KysrIHNyYy9KQVZBL2xpYmphZnMvQWRtaW5Ub2tlbi5jCTE0IERlYyAyMDA3IDIwOjU0OjMwIC0w
MDAwCkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSA8a2F1dGlscy5oPgogI2luY2x1ZGUgPGNl
bGxjb25maWcuaD4KICNpbmNsdWRlIDxhZnNfQWRtaW5DbGllbnRFcnJvcnMuaD4KKyNpbmNsdWRl
IDxyeC9yeGthZC5oPgogCiAvKioKICAqIFN0YXRpYyBmdW5jdGlvbiB1c2VkIHRvIGluaXRpYWxp
emUgdGhlIGNsaWVudCBsaWJyYXJ5IGFuZCB0aGUgCkBAIC03MSw2ICs3Miw3IEBACiAgIGNvbnN0
IGNoYXIgKnBhc3N3b3JkOwogICB2b2lkICp0b2tlbkhhbmRsZTsKICAgaW50IHJjOworICBpbnQg
ZXJyOwogCiAgIC8vIGNvbnZlcnQgamF2YSBzdHJpbmdzCiAgIGlmKCBqY2VsbE5hbWUgIT0gTlVM
TCApIHsgCkBAIC0xMDEsOCArMTAzLDExIEBACiAgICAgICBwYXNzd29yZCA9IE5VTEw7CiAgIH0K
IAotICBpZiAoICEoYWZzY2xpZW50X1Rva2VuR2V0TmV3KCBjZWxsTmFtZSwgdXNlck5hbWUsIHBh
c3N3b3JkLCAmdG9rZW5IYW5kbGUsIAotCQkJCSZhc3QpICkgKSB7CisgIGVyciA9IChwYXNzd29y
ZD09TlVMTCB8fCB1c2VyTmFtZT09TlVMTCkKKyAgICA/IGFmc2NsaWVudF9Ub2tlbkdldEV4aXN0
aW5nKCBjZWxsTmFtZSwgJnRva2VuSGFuZGxlLCAmYXN0KQorICAgIDogYWZzY2xpZW50X1Rva2Vu
R2V0TmV3KCBjZWxsTmFtZSwgdXNlck5hbWUsIHBhc3N3b3JkLCAmdG9rZW5IYW5kbGUsICZhc3Qp
OworCisgIGlmICggIWVyciApIHsKICAgICAvLyByZWxlYXNlIGNvbnZlcnRlZCBzdHJpbmdzCiAg
ICAgICBpZiggY2VsbE5hbWUgIT0gTlVMTCApIHsKIAkgICgqZW52KS0+UmVsZWFzZVN0cmluZ1VU
RkNoYXJzKGVudiwgamNlbGxOYW1lLCBjZWxsTmFtZSk7CkluZGV4OiBzcmMvSkFWQS9saWJqYWZz
L01ha2VmaWxlLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvb3BlbmFmcy9zcmMvSkFWQS9s
aWJqYWZzL01ha2VmaWxlLmluLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjUKZGlmZiAtdSAtcjEu
NSBNYWtlZmlsZS5pbgotLS0gc3JjL0pBVkEvbGliamFmcy9NYWtlZmlsZS5pbgkyNCBKdW4gMjAw
NiAwNToxNDowOSAtMDAwMAkxLjUKKysrIHNyYy9KQVZBL2xpYmphZnMvTWFrZWZpbGUuaW4JMTQg
RGVjIDIwMDcgMjA6NTQ6MzAgLTAwMDAKQEAgLTEzLDcgKzEzLDcgQEAKIFRPUF9JTkNESVI9QFRP
UF9JTkNESVJACiBUT1BfTElCRElSPUBUT1BfTElCRElSQAogVE9QX0pMSUJESVI9QFRPUF9TUkNE
SVJAL0pBVkEvbGliamFmcwotSk5JX0lOQz0ke0pBVkFfSE9NRX0vaW5jbHVkZQorSk5JX0lOQz0t
SSAke0pBVkFfSE9NRX0vaW5jbHVkZSAtSSBgZGlybmFtZSAke0pBVkFfSE9NRX0vaW5jbHVkZS8q
L2puaV9tZC5oYAogcHJlZml4PUBwcmVmaXhACiBleGVjX3ByZWZpeD1AZXhlY19wcmVmaXhACiBk
YXRhcm9vdGRpcj1AZGF0YXJvb3RkaXJACkBAIC0zNiwxMCArMzYsMTAgQEAKIE9CSkVDVF9GTEFH
UyA9IC1mUElDIC1jCiAKIGlmZXEgIiQoQlVJTERfVFlQRSkiICJhZG1pbiIKLQlJTkMgOj0gLUkk
e1RPUF9JTkNESVJ9IC1JJHtUT1BfSU5DRElSfS9hZnMvIC1JJHtKQVZBX0hPTUV9L2luY2x1ZGUg
LUkgJHtKTklfSU5DfQorCUlOQyA6PSAtSSR7VE9QX0lOQ0RJUn0gLUkke1RPUF9JTkNESVJ9L2Fm
cy8gJHtKTklfSU5DfQogCUNGTEFHUyA6PSAke0lOQ30gJHtEQkd9ICR7T1BUTVp9IC1JJHtUT1Bf
U1JDRElSfS9jb25maWcgJHtNVF9DRkxBR1N9CiBlbHNlCi0JSU5DIDo9IC1JJHtUT1BfU1JDRElS
fS9saWJ1YWZzIC1JJHtUT1BfSU5DRElSfSAtSSR7SkFWQV9IT01FfS9pbmNsdWRlIC1JICR7Sk5J
X0lOQ30KKwlJTkMgOj0gLUkke1RPUF9TUkNESVJ9L2xpYnVhZnMgLUkke1RPUF9JTkNESVJ9ICR7
Sk5JX0lOQ30KIAlDRkxBR1MgOj0gJHtJTkN9ICR7REJHfSAke09QVE1afSAke0ZTSU5DTFVERVN9
IC1EX1JFRU5UUkFOVCAtRExJQkpVQUZTICR7TVRfQ0ZMQUdTfQogZW5kaWYKIApAQCAtNTEsNyAr
NTEsNyBAQAogSkFWQURPQ1NESVIgPSBqYXZhZG9jcy8KIAogSkFWQUggPSAke0pBVkFfSE9NRX0v
YmluL2phdmFoIC1jbGFzc3BhdGggJHtST09UUEFDS0FHRURJUn0gLWpuaSAtZCAke0xJQkpBRlNB
RE1ESVJ9Ci1KQVZBQyA9ICR7SkFWQV9IT01FfS9iaW4vamF2YWMgLWNsYXNzcGF0aCAke1JPT1RQ
QUNLQUdFRElSfQorSkFWQUMgPSAke0pBVkFfSE9NRX0vYmluL2phdmFjIC1zb3VyY2UgMS40IC1j
bGFzc3BhdGggJHtST09UUEFDS0FHRURJUn0KIAogSl9OQVRJVkVfUFJFRklYID0gb3JnLm9wZW5h
ZnMuamFmcy4KIENfTkFUSVZFX1BSRUZJWCA9IG9yZ19vcGVuYWZzX2phZnNfCkBAIC0xNTQsNiAr
MTU0LDcgQEAKIAogTElCSkFGU19MSUJTID1cCiAJJHtUT1BfTElCRElSfS9saWJqdWFmcy5hIFwK
Kwkke1RPUF9MSUJESVJ9L2xpYmFmc3V0aWwuYSBcCiAJJHtUT1BfTElCRElSfS9saWJkZXMuYSBc
CiAJLWxyZXNvbHYgXAogCS1scHRocmVhZAo=
--=-=-=--