projects / packages / openl2tp.git / blame
| Commit | Line | Data |
|---|---|---|
| 536c1bf8 JB |
1 | --- openl2tp-1.8/l2tp_api.c.orig 2008-04-09 18:50:12.000000000 +0200 |
| 2 | +++ openl2tp-1.8/l2tp_api.c 2020-08-31 21:05:56.928710570 +0200 | |
| 3 | @@ -25,6 +25,7 @@ | |
| 4 | ||
| 5 | #include <rpc/pmap_clnt.h> | |
| 6 | #include <net/ethernet.h> | |
| 7 | +#include <netinet/in.h> | |
| 8 | ||
| 9 | #include "usl.h" | |
| 10 | ||
| 11 | @@ -447,10 +448,12 @@ | |
| 12 | * non-loopback interface, reject the request. | |
| 13 | */ | |
| 14 | if ((!l2tp_opt_remote_rpc) && | |
| 15 | - ((xprt->xp_raddr.sin_addr.s_addr != htonl(INADDR_LOOPBACK)) && | |
| 16 | - (xprt->xp_raddr.sin_addr.s_addr != htonl(INADDR_ANY)))) { | |
| 17 | + memcmp(&xprt->xp_raddr.sin6_addr.s6_addr, &in6addr_loopback, 16) && | |
| 18 | + memcmp(&xprt->xp_raddr.sin6_addr.s6_addr, &in6addr_any, 16)) { | |
| 19 | if (l2tp_opt_trace_flags & L2TP_DEBUG_API) { | |
| 20 | - l2tp_log(LOG_ERR, "Rejecting RPC request from %s", inet_ntoa(xprt->xp_raddr.sin_addr)); | |
| 21 | + char straddr[INET6_ADDRSTRLEN]; | |
| 22 | + inet_ntop(AF_INET6, &xprt->xp_raddr.sin6_addr, straddr, sizeof(straddr)); | |
| 23 | + l2tp_log(LOG_ERR, "Rejecting RPC request from %s", straddr); | |
| 24 | } | |
| 25 | svcerr_auth(xprt, AUTH_TOOWEAK); | |
| 26 | return -EPERM; | |
| 27 | --- openl2tp-1.8/Makefile.orig 2020-08-31 21:06:29.711866302 +0200 | |
| 28 | +++ openl2tp-1.8/Makefile 2020-08-31 21:07:45.718121207 +0200 | |
| 29 | @@ -135,7 +135,7 @@ | |
| 30 | -MMD -Wall -Wno-strict-aliasing \ | |
| 31 | $(CPPFLAGS) $(CPPFLAGS.dmalloc) \ | |
| 32 | -DSYS_LIBDIR=$(SYS_LIBDIR) | |
| 33 | -LDFLAGS.l2tpd= -Wl,-E -L. -Lusl -lusl -ldl $(LIBS.dmalloc) -lc | |
| 34 | -LDFLAGS.l2tpconfig= -Lcli -lcli -lreadline $(LIBS.dmalloc) $(READLINE_LDFLAGS) -lc | |
| 35 | +LDFLAGS.l2tpd= -Wl,-E -L. -Lusl -lusl -ltirpc -ldl $(LIBS.dmalloc) -lc | |
| 36 | +LDFLAGS.l2tpconfig= -Lcli -lcli -lreadline -ltirpc $(LIBS.dmalloc) $(READLINE_LDFLAGS) -lc | |
| 37 | ||
| 38 | OPT_CFLAGS?= -O |