From b8fe6a04df91e9e84efe350b1d63e26588fd2fed Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Tue, 9 Nov 2004 22:50:18 +0000 Subject: [PATCH] Cope with /proc/net/ipx/interface as well as /proc/net/ipx_interface. Added a couple of unrelated comments as well. --- pppd/sys-linux.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c index dcdb2ab..73843e7 100644 --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c @@ -173,8 +173,8 @@ static int ppp_disc = N_PPP; /* The PPP discpline */ static int initfdflags = -1; /* Initial file descriptor flags for fd */ static int ppp_fd = -1; /* fd which is set to PPP discipline */ static int sock_fd = -1; /* socket for doing interface ioctls */ -static int slave_fd = -1; -static int master_fd = -1; +static int slave_fd = -1; /* pty for old-style demand mode, slave */ +static int master_fd = -1; /* pty for old-style demand mode, master */ #ifdef INET6 static int sock6_fd = -1; #endif /* INET6 */ @@ -2790,7 +2790,8 @@ sys_check_options(void) if (ipxcp_protent.enabled_flag) { struct stat stat_buf; - if ((path = path_to_procfs("/net/ipx_interface")) == 0 + if ((path = path_to_procfs("/net/ipx/interface")) == 0 + || (path = path_to_procfs("/net/ipx_interface")) == 0 || lstat(path, &stat_buf) < 0) { error("IPX support is not present in the kernel\n"); ipxcp_protent.enabled_flag = 0; -- 2.39.2