On 01/30/2012 10:44 AM, Philipp Hahn wrote: > virnettlscontexttest uses gnutls_x509_crt_set_subject_alt_name() and > GNUTLS_FSAN_APPEND, which - according to > <http://www.gnu.org/software/gnutls/manual/gnutls.html> - are only > available since 2.6.0. > > Since libvirt still works fine with gnutls-1.0.25 from RHEL5, only > enable the test when the version of GNUTLS is at least 2.6.0. > > v2: greater-equal 2.6.0 instead of strictly greater. > > Signed-off-by: Philipp Hahn <hahn@xxxxxxxxxxxxx> > --- > tests/virnettlscontexttest.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c > index 51f75b4..508617a 100644 > --- a/tests/virnettlscontexttest.c > +++ b/tests/virnettlscontexttest.c > @@ -36,7 +36,7 @@ > #include "virsocketaddr.h" > #include "gnutls_1_0_compat.h" > > -#if !defined WIN32 && HAVE_LIBTASN1_H && !defined GNUTLS_1_0_COMPAT > +#if !defined WIN32 && HAVE_LIBTASN1_H && !defined GNUTLS_1_0_COMPAT && LIBGNUTLS_VERSION_NUMBER >= 0x020600 I went back to my RHEL 5 machine, and verified that LIBGNUTLS_VERSION_NUMBER (but not the newer GNUTLS_VERSION_NUMBER preferred spelling) was available, so we can remove the && !defined GNUTLS_1_0_COMPAT macro. ACK with that change, and pushed. -- Eric Blake eblake@xxxxxxxxxx +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list