d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Test for the existance of kernel ppp support by seeing if the kernel has

Browse Source 
the module compiled in or loaded instead of bogusly checking for ppp0.
Also if and only if the caller is actually root and the kernel does not
have ppp support, try to load the ppp module before giving up.
This commit is contained in:
Brooks Davis 2002-11-05 05:58:31 +00:00
parent 1f82496322
commit 51480d2fff
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
usr.sbin/pppd/sys-bsd.c
View File

@ -44,6 +44,7 @@ static char rcsid[] = "$FreeBSD$";
#include <sys/time.h>
#include <sys/stat.h>
#include <sys/param.h>
#include <sys/module.h>
#ifdef NetBSD1_2
#include <util.h>
#endif
@ -169,28 +170,29 @@ sys_check_options()
}
/*
* ppp_available - check whether the system has any ppp interfaces
* (in fact we check whether we can do an ioctl on ppp0).
* ppp_available - check whether the system has the ppp module loaded
* or compiled in. If it doesn't, and we're actually root (not just SUID
* root) try loading it before giving up.
*/
int
ppp_available()
{
int s, ok;
struct ifreq ifr;
const char *modname = "if_ppp";
extern char *no_ppp_msg;
if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
return 1; /* can't tell */
if (modfind(modname) != -1) {
return 1;
}
strncpy(ifr.ifr_name, "ppp0", sizeof (ifr.ifr_name));
ok = ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) >= 0;
close(s);
if (getuid() == 0 && kldload(modname) != -1)
return 1;
no_ppp_msg = "\
This system lacks kernel support for PPP. To include PPP support\n\
in the kernel, please follow the steps detailed in the README.bsd\n\
file in the ppp-2.2 distribution.\n";
return ok;
in the kernel, please add \"device ppp\" to your kernel config or \n\
load the if_ppp module.\n";
return 0;
}
/*