This message is in MIME format. The first part should be readable text,
while the remaining parts are likely unreadable without MIME-aware tools.
--1743242027-55662611-1201090177=:45874
Content-Type: TEXT/PLAIN; charset=US-ASCII
Attached is a patch against nagios-2.10 which carefully cuts out the
uses of d_type in dirent, if that's missing, and just falls back to
using stat (which follows symlinks).
This makes recursive cfg_dir structures work on Solaris 10.
Excuse the hackery: I've just carefully inserted additional checks for
_DIRENT_HAVE_D_TYPE around block ends.
Cheers,
jan
PS. I'm reasonably certain that what nagios tries to do in the cfg_dir
handling is unnecessarily clever; since stat() follows symlinks anyway,
just checking for file or directory types with a single stat() call
should be sufficient.
--
jan grant, ISYS, University of Bristol. http://www.bris.ac.uk/
Tel +44 (0)117 3317661 http://ioctl.org/jan/
Spreadsheet through network. Oh yeah.
--1743242027-55662611-1201090177=:45874
Content-Type: TEXT/PLAIN; charset=US-ASCII; name=nagios.diff.2
Content-Transfer-Encoding: BASE64
Content-ID:
Content-Description:
Content-Disposition: attachment; filename=nagios.diff.2
LS0tIHhkYXRhL3hvZHRlbXBsYXRlLmMJRnJpIEphbiAxOSAyMjowMjowMSAy
MDA3DQorKysgeGRhdGEveG9kdGVtcGxhdGUuYwlXZWQgSmFuIDIzIDExOjU3
OjI5IDIwMDgNCkBAIC0zOTIsMTEgKzM5MiwxMyBAQA0KICNpZmRlZiBfRElS
RU5UX0hBVkVfRF9UWVBFDQogCQkJLyogb25seSBwcm9jZXNzIG5vcm1hbCBm
aWxlcyBhbmQgc3ltbGlua3MgKi8NCiAJCQlpZihkaXJmaWxlLT5kX3R5cGU9
PURUX1VOS05PV04pew0KKyNlbmRpZg0KIAkJCQl4PXN0YXQoZmlsZSwmc3Rh
dF9idWYpOw0KIAkJCQlpZih4PT0wKXsNCiAJCQkJCWlmKCFTX0lTUkVHKHN0
YXRfYnVmLnN0X21vZGUpICYmICFTX0lTTE5LKHN0YXRfYnVmLnN0X21vZGUp
KQ0KIAkJCQkJCWNvbnRpbnVlOw0KIAkJCQkgICAgICAgIH0NCisjaWZkZWYg
X0RJUkVOVF9IQVZFX0RfVFlQRQ0KIAkJCSAgICAgICAgfQ0KIAkJCWVsc2V7
DQogCQkJCWlmKGRpcmZpbGUtPmRfdHlwZSE9RFRfUkVHICYmIGRpcmZpbGUt
PmRfdHlwZSE9RFRfTE5LKQ0KQEAgLTQxNyw2ICs0MTksNyBAQA0KIAkJaWYo
ZGlyZmlsZS0+ZF90eXBlPT1EVF9VTktOT1dOIHx8IGRpcmZpbGUtPmRfdHlw
ZT09RFRfRElSIHx8IGRpcmZpbGUtPmRfdHlwZT09RFRfTE5LKXsNCiANCiAJ
CQlpZihkaXJmaWxlLT5kX3R5cGU9PURUX1VOS05PV04pew0KKyNlbmRpZg0K
IAkJCQl4PXN0YXQoZmlsZSwmc3RhdF9idWYpOw0KIAkJCQlpZih4PT0wKXsN
CiAJCQkJCWlmKCFTX0lTRElSKHN0YXRfYnVmLnN0X21vZGUpICYmICFTX0lT
TE5LKHN0YXRfYnVmLnN0X21vZGUpKQ0KQEAgLTQyNCwxMiArNDI3LDE1IEBA
DQogCQkJCSAgICAgICAgfQ0KIAkJCQllbHNlDQogCQkJCQljb250aW51ZTsN
CisjaWZkZWYgX0RJUkVOVF9IQVZFX0RfVFlQRQ0KIAkJCSAgICAgICAgfQ0K
KyNlbmRpZg0KIA0KIAkJCS8qIGlnbm9yZSBjdXJyZW50LCBwYXJlbnQgYW5k
IGhpZGRlbiBkaXJlY3RvcnkgZW50cmllcyAqLw0KIAkJCWlmKGRpcmZpbGUt
PmRfbmFtZVswXT09Jy4nKQ0KIAkJCQljb250aW51ZTsNCiANCisjaWZkZWYg
X0RJUkVOVF9IQVZFX0RfVFlQRQ0KIAkJCS8qIGNoZWNrIHRoYXQgYSBzeW1s
aW5rIHBvaW50cyB0byBhIGRpciAqLw0KIA0KIAkJCWlmKGRpcmZpbGUtPmRf
dHlwZT09RFRfTE5LIHx8IChkaXJmaWxlLT5kX3R5cGU9PURUX1VOS05PV04g
JiYgU19JU0xOSyhzdGF0X2J1Zi5zdF9tb2RlKSkpew0KQEAgLTUwNSw2ICs1
MTEsNyBAQA0KIA0KIAkJCQkvKiBPdGhlcndpc2UsIHdlIG1heSBwcm9jZWVk
ISAqLw0KIAkJCSAgICAgICAgfQ0KKyNlbmRpZg0KIA0KIAkJCS8qIHByb2Nl
c3MgdGhlIGNvbmZpZyBkaXJlY3RvcnkgKi8NCiAJCQlyZXN1bHQ9eG9kdGVt
cGxhdGVfcHJvY2Vzc19jb25maWdfZGlyKGZpbGUsb3B0aW9ucyk7DQpAQCAt
NTEyLDYgKzUxOSw3IEBADQogCQkJLyogYnJlYWsgb3V0IGlmIHdlIGVuY291
bnRlcmVkIGFuIGVycm9yICovDQogCQkJaWYocmVzdWx0PT1FUlJPUikNCiAJ
CQkJYnJlYWs7DQorI2lmZGVmIF9ESVJFTlRfSEFWRV9EX1RZUEUNCiAJCSAg
ICAgICAgfQ0KICNlbmRpZg0KIAkJfQ0K
--1743242027-55662611-1201090177=:45874--
This post was automatically imported from historical nagios-devel mailing list archives
Original poster: [email protected]