diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2019-10-04 02:42:19 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2019-10-04 02:42:19 +0000 |
| commit | 3c229bb4838b5c5c523043f8b227203049014e17 (patch) | |
| tree | 66e62b4f528d45899531e0d116ff5f91c5dbeee1 /net | |
| parent | 1a2b4482a00579d5de6f52ffdde6bc5788505cc1 (diff) | |
| download | ports-3c229bb4838b5c5c523043f8b227203049014e17.tar.gz ports-3c229bb4838b5c5c523043f8b227203049014e17.zip | |
Notes
Diffstat (limited to 'net')
| -rw-r--r-- | net/ocserv/Makefile | 2 | ||||
| -rw-r--r-- | net/ocserv/files/patch-src_tun.c | 25 | ||||
| -rw-r--r-- | net/ocserv/files/patch-src_tun.h | 9 | ||||
| -rw-r--r-- | net/ocserv/files/patch-src_worker-auth.c | 14 |
4 files changed, 49 insertions, 1 deletions
diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile index 94335fcd1987..b2875639ce3e 100644 --- a/net/ocserv/Makefile +++ b/net/ocserv/Makefile @@ -3,7 +3,7 @@ PORTNAME= ocserv PORTVERSION= 0.12.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net net-vpn security MASTER_SITES= ftp://ftp.infradead.org/pub/ocserv/ diff --git a/net/ocserv/files/patch-src_tun.c b/net/ocserv/files/patch-src_tun.c new file mode 100644 index 000000000000..6fe5ed5e6246 --- /dev/null +++ b/net/ocserv/files/patch-src_tun.c @@ -0,0 +1,25 @@ +--- src/tun.c.orig 2018-04-14 07:52:35 UTC ++++ src/tun.c +@@ -895,3 +895,22 @@ ssize_t tun_read(int sockfd, void *buf, size_t len) + return read(sockfd, buf, len); + } + #endif ++ ++#ifndef __FreeBSD__ ++int tun_claim(int sockfd) ++{ ++ ++ return (0); ++} ++#else ++/* ++ * FreeBSD has a mechanism by which a tunnel has a single controlling process, ++ * and only that one process may close it. When the controlling process closes ++ * the tunnel, the state is torn down. ++ */ ++int tun_claim(int sockfd) ++{ ++ ++ return (ioctl(sockfd, TUNSIFPID, 0)); ++} ++#endif /* !__FreeBSD__ */ diff --git a/net/ocserv/files/patch-src_tun.h b/net/ocserv/files/patch-src_tun.h new file mode 100644 index 000000000000..0311177f3f78 --- /dev/null +++ b/net/ocserv/files/patch-src_tun.h @@ -0,0 +1,9 @@ +--- src/tun.h.orig 2018-01-13 18:43:41 UTC ++++ src/tun.h +@@ -35,5 +35,6 @@ struct tun_lease_st { + + ssize_t tun_write(int sockfd, const void *buf, size_t len); + ssize_t tun_read(int sockfd, void *buf, size_t len); ++int tun_claim(int sockfd); + + #endif diff --git a/net/ocserv/files/patch-src_worker-auth.c b/net/ocserv/files/patch-src_worker-auth.c new file mode 100644 index 000000000000..f7e01eeed392 --- /dev/null +++ b/net/ocserv/files/patch-src_worker-auth.c @@ -0,0 +1,14 @@ +--- src/worker-auth.c.orig 2019-01-19 18:47:47 UTC ++++ src/worker-auth.c +@@ -605,7 +605,10 @@ static int recv_cookie_auth_reply(worker_st * ws) + case AUTH__REP__OK: + if (socketfd != -1) { + ws->tun_fd = socketfd; +- ++ if (tun_claim(ws->tun_fd) != 0) { ++ ret = ERR_AUTH_FAIL; ++ goto cleanup; ++ } + if (msg->vname == NULL || msg->config == NULL || msg->user_name == NULL || msg->sid.len != sizeof(ws->sid)) { + ret = ERR_AUTH_FAIL; + goto cleanup; |