Re: [Nagios-devel] [PATCH] - 3.0.3: only send out a service
Posted: Tue Jul 21, 2009 2:25 am
--0016364eeea875c6e2046f2eb5e5
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Argg, found a logic bug. Updated patch attached.
- Max
--0016364eeea875c6e2046f2eb5e5
Content-Type: application/octet-stream; name="notifications.c.patch"
Content-Disposition: attachment; filename="notifications.c.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_fxe21dxz1
LS0tIG5hZ2lvcy0zLjAuMy9iYXNlL25vdGlmaWNhdGlvbnMuYy5vcmlnCTIwMDgtMDYtMjMgMTY6
NDc6NDEuMDAwMDAwMDAwIC0wNDAwCisrKyBuYWdpb3MtMy4wLjMvYmFzZS9ub3RpZmljYXRpb25z
LmMJMjAwOS0wNy0yMCAyMjo0NzoxOC4wMDAwMDAwMDAgLTA0MDAKQEAgLTc4OCw2ICs3ODgsMTIg
QEAKIAlpbnQgbm90aWZpY2F0aW9uX251bWJlcj0wOwogCXRpbWVfdCBjdXJyZW50X3RpbWU9MEw7
CiAJc2VydmljZSAqdGVtcF9zZXJ2aWNlPU5VTEw7CisJLyogRm9yIHJlY292ZXJ5IGVzY2FsYXRp
b25zLCB1c2VkIHRvIGhlbHAgZGV0ZXJtaW5lIGlmIGFueSBlc2NhbGF0aW9uICAgKi8KKwkvKiB3
YXMgc2VudCBvdXQgd2l0aCBhIHByb2JsZW0gc3RhdGUgbGlzdGVkIGluIHRoZSBlc2NhbGF0aW9u
IHRvIGxldCB1cyAqLworCS8qIGtub3cgaWYgd2UgbmVlZCB0byBzZW5kIG91dCBhIHJlY292ZXJ5
IGZvciBjYXNlcyB3aGVyZSB0aGUgcHJldmlvdXMgICovCisJLyogbm9uLW9rIHN0YXRlIGlzIE5P
VCBsaXN0ZWQgaW4gdGhlIGVzY2FsYXRpb24gLiAgICAgICAgICAgICAgICAgICAgICAgKi8KKwlp
bnQgaT0wOworCWludCBzZW5kX3JlY292ZXJ5PUZBTFNFOwogCiAJbG9nX2RlYnVnX2luZm8oREVC
VUdMX0ZVTkNUSU9OUywwLCJpc192YWxpZF9lc2NhbGF0aW9uX2Zvcl9zZXJ2aWNlX25vdGlmaWNh
dGlvbigpXG4iKTsKIApAQCAtODIzLDggKzgyOSw3MiBAQAogCQlyZXR1cm4gRkFMU0U7CiAKIAkv
KiBza2lwIHRoaXMgZXNjYWxhdGlvbiBpZiB0aGUgc3RhdGUgb3B0aW9ucyBkb24ndCBtYXRjaCAq
LwotCWlmKHN2Yy0+Y3VycmVudF9zdGF0ZT09U1RBVEVfT0sgJiYgc2UtPmVzY2FsYXRlX29uX3Jl
Y292ZXJ5PT1GQUxTRSkKLQkJcmV0dXJuIEZBTFNFOworCWlmKHN2Yy0+Y3VycmVudF9zdGF0ZT09
U1RBVEVfT0speworCQlpZiAoc2UtPmVzY2FsYXRlX29uX3JlY292ZXJ5PT1GQUxTRSkKKwkJCXJl
dHVybiBGQUxTRTsKKworCQkvKiBJZiB0aGUgZXNjYWxhdGlvbiBzcGVjaWZpZXMgb25lIG9yIG1v
cmUgYWxlcnQgc3RhdGVzIChub24tb2spLCAgKi8KKwkJLyogb25seSBhbGxvdyB0aGUgZXNjYWxh
dGlvbiBpZiB0aGUgbm9uLW9rIHN0YXRlIGZyb20gdGhlIHByZXZpb3VzICovCisJCS8qIHNlcnZp
Y2Ugc3RhdGUgaXMgbGlzdGVkIGluIHRoZSBlc2NhbGF0aW9uIGFuZCBpZiB0aGUgZXNjYWxhdGlv
biAqLworCQkvKiBpcyBOT1QgdGhlIGZpcnN0IGVzY2FsYXRpb24gKGFzIHRoYXQgd291bGQgbWVh
biB0aGVyZSB3YXMgbm8gICAgKi8KKwkJLyogbm9uLW9rIGVzY2FsYXRpb24gc2VudCBiZWZvcmUg
dGhlIHJlY292ZXJ5IGVzY2FsYXRpb24pLiAgICAgICAgICovCisKKwkJaWYgKChzZS0+ZXNjYWxh
dGVfb25fdW5rbm93biE9RkFMU0UpIHx8IChzZS0+ZXNjYWxhdGVfb25fd2FybmluZyE9RkFMU0Up
IHx8IChzZS0+ZXNjYWxhdGVfb25fY3JpdGljYWwhPUZBTFNFKSl7CisJCQkKKwkJCS8qIElmIHRo
ZSByZWNvdmVyeSBpcyB0aGUgZmlyc3QgZXNjYWxhdGlvbiwgd2UgaGFkIG5vIHByZXZpb3VzICov
CisJCQkvKiBub24tb2sgZXNjYWxhdGlvbiBnbyBvdXQsIHNvIGRvIG5vdCBzZW5kIGEgcmVjb3Zl
cnkgICAgICAgICAqLworCQkJLyogbm90aWZpY2F0aW9uLiAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgKi8KKyAgICAgICAgCisJCQlpZiAoc3ZjLT5jdXJyZW50
X25vdGlmaWNhdGlvbl9udW1iZXI9PXNlLT5maXJzdF9ub3RpZmljYXRpb24pCisJCQkJcmV0dXJu
IEZBTFNFOworCisJCQkvKiBPbmx5IHNlbmQgb3V0IGEgcmVjb3ZlcnkgZm9yIHRoZSBlc2NhbGF0
aW9uIGlmIHRoZSBwcmV2aW91cyAgICAgKi8KKwkJCS8qIChub24tb2spIHNlcnZpY2Ugc3RhdGUg
aXMgYSBzdGF0ZSBhbHNvIGxpc3RlZCBpbiB0aGUgZXNjYWxhdGlvbiAqLworCQkJLyogT1Igd2Ug
c2VudCBvdXQgYW4gZXNjYWxhdGlvbiBub3RpZmljYXRpb24gZm9yIGEgcHJvYmxlbSBzdGF0ZSAg
ICovCisJCQkvKiBhdCBhbnkgdGltZSBwcmV2aW91c2x5IHdpdGhpbiB0aGUgc2NvcGUgb2YgdGhl
IGVzY2FsYXRpb24gICAgICAgKi8KKwkJCWlmICh0ZW1wX3NlcnZpY2UtPmxhc3Rfc3RhdGU9PVNU
QVRFX1dBUk5JTkcgJiYgc2UtPmVzY2FsYXRlX29uX3dhcm5pbmc9PVRSVUUpeworCQkJCXJldHVy
biBUUlVFOworICAgICAgICAgICAgCX0KKwkJCWVsc2UgaWYgKHRlbXBfc2VydmljZS0+bGFzdF9z
dGF0ZT09U1RBVEVfQ1JJVElDQUwgJiYgc2UtPmVzY2FsYXRlX29uX2NyaXRpY2FsPT1UUlVFKXsK
KwkJCQlyZXR1cm4gVFJVRTsKKyAgICAgICAgICAgIAl9CisJCQllbHNlIGlmICh0ZW1wX3NlcnZp
Y2UtPmxhc3Rfc3RhdGU9PVNUQVRFX1VOS05PV04gJiYgc2UtPmVzY2FsYXRlX29uX3Vua25vd249
PVRSVUUpeworCQkJCXJldHVybiBUUlVFOworICAgICAgICAgICAgCX0KKwkJCWVsc2V7CisKKwkJ
CQkvKiBXYWxrIGJhY2t3YXJkcyB0aHJvdWdoIHRoZSBzZXJ2aWNlIHN0YXRlIGhpc3RvcnkgKGlm
IHdlICAgKi8KKwkJCQkvKiBoYXZlIGhpc3RvcnkgZm9yIHRoZSBzZXJ2aWNlKSBubyBmYXJ0aGVy
IHRoYW4gdGhlIHZhbHVlICAgKi8KKwkJCQkvKiBvZiBmaXJzdF9ub3RpZmljYXRpb24gZm9yIHRo
ZSBlc2NhbGF0aW9uLiAgSWYgYW55IHByb2JsZW0gKi8KKwkJCQkvKiBzdGF0ZSBpbiB0aGUgc2Vy
dmljZSBoaXN0b3J5IHdpdGhpbiB0aGUgc2NvcGUgb2YgdGhpcyAgICAgKi8KKwkJCQkvKiBlc2Nh
bGF
...[email truncated]...
This post was automatically imported from historical nagios-devel mailing list archives
Original poster: [email protected]
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Argg, found a logic bug. Updated patch attached.
- Max
--0016364eeea875c6e2046f2eb5e5
Content-Type: application/octet-stream; name="notifications.c.patch"
Content-Disposition: attachment; filename="notifications.c.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_fxe21dxz1
LS0tIG5hZ2lvcy0zLjAuMy9iYXNlL25vdGlmaWNhdGlvbnMuYy5vcmlnCTIwMDgtMDYtMjMgMTY6
NDc6NDEuMDAwMDAwMDAwIC0wNDAwCisrKyBuYWdpb3MtMy4wLjMvYmFzZS9ub3RpZmljYXRpb25z
LmMJMjAwOS0wNy0yMCAyMjo0NzoxOC4wMDAwMDAwMDAgLTA0MDAKQEAgLTc4OCw2ICs3ODgsMTIg
QEAKIAlpbnQgbm90aWZpY2F0aW9uX251bWJlcj0wOwogCXRpbWVfdCBjdXJyZW50X3RpbWU9MEw7
CiAJc2VydmljZSAqdGVtcF9zZXJ2aWNlPU5VTEw7CisJLyogRm9yIHJlY292ZXJ5IGVzY2FsYXRp
b25zLCB1c2VkIHRvIGhlbHAgZGV0ZXJtaW5lIGlmIGFueSBlc2NhbGF0aW9uICAgKi8KKwkvKiB3
YXMgc2VudCBvdXQgd2l0aCBhIHByb2JsZW0gc3RhdGUgbGlzdGVkIGluIHRoZSBlc2NhbGF0aW9u
IHRvIGxldCB1cyAqLworCS8qIGtub3cgaWYgd2UgbmVlZCB0byBzZW5kIG91dCBhIHJlY292ZXJ5
IGZvciBjYXNlcyB3aGVyZSB0aGUgcHJldmlvdXMgICovCisJLyogbm9uLW9rIHN0YXRlIGlzIE5P
VCBsaXN0ZWQgaW4gdGhlIGVzY2FsYXRpb24gLiAgICAgICAgICAgICAgICAgICAgICAgKi8KKwlp
bnQgaT0wOworCWludCBzZW5kX3JlY292ZXJ5PUZBTFNFOwogCiAJbG9nX2RlYnVnX2luZm8oREVC
VUdMX0ZVTkNUSU9OUywwLCJpc192YWxpZF9lc2NhbGF0aW9uX2Zvcl9zZXJ2aWNlX25vdGlmaWNh
dGlvbigpXG4iKTsKIApAQCAtODIzLDggKzgyOSw3MiBAQAogCQlyZXR1cm4gRkFMU0U7CiAKIAkv
KiBza2lwIHRoaXMgZXNjYWxhdGlvbiBpZiB0aGUgc3RhdGUgb3B0aW9ucyBkb24ndCBtYXRjaCAq
LwotCWlmKHN2Yy0+Y3VycmVudF9zdGF0ZT09U1RBVEVfT0sgJiYgc2UtPmVzY2FsYXRlX29uX3Jl
Y292ZXJ5PT1GQUxTRSkKLQkJcmV0dXJuIEZBTFNFOworCWlmKHN2Yy0+Y3VycmVudF9zdGF0ZT09
U1RBVEVfT0speworCQlpZiAoc2UtPmVzY2FsYXRlX29uX3JlY292ZXJ5PT1GQUxTRSkKKwkJCXJl
dHVybiBGQUxTRTsKKworCQkvKiBJZiB0aGUgZXNjYWxhdGlvbiBzcGVjaWZpZXMgb25lIG9yIG1v
cmUgYWxlcnQgc3RhdGVzIChub24tb2spLCAgKi8KKwkJLyogb25seSBhbGxvdyB0aGUgZXNjYWxh
dGlvbiBpZiB0aGUgbm9uLW9rIHN0YXRlIGZyb20gdGhlIHByZXZpb3VzICovCisJCS8qIHNlcnZp
Y2Ugc3RhdGUgaXMgbGlzdGVkIGluIHRoZSBlc2NhbGF0aW9uIGFuZCBpZiB0aGUgZXNjYWxhdGlv
biAqLworCQkvKiBpcyBOT1QgdGhlIGZpcnN0IGVzY2FsYXRpb24gKGFzIHRoYXQgd291bGQgbWVh
biB0aGVyZSB3YXMgbm8gICAgKi8KKwkJLyogbm9uLW9rIGVzY2FsYXRpb24gc2VudCBiZWZvcmUg
dGhlIHJlY292ZXJ5IGVzY2FsYXRpb24pLiAgICAgICAgICovCisKKwkJaWYgKChzZS0+ZXNjYWxh
dGVfb25fdW5rbm93biE9RkFMU0UpIHx8IChzZS0+ZXNjYWxhdGVfb25fd2FybmluZyE9RkFMU0Up
IHx8IChzZS0+ZXNjYWxhdGVfb25fY3JpdGljYWwhPUZBTFNFKSl7CisJCQkKKwkJCS8qIElmIHRo
ZSByZWNvdmVyeSBpcyB0aGUgZmlyc3QgZXNjYWxhdGlvbiwgd2UgaGFkIG5vIHByZXZpb3VzICov
CisJCQkvKiBub24tb2sgZXNjYWxhdGlvbiBnbyBvdXQsIHNvIGRvIG5vdCBzZW5kIGEgcmVjb3Zl
cnkgICAgICAgICAqLworCQkJLyogbm90aWZpY2F0aW9uLiAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgKi8KKyAgICAgICAgCisJCQlpZiAoc3ZjLT5jdXJyZW50
X25vdGlmaWNhdGlvbl9udW1iZXI9PXNlLT5maXJzdF9ub3RpZmljYXRpb24pCisJCQkJcmV0dXJu
IEZBTFNFOworCisJCQkvKiBPbmx5IHNlbmQgb3V0IGEgcmVjb3ZlcnkgZm9yIHRoZSBlc2NhbGF0
aW9uIGlmIHRoZSBwcmV2aW91cyAgICAgKi8KKwkJCS8qIChub24tb2spIHNlcnZpY2Ugc3RhdGUg
aXMgYSBzdGF0ZSBhbHNvIGxpc3RlZCBpbiB0aGUgZXNjYWxhdGlvbiAqLworCQkJLyogT1Igd2Ug
c2VudCBvdXQgYW4gZXNjYWxhdGlvbiBub3RpZmljYXRpb24gZm9yIGEgcHJvYmxlbSBzdGF0ZSAg
ICovCisJCQkvKiBhdCBhbnkgdGltZSBwcmV2aW91c2x5IHdpdGhpbiB0aGUgc2NvcGUgb2YgdGhl
IGVzY2FsYXRpb24gICAgICAgKi8KKwkJCWlmICh0ZW1wX3NlcnZpY2UtPmxhc3Rfc3RhdGU9PVNU
QVRFX1dBUk5JTkcgJiYgc2UtPmVzY2FsYXRlX29uX3dhcm5pbmc9PVRSVUUpeworCQkJCXJldHVy
biBUUlVFOworICAgICAgICAgICAgCX0KKwkJCWVsc2UgaWYgKHRlbXBfc2VydmljZS0+bGFzdF9z
dGF0ZT09U1RBVEVfQ1JJVElDQUwgJiYgc2UtPmVzY2FsYXRlX29uX2NyaXRpY2FsPT1UUlVFKXsK
KwkJCQlyZXR1cm4gVFJVRTsKKyAgICAgICAgICAgIAl9CisJCQllbHNlIGlmICh0ZW1wX3NlcnZp
Y2UtPmxhc3Rfc3RhdGU9PVNUQVRFX1VOS05PV04gJiYgc2UtPmVzY2FsYXRlX29uX3Vua25vd249
PVRSVUUpeworCQkJCXJldHVybiBUUlVFOworICAgICAgICAgICAgCX0KKwkJCWVsc2V7CisKKwkJ
CQkvKiBXYWxrIGJhY2t3YXJkcyB0aHJvdWdoIHRoZSBzZXJ2aWNlIHN0YXRlIGhpc3RvcnkgKGlm
IHdlICAgKi8KKwkJCQkvKiBoYXZlIGhpc3RvcnkgZm9yIHRoZSBzZXJ2aWNlKSBubyBmYXJ0aGVy
IHRoYW4gdGhlIHZhbHVlICAgKi8KKwkJCQkvKiBvZiBmaXJzdF9ub3RpZmljYXRpb24gZm9yIHRo
ZSBlc2NhbGF0aW9uLiAgSWYgYW55IHByb2JsZW0gKi8KKwkJCQkvKiBzdGF0ZSBpbiB0aGUgc2Vy
dmljZSBoaXN0b3J5IHdpdGhpbiB0aGUgc2NvcGUgb2YgdGhpcyAgICAgKi8KKwkJCQkvKiBlc2Nh
bGF
...[email truncated]...
This post was automatically imported from historical nagios-devel mailing list archives
Original poster: [email protected]