Nagios Support Forum

This is a multi-part message in MIME format.

------_=_NextPart_001_01C78219.8CCC4AE3
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable

Ethan:

The documentation changed normal_check_interval and retry_check_interval =
in the service definition to check_interval and check_interval. I assume =
the second check_interval should have been retry_interval. This was not =
done in the source.

The attached patch fixes these problems (patched against the current =
CVS).

Nathan Kerr



------_=_NextPart_001_01C78219.8CCC4AE3
Content-Type: application/octet-stream;
name="service_definition.patch"
Content-Transfer-Encoding: base64
Content-Description: service_definition.patch
Content-Disposition: attachment;
filename="service_definition.patch"

LS0tIHhkYXRhL3hvZHRlbXBsYXRlLmMub3JpZwkyMDA3LTA0LTE4IDE2OjU3OjQ3LjAwMDAwMDAw
MCAtMDcwMAorKysgeGRhdGEveG9kdGVtcGxhdGUuYwkyMDA3LTA0LTE4IDE3OjEyOjA4LjAwMDAw
MDAwMCAtMDcwMApAQCAtMTU3OSwxMCArMTU3OSwxMCBAQAogCQluZXdfc2VydmljZS0+aGF2ZV9m
YWlsdXJlX3ByZWRpY3Rpb25fb3B0aW9ucz1GQUxTRTsKIAkJbmV3X3NlcnZpY2UtPm1heF9jaGVj
a19hdHRlbXB0cz0tMjsKIAkJbmV3X3NlcnZpY2UtPmhhdmVfbWF4X2NoZWNrX2F0dGVtcHRzPUZB
TFNFOwotCQluZXdfc2VydmljZS0+bm9ybWFsX2NoZWNrX2ludGVydmFsPTUuMDsKLQkJbmV3X3Nl
cnZpY2UtPmhhdmVfbm9ybWFsX2NoZWNrX2ludGVydmFsPUZBTFNFOwotCQluZXdfc2VydmljZS0+
cmV0cnlfY2hlY2tfaW50ZXJ2YWw9MS4wOwotCQluZXdfc2VydmljZS0+aGF2ZV9yZXRyeV9jaGVj
a19pbnRlcnZhbD1GQUxTRTsKKwkJbmV3X3NlcnZpY2UtPmNoZWNrX2ludGVydmFsPTUuMDsKKwkJ
bmV3X3NlcnZpY2UtPmhhdmVfY2hlY2tfaW50ZXJ2YWw9RkFMU0U7CisJCW5ld19zZXJ2aWNlLT5y
ZXRyeV9pbnRlcnZhbD0xLjA7CisJCW5ld19zZXJ2aWNlLT5oYXZlX3JldHJ5X2ludGVydmFsPUZB
TFNFOwogCQluZXdfc2VydmljZS0+YWN0aXZlX2NoZWNrc19lbmFibGVkPVRSVUU7CiAJCW5ld19z
ZXJ2aWNlLT5oYXZlX2FjdGl2ZV9jaGVja3NfZW5hYmxlZD1GQUxTRTsKIAkJbmV3X3NlcnZpY2Ut
PnBhc3NpdmVfY2hlY2tzX2VuYWJsZWQ9VFJVRTsKQEAgLTM0OTAsMTMgKzM0OTAsMTMgQEAKIAkJ
CXRlbXBfc2VydmljZS0+bWF4X2NoZWNrX2F0dGVtcHRzPWF0b2kodmFsdWUpOwogCQkJdGVtcF9z
ZXJ2aWNlLT5oYXZlX21heF9jaGVja19hdHRlbXB0cz1UUlVFOwogCQkgICAgICAgIH0KLQkJZWxz
ZSBpZighc3RyY21wKHZhcmlhYmxlLCJub3JtYWxfY2hlY2tfaW50ZXJ2YWwiKSl7Ci0JCQl0ZW1w
X3NlcnZpY2UtPm5vcm1hbF9jaGVja19pbnRlcnZhbD1zdHJ0b2QodmFsdWUsTlVMTCk7Ci0JCQl0
ZW1wX3NlcnZpY2UtPmhhdmVfbm9ybWFsX2NoZWNrX2ludGVydmFsPVRSVUU7Ci0JCSAgICAgICAg
fQotCQllbHNlIGlmKCFzdHJjbXAodmFyaWFibGUsInJldHJ5X2NoZWNrX2ludGVydmFsIikpewot
CQkJdGVtcF9zZXJ2aWNlLT5yZXRyeV9jaGVja19pbnRlcnZhbD1zdHJ0b2QodmFsdWUsTlVMTCk7
Ci0JCQl0ZW1wX3NlcnZpY2UtPmhhdmVfcmV0cnlfY2hlY2tfaW50ZXJ2YWw9VFJVRTsKKwkJZWxz
ZSBpZighc3RyY21wKHZhcmlhYmxlLCAiY2hlY2tfaW50ZXJ2YWwiKSB8fCAhc3RyY21wKHZhcmlh
YmxlLCJub3JtYWxfY2hlY2tfaW50ZXJ2YWwiKSl7CisJCQl0ZW1wX3NlcnZpY2UtPmNoZWNrX2lu
dGVydmFsPXN0cnRvZCh2YWx1ZSxOVUxMKTsKKwkJCXRlbXBfc2VydmljZS0+aGF2ZV9jaGVja19p
bnRlcnZhbD1UUlVFOworCQkgICAgICAgIH0KKwkJZWxzZSBpZighc3RyY21wKHZhcmlhYmxlLCAi
cmV0cnlfaW50ZXJ2YWwiKSB8fCAhc3RyY21wKHZhcmlhYmxlLCJyZXRyeV9jaGVja19pbnRlcnZh
bCIpKXsKKwkJCXRlbXBfc2VydmljZS0+cmV0cnlfaW50ZXJ2YWw9c3RydG9kKHZhbHVlLE5VTEwp
OworCQkJdGVtcF9zZXJ2aWNlLT5oYXZlX3JldHJ5X2ludGVydmFsPVRSVUU7CiAJCSAgICAgICAg
fQogCQllbHNlIGlmKCFzdHJjbXAodmFyaWFibGUsImFjdGl2ZV9jaGVja3NfZW5hYmxlZCIpKXsK
IAkJCXRlbXBfc2VydmljZS0+YWN0aXZlX2NoZWNrc19lbmFibGVkPShhdG9pKHZhbHVlKT4wKT9U
UlVFOkZBTFNFOwpAQCAtNTM0NSwxMCArNTM0NSwxMCBAQAogCS8qIGR1cGxpY2F0ZSBub24tc3Ry
aW5nIG1lbWJlcnMgKi8KIAluZXdfc2VydmljZS0+bWF4X2NoZWNrX2F0dGVtcHRzPXRlbXBfc2Vy
dmljZS0+bWF4X2NoZWNrX2F0dGVtcHRzOwogCW5ld19zZXJ2aWNlLT5oYXZlX21heF9jaGVja19h
dHRlbXB0cz10ZW1wX3NlcnZpY2UtPmhhdmVfbWF4X2NoZWNrX2F0dGVtcHRzOwotCW5ld19zZXJ2
aWNlLT5ub3JtYWxfY2hlY2tfaW50ZXJ2YWw9dGVtcF9zZXJ2aWNlLT5ub3JtYWxfY2hlY2tfaW50
ZXJ2YWw7Ci0JbmV3X3NlcnZpY2UtPmhhdmVfbm9ybWFsX2NoZWNrX2ludGVydmFsPXRlbXBfc2Vy
dmljZS0+aGF2ZV9ub3JtYWxfY2hlY2tfaW50ZXJ2YWw7Ci0JbmV3X3NlcnZpY2UtPnJldHJ5X2No
ZWNrX2ludGVydmFsPXRlbXBfc2VydmljZS0+cmV0cnlfY2hlY2tfaW50ZXJ2YWw7Ci0JbmV3X3Nl
cnZpY2UtPmhhdmVfcmV0cnlfY2hlY2tfaW50ZXJ2YWw9dGVtcF9zZXJ2aWNlLT5oYXZlX3JldHJ5
X2NoZWNrX2ludGVydmFsOworCW5ld19zZXJ2aWNlLT5jaGVja19pbnRlcnZhbD10ZW1wX3NlcnZp
Y2UtPmNoZWNrX2ludGVydmFsOworCW5ld19zZXJ2aWNlLT5oYXZlX2NoZWNrX2ludGVydmFsPXRl
bXBfc2VydmljZS0+aGF2ZV9jaGVja19pbnRlcnZhbDsKKwluZXdfc2VydmljZS0+cmV0cnlfaW50

...[email truncated]...


This post was automatically imported from historical nagios-devel mailing list archives
Original poster: [email protected]