Nagios Support Forum

--0015174c3f385023980471e3e342
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

Hi all,

I write today with two small patches for ndoutils. They're both
related to the recent SSL patch.

First when compiling without SSL support (--disable-ssl), some code in
io.c using SSL features is not protected with the HAVE_SSL macro,
causing the compilation to fail.

Then when using ndo2db with SSL support compiled, related objects
(session, DH params, ...) are initialized even if SSL is disabled in
the configuration file. This is because config file parsing is done
after SSL initialization. Second patch just moves the file parsing
before SSL initialization.

Hope these patches will help (even a little).

Best regards,

--=20
Matthieu KERMAGORET | D=E9veloppeur

[email protected]

MERETHIS est =E9diteur du logiciel Centreon.

--0015174c3f385023980471e3e342
Content-Type: text/x-diff; charset=US-ASCII;
name="ndoutils_compilation_without_ssl.patch"
Content-Disposition: attachment;
filename="ndoutils_compilation_without_ssl.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_fyra3out0

ZGlmZiAtTmF1ciBhL3NyYy9pby5jIGIvc3JjL2lvLmMKLS0tIGEvc3JjL2lvLmMJMjAwOS0wOC0x
MiAyMzoxOTozOC4wMDAwMDAwMDAgKzAyMDAKKysrIGIvc3JjL2lvLmMJMjAwOS0wOC0yNCAxNTo0
MzoyMy4wMDAwMDAwMDAgKzAyMDAKQEAgLTI3OSwxMiArMjc5LDEyIEBACiAJd2hpbGUodGJ5dGVz
PGJ1Zmxlbil7CiAKIAkJLyogdHJ5IHRvIHdyaXRlIGV2ZXJ5dGhpbmcgd2UgaGF2ZSBsZWZ0ICov
Ci0JCWlmICh1c2Vfc3NsID09IE5ET19GQUxTRSkgewotCQkJcmVzdWx0PXdyaXRlKGZkLCBidWYr
dGJ5dGVzLCBidWZsZW4tdGJ5dGVzKTsKLQkJfQotCQllbHNleworI2lmZGVmIEhBVkVfU1NMCisJ
CWlmICh1c2Vfc3NsID09IE5ET19UUlVFKQogCQkJcmVzdWx0PVNTTF93cml0ZShzc2wsIGJ1Zit0
Ynl0ZXMsIGJ1Zmxlbi10Ynl0ZXMpOwotCQl9CisJCWVsc2UKKyNlbmRpZgorCQkJcmVzdWx0PXdy
aXRlKGZkLCBidWYrdGJ5dGVzLCBidWZsZW4tdGJ5dGVzKTsKIAogCiAJCS8qIHNvbWUga2luZCBv
ZiBlcnJvciBvY2N1cnJlZCAqLwo=
--0015174c3f385023980471e3e342
Content-Type: text/x-diff; charset=US-ASCII;
name="ndoutils_config_before_ssl.patch"
Content-Disposition: attachment; filename="ndoutils_config_before_ssl.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_fyra3y771

ZGlmZiAtTmF1ciBhL3NyYy9uZG8yZGIuYyBiL3NyYy9uZG8yZGIuYwotLS0gYS9zcmMvbmRvMmRi
LmMJMjAwOS0wOC0xMiAyMzoxOTozOC4wMDAwMDAwMDAgKzAyMDAKKysrIGIvc3JjL25kbzJkYi5j
CTIwMDktMDgtMjQgMTU6NTM6MTUuMDAwMDAwMDAwICswMjAwCkBAIC0xMjIsNiArMTIyLDE1IEBA
CiAJCWV4aXQoMSk7CiAJICAgICAgICB9CiAKKwkvKiBpbml0aWFsaXplIHZhcmlhYmxlcyAqLwor
CW5kbzJkYl9pbml0aWFsaXplX3ZhcmlhYmxlcygpOworCisJLyogcHJvY2VzcyBjb25maWcgZmls
ZSAqLworCWlmKG5kbzJkYl9wcm9jZXNzX2NvbmZpZ19maWxlKG5kbzJkYl9jb25maWdfZmlsZSkh
PU5ET19PSyl7CisJCXByaW50ZigiRXJyb3IgcHJvY2Vzc2luZyBjb25maWcgZmlsZSAnJXMnLlxu
IixuZG8yZGJfY29uZmlnX2ZpbGUpOworCQlleGl0KDEpOworCSAgICAgICAgfQorCiAjaWZkZWYg
SEFWRV9TU0wKICAgICAgICAgLyogaW5pdGlhbGl6ZSBTU0wgKi8KICAgICAgICAgaWYodXNlX3Nz
bD09TkRPX1RSVUUpewpAQCAtMTcwLDE1ICsxNzksNiBAQAogICAgICAgICAvKkZpbiBIYWNrIFNT
TCovCiAjZW5kaWYKIAotCS8qIGluaXRpYWxpemUgdmFyaWFibGVzICovCi0JbmRvMmRiX2luaXRp
YWxpemVfdmFyaWFibGVzKCk7Ci0KLQkvKiBwcm9jZXNzIGNvbmZpZyBmaWxlICovCi0JaWYobmRv
MmRiX3Byb2Nlc3NfY29uZmlnX2ZpbGUobmRvMmRiX2NvbmZpZ19maWxlKSE9TkRPX09LKXsKLQkJ
cHJpbnRmKCJFcnJvciBwcm9jZXNzaW5nIGNvbmZpZyBmaWxlICclcycuXG4iLG5kbzJkYl9jb25m
aWdfZmlsZSk7Ci0JCWV4aXQoMSk7Ci0JICAgICAgICB9Ci0KIAkvKiBtYWtlIHN1cmUgd2UncmUg
Z29vZCB0byBnbyAqLwogCWlmKG5kbzJkYl9jaGVja19pbml0X3JlcXMoKSE9TkRPX09LKXsKIAkJ
cHJpbnRmKCJPbmUgb3IgbW9yZSByZXF1aXJlZCBwYXJhbWV0ZXJzIGlzIG1pc3Npbmcgb3IgaW5j
b3JyZWN0LlxuIik7Cg==
--0015174c3f385023980471e3e342--





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