Revert "ppp: don't unconditionaly load pppoe/pptp/l2tp modules, fixes false start warning if they're running already"

This reverts commit c4ddc0fe1f402f84b1bb01b9568e2294569d0d15.

3 files changed, 8 insertions, 21 deletions

diff --git a/accel-pppd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c
index 6b81022..3b2e3f2 100644
--- a/accel-pppd/ctrl/l2tp/l2tp.c
+++ b/accel-pppd/ctrl/l2tp/l2tp.c
@@ -3961,12 +3961,7 @@ static void load_config(void)
 
 static void l2tp_init(void)
 {
-	int fd;
-
-	fd = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OL2TP);
-	if (fd >= 0)
-		close(fd);
-	else if (system("modprobe -q pppol2tp || modprobe -q l2tp_ppp"))
+	if (system("modprobe -q pppol2tp || modprobe -q l2tp_ppp"))
 		log_warn("unable to load l2tp kernel module\n");
 
 	l2tp_conn = _malloc(L2TP_MAX_TID * sizeof(void *));
diff --git a/accel-pppd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c
index 9d30c62..9a43181 100644
--- a/accel-pppd/ctrl/pppoe/pppoe.c
+++ b/accel-pppd/ctrl/pppoe/pppoe.c
@@ -1504,12 +1504,8 @@ static void pppoe_init(void)
 {
 	struct conf_sect_t *s = conf_get_section("pppoe");
 	struct conf_option_t *opt;
-	int fd;
 
-	fd = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OE);
-	if (fd >= 0)
-		close(fd);
-	else if (system("modprobe -q pppoe"))
+	if (system("modprobe -q pppoe"))
 		log_warn("failed to load pppoe kernel module\n");
 
 	conn_pool = mempool_create(sizeof(struct pppoe_conn_t));
diff --git a/accel-pppd/ctrl/pptp/pptp.c b/accel-pppd/ctrl/pptp/pptp.c
index 46e980e..31ffd00 100644
--- a/accel-pppd/ctrl/pptp/pptp.c
+++ b/accel-pppd/ctrl/pptp/pptp.c
@@ -771,20 +771,16 @@ static void pptp_init(void)
 {
 	struct sockaddr_in addr;
 	char *opt;
-	int fd;
 
-	fd = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_PPTP);
-	if (fd >= 0)
-		close(fd);
-	else if (system("modprobe -q pptp"))
+	if (system("modprobe -q pptp"))
 		log_warn("failed to load pptp kernel module\n");
 
 	serv.hnd.fd = socket(PF_INET, SOCK_STREAM, 0);
-	if (serv.hnd.fd < 0) {
-		log_emerg("pptp: failed to create server socket: %s\n", strerror(errno));
-		return;
-	}
-
+  if (serv.hnd.fd < 0) {
+    log_emerg("pptp: failed to create server socket: %s\n", strerror(errno));
+    return;
+  }
+	
 	fcntl(serv.hnd.fd, F_SETFD, fcntl(serv.hnd.fd, F_GETFD) | FD_CLOEXEC);
   
 	addr.sin_family = AF_INET;