diff options
Diffstat (limited to 'lib/sockopt.c')
| -rw-r--r-- | lib/sockopt.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/lib/sockopt.c b/lib/sockopt.c index b07a3fc2..3a25ae1a 100644 --- a/lib/sockopt.c +++ b/lib/sockopt.c @@ -499,10 +499,7 @@ int sockopt_tcp_signature (int sock, union sockunion *su, const char *password) { #if HAVE_DECL_TCP_MD5SIG -<<<<<<< HEAD:lib/sockopt.c -======= int ret; ->>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/sockopt.c #ifndef GNU_LINUX /* * XXX Need to do PF_KEY operation here to add/remove an SA entry, @@ -513,10 +510,6 @@ sockopt_tcp_signature (int sock, union sockunion *su, const char *password) int keylen = password ? strlen (password) : 0; struct tcp_md5sig md5sig; union sockunion *su2, *susock; -<<<<<<< HEAD:lib/sockopt.c - int ret; -======= ->>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/sockopt.c /* Figure out whether the socket and the sockunion are the same family.. * adding AF_INET to AF_INET6 needs to be v4 mapped, you'd think.. @@ -560,18 +553,12 @@ sockopt_tcp_signature (int sock, union sockunion *su, const char *password) md5sig.tcpm_keylen = keylen; if (keylen) memcpy (md5sig.tcpm_key, password, keylen); -<<<<<<< HEAD:lib/sockopt.c -======= sockunion_free (susock); ->>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/sockopt.c #endif /* GNU_LINUX */ ret = setsockopt (sock, IPPROTO_TCP, TCP_MD5SIG, &md5sig, sizeof md5sig); -<<<<<<< HEAD:lib/sockopt.c - sockunion_free (susock); -======= ->>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/sockopt.c return ret; #else /* HAVE_TCP_MD5SIG */ return -2; #endif /* HAVE_TCP_MD5SIG */ } + |