[5516] in Moira
Two patches
daemon@ATHENA.MIT.EDU (Evan Broder)
Sat Jan 2 18:33:40 2010
MIME-Version: 1.0
Date: Sat, 2 Jan 2010 17:33:27 -0600
Message-ID: <178868c41001021533x11666164i1fc8a059779237ef@mail.gmail.com>
From: Evan Broder <broder@MIT.EDU>
To: moiradev@mit.edu
Content-Type: multipart/mixed; boundary=000e0cd724d44354cb047c36ea7e
--000e0cd724d44354cb047c36ea7e
Content-Type: text/plain; charset=ISO-8859-1
Hi -
I've attached two patches I put together as part of my work on
MacAthena, and one from Debathena
First, ./configure sets a sysconfdir variable, intended for
system-wide configuration files (i.e. the configurable version of
/etc). respect-sysconfdir.diff causes the update_server to respect
sysconfdir when installing and looking for moira.conf.
Second, OS X has a bizarro version of com_err. For whatever reason,
initialize_FOO_error_table() is a NOOP; unless you call
add_error_table(&et_FOO_error_table) instead, com_err doesn't have
access to the error tables and you get numeric error messages. Except
for libkrb5, where you need to build with -framework Kerberos to get
access to the error tables (but don't need to call add_error_table).
Like I said, bizarro.
fix-os-x-comerr.diff updates both the build flags and
initialize_FOO_error_table calls to do the correct thing. Both patches
will only have any effect if Moira is being built on OS X. (The patch
to configure.in is based on r23277 I committed to Debathena a while
back).
Finally, now Moira can be built as a shared library, but it's not
possible to build additional out-of-tree clients against it, because
the headers aren't currently installed. I'm particularly interested in
seeing the headers installed for my Python bindings to libmoira[1],
which Debathena is hoping to use in a series of more user-friendly
graphical Moira clients in the near future. install-headers.diff
installs <moira/moira.h>, <moira/mr_et.h>, <moira/krb_et.h>, and
<moira/ureg_err.h>. I put them under the moira/ subdirectory to avoid
any potential conflicts with krb_et.h, but if you'd prefer to see them
go directly into $(includedir), that's fine with me as well.
As always, please let me know if you have any comments or concerns, or
if there's anything I can do to improve these patches.
Thanks,
- Evan
[1] http://github.com/ebroder/python-moira
--000e0cd724d44354cb047c36ea7e
Content-Type: application/octet-stream; name="respect-sysconfdir.diff"
Content-Disposition: attachment; filename="respect-sysconfdir.diff"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_g3z0gvdy0
SW5kZXg6IHVwZGF0ZS9NYWtlZmlsZS5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB1cGRhdGUvTWFrZWZpbGUu
aW4JKHJldmlzaW9uIDM5NDUpCisrKyB1cGRhdGUvTWFrZWZpbGUuaW4JKHdvcmtpbmcgY29weSkK
QEAgLTQsNyArNCw3IEBACiBAU0VUX01BS0VACiAKIENDPUBDQ0AKLUNQUEZMQUdTPUBDUFBGTEFH
U0AKK0NQUEZMQUdTPUBDUFBGTEFHU0AgLURDT05GSUdfRklMRT1cIiQoc3lzY29uZmRpcikvYXRo
ZW5hL21vaXJhLmNvbmZcIgogQ0ZMQUdTPUBDRkxBR1NACiBERUZTPUBERUZTQAogQUxMX0NGTEFH
Uz0kKENQUEZMQUdTKSAkKENGTEFHUykgJChERUZTKQpAQCAtNTAsOCArNTAsOCBAQAogaW5zdGFs
bDogYWxsCiAJJChMSUJUT09MKSAtLW1vZGU9aW5zdGFsbCAkKElOU1RBTExfUFJPR1JBTSkgdXBk
YXRlX3Rlc3QgJChERVNURElSKSQoYmluZGlyKQogCSQoTElCVE9PTCkgLS1tb2RlPWluc3RhbGwg
JChJTlNUQUxMX1BST0dSQU0pIHVwZGF0ZV9zZXJ2ZXIgJChERVNURElSKSQoc2JpbmRpcikKLQkk
KFNSQ1RPUCkvbWtpbnN0YWxsZGlycyAkKERFU1RESVIpL2V0Yy9hdGhlbmEKLQkkKElOU1RBTEwp
IC1tIDY0NCBtb2lyYS5jb25mICQoREVTVERJUikvZXRjL2F0aGVuYS9tb2lyYS5jb25mCisJJChT
UkNUT1ApL21raW5zdGFsbGRpcnMgJChERVNURElSKSQoc3lzY29uZmRpcikvYXRoZW5hCisJJChJ
TlNUQUxMKSAtbSA2NDQgbW9pcmEuY29uZiAkKERFU1RESVIpJChzeXNjb25mZGlyKS9hdGhlbmEv
bW9pcmEuY29uZgogCiB1cGRhdGVfdGVzdDogJChDT0JKUykgJChNUl9MSUJERVApCiAJJChMSUJU
T09MKSAtLW1vZGU9bGluayAkKENDKSAtbyAkQCAkKExERkxBR1MpICQoQ09CSlMpICQoTElCUykK
SW5kZXg6IHVwZGF0ZS9jb25maWcuYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB1cGRhdGUvY29uZmlnLmMJKHJl
dmlzaW9uIDM5NDUpCisrKyB1cGRhdGUvY29uZmlnLmMJKHdvcmtpbmcgY29weSkKQEAgLTI2LDgg
KzI2LDYgQEAKIAogUkNTSUQoIiRIZWFkZXI6IC9hZnMvLmF0aGVuYS5taXQuZWR1L2FzdGFmZi9w
cm9qZWN0L21vaXJhZGV2L3JlcG9zaXRvcnkvbW9pcmEvdXBkYXRlL2NvbmZpZy5jLHYgMS43IDE5
OTgtMDItMTUgMTc6NDk6MjcgZGFudyBFeHAgJCIpOwogCi0jZGVmaW5lIENPTkZJR19GSUxFCSIv
ZXRjL2F0aGVuYS9tb2lyYS5jb25mIgotCiAvKiBWYXJpYWJsZXMgY3VycmVudGx5IHN1cHBvcnRl
ZDoKICAqIGNocm9vdCBkaXJlY3RvcnkJZGFlbW9uIHdpbGwgcnVuIGNocm9vdGVkIHRvIHRoaXMg
ZGlyZWN0b3J5CiAgKiB1c2VyIHVzZXJuYW1lCWRhZW1vbiB3aWxsIHJ1biB3aXRoIHRoaXMgdXNl
cidzIHVpZAo=
--000e0cd724d44354cb047c36ea7e
Content-Type: application/octet-stream; name="fix-os-x-comerr.diff"
Content-Disposition: attachment; filename="fix-os-x-comerr.diff"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_g3z0vzcp2
SW5kZXg6IGNvbmZpZ3VyZS5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBjb25maWd1cmUuaW4JKHJldmlzaW9u
IDM5NDUpCisrKyBjb25maWd1cmUuaW4JKHdvcmtpbmcgY29weSkKQEAgLTE0Miw2ICsxNDIsMTIg
QEAKIAkJCSAgICAgICAkTElCUEFUSCAtbGRlcyldLAogCQkgJExJQlBBVEggLWxkZXM0MjUgLWxr
cmI1IC1sJHtjcnlwdG99IC1sY29tX2VyciAtbHJlc29sdikKIGZpCitpZiB0ZXN0ICIkS1JCNF9M
SUJTIiAhPSAiIiA7IHRoZW4KKyAgICBBQ19DQU5PTklDQUxfVEFSR0VUCisgICAgY2FzZSAiJHRh
cmdldF9vcyIgaW4KKyAgICBkYXJ3aW4qKSBLUkI0X0xJQlM9IiRLUkI0X0xJQlMgLWZyYW1ld29y
ayBLZXJiZXJvcyIKKyAgICBlc2FjCitmaQogCiBBQ19NU0dfQ0hFQ0tJTkcoZm9yIEtlcmJlcm9z
IDUpCiBBQ19BUkdfV0lUSChrcmI1LApAQCAtMTYzLDYgKzE2OSwxMiBAQAogICAgIFJFR19TVlJf
REVGUz0tREtSQjQKICAgICBSRUdfU1ZSX0xJQlM9LWxrYWRtCiBmaQoraWYgdGVzdCAiJEtSQjVf
TElCUyIgIT0gIiIgOyB0aGVuCisgICAgQUNfQ0FOT05JQ0FMX1RBUkdFVAorICAgIGNhc2UgIiR0
YXJnZXRfb3MiIGluCisgICAgZGFyd2luKikgS1JCNV9MSUJTPSIkS1JCNV9MSUJTIC1mcmFtZXdv
cmsgS2VyYmVyb3MiCisgICAgZXNhYworZmkKIEFDX1NVQlNUKFJFR19TVlJfREVGUykKIEFDX1NV
QlNUKFJFR19TVlJfSU5DTFVERVMpCiBBQ19TVUJTVChSRUdfU1ZSX0xJQlMpCkluZGV4OiBjbGll
bnRzL21ydGVzdC9tcnRlc3QuYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBjbGllbnRzL21ydGVzdC9tcnRlc3Qu
YwkocmV2aXNpb24gMzk0NSkKKysrIGNsaWVudHMvbXJ0ZXN0L21ydGVzdC5jCSh3b3JraW5nIGNv
cHkpCkBAIC05Nyw4ICs5NywxMyBAQAogCX0KICAgICB9CiAKKyNpZiBkZWZpbmVkKF9fQVBQTEVf
XykgJiYgZGVmaW5lZChfX01BQ0hfXykKKyAgYWRkX2Vycm9yX3RhYmxlKCZldF9zbXNfZXJyb3Jf
dGFibGUpOworICBhZGRfZXJyb3JfdGFibGUoJmV0X2tyYl9lcnJvcl90YWJsZSk7CisjZWxzZQog
ICBpbml0aWFsaXplX3Ntc19lcnJvcl90YWJsZSgpOwogICBpbml0aWFsaXplX2tyYl9lcnJvcl90
YWJsZSgpOworI2VuZGlmCiAKICNpZmRlZiBIQVZFX1JFQURMSU5FCiAgIC8qIHdlIGRvbid0IHdh
bnQgZmlsZW5hbWUgY29tcGxldGlvbiAqLwpJbmRleDogbGliL21yX2luaXQuYwo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBsaWIvbXJfaW5pdC5jCShyZXZpc2lvbiAzOTQ1KQorKysgbGliL21yX2luaXQuYwkod29y
a2luZyBjb3B5KQpAQCAtMjAsOCArMjAsMTUgQEAKICAgaWYgKG1yX2luaXRlZCkKICAgICByZXR1
cm47CiAKKyNpZiBkZWZpbmVkKF9fQVBQTEVfXykgJiYgZGVmaW5lZChfX01BQ0hfXykKKyAgYWRk
X2Vycm9yX3RhYmxlKCZldF9zbXNfZXJyb3JfdGFibGUpOworICBhZGRfZXJyb3JfdGFibGUoJmV0
X2tyYl9lcnJvcl90YWJsZSk7CisgIGFkZF9lcnJvcl90YWJsZSgmZXRfdXJlZ19lcnJvcl90YWJs
ZSk7CisjZWxzZQogICBpbml0aWFsaXplX3Ntc19lcnJvcl90YWJsZSgpOwogICBpbml0aWFsaXpl
X2tyYl9lcnJvcl90YWJsZSgpOwogICBpbml0aWFsaXplX3VyZWdfZXJyb3JfdGFibGUoKTsKKyNl
bmRpZgorCiAgIG1yX2luaXRlZCA9IDE7CiB9Cg==
--000e0cd724d44354cb047c36ea7e
Content-Type: application/octet-stream; name="install-headers.diff"
Content-Disposition: attachment; filename="install-headers.diff"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_g3z11bbg2
SW5kZXg6IGluY2x1ZGUvTWFrZWZpbGUuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gaW5jbHVkZS9NYWtlZmls
ZS5pbgkocmV2aXNpb24gMzk0NSkKKysrIGluY2x1ZGUvTWFrZWZpbGUuaW4JKHdvcmtpbmcgY29w
eSkKQEAgLTcsNiArNywxMCBAQAogU1JDVE9QPUB0b3Bfc3JjZGlyQAogQlVJTERUT1A9Li4vLi4K
IAorcHJlZml4PUBwcmVmaXhACitpbmNsdWRlZGlyPUBpbmNsdWRlZGlyQAorSU5TVEFMTD1ASU5T
VEFMTEAKKwogYWxsOgogCiBjbGVhbjoKQEAgLTE3LDMgKzIxLDUgQEAKIGRlcGVuZDoKIAogaW5z
dGFsbDoKKwkkKFNSQ1RPUCkvbWtpbnN0YWxsZGlycyAkKERFU1RESVIpJChpbmNsdWRlZGlyKS9t
b2lyYQorCSQoSU5TVEFMTCkgbW9pcmEuaCAkKERFU1RESVIpJChpbmNsdWRlZGlyKS9tb2lyYQpJ
bmRleDogbGliL01ha2VmaWxlLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGxpYi9NYWtlZmlsZS5pbgkocmV2
aXNpb24gMzk0NSkKKysrIGxpYi9NYWtlZmlsZS5pbgkod29ya2luZyBjb3B5KQpAQCAtMjUsNiAr
MjUsNyBAQAogcHJlZml4PUBwcmVmaXhACiBleGVjX3ByZWZpeD1AZXhlY19wcmVmaXhACiBsaWJk
aXI9QGxpYmRpckAKK2luY2x1ZGVkaXI9QGluY2x1ZGVkaXJACiAKIE9CSlM9CWNyaXRpY2FsLmxv
IGZpeGhvc3QubG8gZml4bmFtZS5sbyBcCiAJaGFzaC5sbyBrbmFtZV91bnBhcnNlLmxvIGtuYW1l
X3BhcnNlLmxvIGtyYl9ldC5sbyBtcl9hY2Nlc3MubG8gbXJfYXV0aC5sbyBcCkBAIC01NCw2ICs1
NSw4IEBACiAKIGluc3RhbGw6IGFsbAogCSQoTElCVE9PTCkgLS1tb2RlPWluc3RhbGwgICQoSU5T
VEFMTCkgbGlibW9pcmEubGEgJChERVNURElSKSQobGliZGlyKS9saWJtb2lyYS5sYQorCSQoU1JD
VE9QKS9ta2luc3RhbGxkaXJzICQoREVTVERJUikkKGluY2x1ZGVkaXIpL21vaXJhCisJJChJTlNU
QUxMKSBtcl9ldC5oIGtyYl9ldC5oIHVyZWdfZXJyLmggJChERVNURElSKSQoaW5jbHVkZWRpcikv
bW9pcmEKIAogbGlibW9pcmEubGE6ICQoT0JKUykKIAkkKExJQlRPT0wpIC0tbW9kZT1saW5rICQo
Q0MpICQoQUxMX0xERkxBR1MpIC1vICRAICQoT0JKUykgLXJwYXRoICQobGliZGlyKSAtdmVyc2lv
bi1pbmZvIDA6MDowCg==
--000e0cd724d44354cb047c36ea7e--
