34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
|
diff -rup pptpd-1.3.4/plugins/Makefile pptpd-1.3.4-install64/plugins/Makefile
|
||
|
|
--- pptpd-1.3.4/plugins/Makefile 2006-08-02 22:02:01.000000000 -0400
|
||
|
|
+++ pptpd-1.3.4-install64/plugins/Makefile 2011-04-07 14:31:08.982796855 -0400
|
||
|
|
@@ -3,7 +3,7 @@ COPTS = -O2 -g
|
||
|
|
CFLAGS = $(COPTS) -I.. -I../../include -fPIC
|
||
|
|
LDFLAGS = -shared
|
||
|
|
LDADD = -lutil
|
||
|
|
-INSTALL = install -o root
|
||
|
|
+INSTALL = install -c
|
||
|
|
prefix = /usr/local
|
||
|
|
|
||
|
|
PLUGINS = pptpd-logwtmp.so
|
||
|
|
@@ -18,7 +18,7 @@ all: $(PLUGINS)
|
||
|
|
%.so: %.c
|
||
|
|
$(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ $(LDADD)
|
||
|
|
|
||
|
|
-LIBDIR ?= $(DESTDIR)$(prefix)/lib/pptpd
|
||
|
|
+LIBDIR = $(DESTDIR)/usr/lib64/pptpd
|
||
|
|
|
||
|
|
install: $(PLUGINS)
|
||
|
|
$(INSTALL) -d $(LIBDIR)
|
||
|
|
diff -rup pptpd-1.3.4/pptpctrl.c pptpd-1.3.4-install64/pptpctrl.c
|
||
|
|
--- pptpd-1.3.4/pptpctrl.c 2006-12-07 19:01:40.000000000 -0500
|
||
|
|
+++ pptpd-1.3.4-install64/pptpctrl.c 2011-04-07 14:31:29.845856353 -0400
|
||
|
|
@@ -773,7 +773,7 @@ static void launch_pppd(char **pppaddrs,
|
||
|
|
|
||
|
|
if (pptp_logwtmp) {
|
||
|
|
pppd_argv[an++] = "plugin";
|
||
|
|
- pppd_argv[an++] = "/usr/lib/pptpd/pptpd-logwtmp.so";
|
||
|
|
+ pppd_argv[an++] = "/usr/lib64/pptpd/pptpd-logwtmp.so";
|
||
|
|
pppd_argv[an++] = "pptpd-original-ip";
|
||
|
|
pppd_argv[an++] = inet_ntoa(inetaddrs[1]);
|
||
|
|
}
|