mirror of https://github.com/sipwise/heartbeat.git
Fix peer-outdater linking against libglib and use gnutls_certificate_verify_peers2 instead of gnutls_certificate_verify_peers Thanks: Richard Fuchs <rfuchs@sipwise.com> for the initial patchchanges/59/659/1
parent
867f016a86
commit
4e81a60637
@ -0,0 +1,61 @@
|
||||
--- a/contrib/drbd-outdate-peer/Makefile.am
|
||||
+++ b/contrib/drbd-outdate-peer/Makefile.am
|
||||
@@ -39,7 +39,7 @@
|
||||
$(top_builddir)/lib/hbclient/libhbclient.la $(GLIBLIB)
|
||||
|
||||
drbd_peer_outdater_SOURCES = drbd-peer-outdater.c
|
||||
-drbd_peer_outdater_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la
|
||||
+drbd_peer_outdater_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la $(GLIBLIB)
|
||||
|
||||
|
||||
|
||||
--- a/contrib/drbd-outdate-peer/Makefile.in
|
||||
+++ b/contrib/drbd-outdate-peer/Makefile.in
|
||||
@@ -383,7 +383,7 @@
|
||||
|
||||
|
||||
drbd_peer_outdater_SOURCES = drbd-peer-outdater.c
|
||||
-drbd_peer_outdater_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la
|
||||
+drbd_peer_outdater_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la $(GLIBLIB)
|
||||
subdir = contrib/drbd-outdate-peer
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
--- a/lib/plugins/quorum/quorumd.c
|
||||
+++ b/lib/plugins/quorum/quorumd.c
|
||||
@@ -354,8 +354,9 @@
|
||||
const gnutls_datum *cert_list;
|
||||
int ret;
|
||||
gnutls_x509_crt cert;
|
||||
+ unsigned int status;
|
||||
|
||||
- ret = gnutls_certificate_verify_peers (session);
|
||||
+ ret = gnutls_certificate_verify_peers2 (session, &status);
|
||||
|
||||
if (ret < 0)
|
||||
{
|
||||
--- a/membership/quorumd/quorumd.c
|
||||
+++ b/membership/quorumd/quorumd.c
|
||||
@@ -479,8 +479,9 @@
|
||||
char dn[MAX_DN_LEN];
|
||||
size_t dn_len = MAX_DN_LEN;
|
||||
gnutls_x509_crt cert;
|
||||
+ unsigned int status;
|
||||
|
||||
- ret = gnutls_certificate_verify_peers(session);
|
||||
+ ret = gnutls_certificate_verify_peers2(session, &status);
|
||||
|
||||
if (ret < 0)
|
||||
{
|
||||
--- a/membership/quorumd/quorumdtest.c
|
||||
+++ b/membership/quorumd/quorumdtest.c
|
||||
@@ -163,8 +163,9 @@
|
||||
const gnutls_datum *cert_list;
|
||||
int ret;
|
||||
gnutls_x509_crt cert;
|
||||
+ unsigned int status;
|
||||
|
||||
- ret = gnutls_certificate_verify_peers (session);
|
||||
+ ret = gnutls_certificate_verify_peers2 (session, &status);
|
||||
|
||||
if (ret < 0)
|
||||
{
|
||||
Loading…
Reference in new issue