X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fmain.c;h=b302c08e0659379fd23896e20bdd287d3c7041d9;hp=f1986ed68d0b7e4d00f81b956e2abbb263b79d7a;hb=a14ede90df712b4a0fed82b9a66a81c56e1e97a9;hpb=31dd7268cf971b5ed10508c41594a2ea99cdc17a diff --git a/pppd/main.c b/pppd/main.c index f1986ed..b302c08 100644 --- a/pppd/main.c +++ b/pppd/main.c @@ -39,7 +39,7 @@ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * Copyright (c) 1999-2004 Paul Mackerras. All rights reserved. + * Copyright (c) 1999-2020 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -66,7 +66,9 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: main.c,v 1.156 2008/06/23 11:47:18 paulus Exp $" +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include #include @@ -80,7 +82,6 @@ #include #include #include -#include #include #include #include @@ -90,13 +91,16 @@ #include #include #include +#include +#include +#include #include "pppd.h" #include "magic.h" #include "fsm.h" #include "lcp.h" #include "ipcp.h" -#ifdef INET6 +#ifdef PPP_WITH_IPV6CP #include "ipv6cp.h" #endif #include "upap.h" @@ -105,26 +109,23 @@ #include "ccp.h" #include "ecp.h" #include "pathnames.h" +#include "ppp-crypto.h" -#ifdef USE_TDB +#ifdef PPP_WITH_TDB #include "tdb.h" #endif -#ifdef CBCP_SUPPORT +#ifdef PPP_WITH_CBCP #include "cbcp.h" #endif -#ifdef IPX_CHANGE -#include "ipxcp.h" -#endif /* IPX_CHANGE */ #ifdef AT_CHANGE #include "atcp.h" #endif -static const char rcsid[] = RCSID; /* interface vars */ -char ifname[MAXIFNAMELEN]; /* Interface name */ +char ifname[IFNAMSIZ]; /* Interface name */ int ifunit; /* Interface unit number */ struct channel *the_channel; @@ -153,16 +154,16 @@ int ppp_session_number; /* Session number, for channels with such a concept (eg PPPoE) */ int childwait_done; /* have timed out waiting for children */ -#ifdef USE_TDB +#ifdef PPP_WITH_TDB TDB_CONTEXT *pppdb; /* database for storing status etc. */ #endif char db_key[32]; -int (*holdoff_hook) __P((void)) = NULL; -int (*new_phase_hook) __P((int)) = NULL; -void (*snoop_recv_hook) __P((unsigned char *p, int len)) = NULL; -void (*snoop_send_hook) __P((unsigned char *p, int len)) = NULL; +int (*holdoff_hook)(void) = NULL; +int (*new_phase_hook)(int) = NULL; +void (*snoop_recv_hook)(unsigned char *p, int len) = NULL; +void (*snoop_send_hook)(unsigned char *p, int len) = NULL; static int conn_running; /* we have a [dis]connector running */ static int fd_loop; /* fd for getting demand-dial packets */ @@ -181,7 +182,7 @@ int got_sighup; static sigset_t signals_handled; static int waiting; -static sigjmp_buf sigjmp; +static int sigpipe[2]; char **script_env; /* Env. variable values for scripts */ int s_env_nalloc; /* # words avail at script_env */ @@ -218,7 +219,7 @@ bool bundle_terminating; struct subprocess { pid_t pid; char *prog; - void (*done) __P((void *)); + void (*done)(void *); void *arg; int killable; struct subprocess *next; @@ -228,47 +229,37 @@ static struct subprocess *children; /* Prototypes for procedures local to this file. */ -static void setup_signals __P((void)); -static void create_pidfile __P((int pid)); -static void create_linkpidfile __P((int pid)); -static void cleanup __P((void)); -static void get_input __P((void)); -static void calltimeout __P((void)); -static struct timeval *timeleft __P((struct timeval *)); -static void kill_my_pg __P((int)); -static void hup __P((int)); -static void term __P((int)); -static void chld __P((int)); -static void toggle_debug __P((int)); -static void open_ccp __P((int)); -static void bad_signal __P((int)); -static void holdoff_end __P((void *)); -static void forget_child __P((int pid, int status)); -static int reap_kids __P((void)); -static void childwait_end __P((void *)); - -#ifdef USE_TDB -static void update_db_entry __P((void)); -static void add_db_key __P((const char *)); -static void delete_db_key __P((const char *)); -static void cleanup_db __P((void)); +static void setup_signals(void); +static void create_pidfile(int pid); +static void create_linkpidfile(int pid); +static void cleanup(void); +static void get_input(void); +static void calltimeout(void); +static struct timeval *timeleft(struct timeval *); +static void kill_my_pg(int); +static void hup(int); +static void term(int); +static void chld(int); +static void toggle_debug(int); +static void open_ccp(int); +static void bad_signal(int); +static void holdoff_end(void *); +static void forget_child(int pid, int status); +static int reap_kids(void); +static void childwait_end(void *); + +#ifdef PPP_WITH_TDB +static void update_db_entry(void); +static void add_db_key(const char *); +static void delete_db_key(const char *); +static void cleanup_db(void); #endif -static void handle_events __P((void)); -void print_link_stats __P((void)); - -extern char *ttyname __P((int)); -extern char *getlogin __P((void)); -int main __P((int, char *[])); +static void handle_events(void); +void print_link_stats(void); -#ifdef ultrix -#undef O_NONBLOCK -#define O_NONBLOCK O_NDELAY -#endif - -#ifdef ULTRIX -#define setlogmask(x) -#endif +extern char *getlogin(void); +int main(int, char *[]); /* * PPP Data Link Layer "protocol" table. @@ -279,18 +270,15 @@ struct protent *protocols[] = { &lcp_protent, &pap_protent, &chap_protent, -#ifdef CBCP_SUPPORT +#ifdef PPP_WITH_CBCP &cbcp_protent, #endif &ipcp_protent, -#ifdef INET6 +#ifdef PPP_WITH_IPV6CP &ipv6cp_protent, #endif &ccp_protent, &ecp_protent, -#ifdef IPX_CHANGE - &ipxcp_protent, -#endif #ifdef AT_CHANGE &atcp_protent, #endif @@ -299,9 +287,7 @@ struct protent *protocols[] = { }; int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { int i, t; char *p; @@ -309,6 +295,15 @@ main(argc, argv) struct protent *protp; char numbuf[16]; + PPP_crypto_init(); + + strlcpy(path_ipup, PPP_PATH_IPUP, MAXPATHLEN); + strlcpy(path_ipdown, PPP_PATH_IPDOWN, MAXPATHLEN); + +#ifdef PPP_WITH_IPV6CP + strlcpy(path_ipv6up, PPP_PATH_IPV6UP, MAXPATHLEN); + strlcpy(path_ipv6down, PPP_PATH_IPV6DOWN, MAXPATHLEN); +#endif link_stats_valid = 0; new_phase(PHASE_INITIALIZE); @@ -356,7 +351,7 @@ main(argc, argv) * Parse, in order, the system options file, the user's options file, * and the command line arguments. */ - if (!options_from_file(_PATH_SYSOPTIONS, !privileged, 0, 1) + if (!options_from_file(PPP_PATH_SYSOPTIONS, !privileged, 0, 1) || !options_from_user() || !parse_args(argc-1, argv+1)) exit(EXIT_OPTION_ERROR); @@ -372,6 +367,11 @@ main(argc, argv) if (debug) setlogmask(LOG_UPTO(LOG_DEBUG)); + if (show_options) { + showopts(); + die(0); + } + /* * Check that we are running as root. */ @@ -393,7 +393,7 @@ main(argc, argv) if (!sys_check_options()) exit(EXIT_OPTION_ERROR); auth_check_options(); -#ifdef HAVE_MULTILINK +#ifdef PPP_WITH_MULTILINK mp_check_options(); #endif for (i = 0; (protp = protocols[i]) != NULL; ++i) @@ -413,9 +413,9 @@ main(argc, argv) die(0); /* Make sure fds 0, 1, 2 are open to somewhere. */ - fd_devnull = open(_PATH_DEVNULL, O_RDWR); + fd_devnull = open(PPP_DEVNULL, O_RDWR); if (fd_devnull < 0) - fatal("Couldn't open %s: %m", _PATH_DEVNULL); + fatal("Couldn't open %s: %m", PPP_DEVNULL); while (fd_devnull <= 2) { i = dup(fd_devnull); if (i < 0) @@ -428,13 +428,13 @@ main(argc, argv) */ sys_init(); -#ifdef USE_TDB - pppdb = tdb_open(_PATH_PPPDB, 0, 0, O_RDWR|O_CREAT, 0644); +#ifdef PPP_WITH_TDB + pppdb = tdb_open(PPP_PATH_PPPDB, 0, 0, O_RDWR|O_CREAT, 0644); if (pppdb != NULL) { slprintf(db_key, sizeof(db_key), "pppd%d", getpid()); update_db_entry(); } else { - warn("Warning: couldn't open ppp database %s", _PATH_PPPDB); + warn("Warning: couldn't open ppp database %s", PPP_PATH_PPPDB); if (multilink) { warn("Warning: disabling multilink"); multilink = 0; @@ -523,7 +523,7 @@ main(argc, argv) info("Starting link"); } - gettimeofday(&start_time, NULL); + get_time(&start_time); script_unsetenv("CONNECT_TIME"); script_unsetenv("BYTES_SENT"); script_unsetenv("BYTES_RCVD"); @@ -589,6 +589,7 @@ main(argc, argv) } } + PPP_crypto_deinit(); die(status); return 0; } @@ -597,22 +598,24 @@ main(argc, argv) * handle_events - wait for something to happen and respond to it. */ static void -handle_events() +handle_events(void) { struct timeval timo; + unsigned char buf[16]; kill_link = open_ccp_flag = 0; - if (sigsetjmp(sigjmp, 1) == 0) { - sigprocmask(SIG_BLOCK, &signals_handled, NULL); - if (got_sighup || got_sigterm || got_sigusr2 || got_sigchld) { - sigprocmask(SIG_UNBLOCK, &signals_handled, NULL); - } else { - waiting = 1; - sigprocmask(SIG_UNBLOCK, &signals_handled, NULL); - wait_input(timeleft(&timo)); - } - } + + /* alert via signal pipe */ + waiting = 1; + /* flush signal pipe */ + for (; read(sigpipe[0], buf, sizeof(buf)) > 0; ); + add_fd(sigpipe[0]); + /* wait if necessary */ + if (!(got_sighup || got_sigterm || got_sigusr2 || got_sigchld)) + wait_input(timeleft(&timo)); waiting = 0; + remove_fd(sigpipe[0]); + calltimeout(); if (got_sighup) { info("Hangup (SIGHUP)"); @@ -643,10 +646,18 @@ handle_events() * setup_signals - initialize signal handling. */ static void -setup_signals() +setup_signals(void) { struct sigaction sa; + /* create pipe to wake up event handler from signal handler */ + if (pipe(sigpipe) < 0) + fatal("Couldn't create signal pipe: %m"); + fcntl(sigpipe[0], F_SETFD, fcntl(sigpipe[0], F_GETFD) | FD_CLOEXEC); + fcntl(sigpipe[1], F_SETFD, fcntl(sigpipe[1], F_GETFD) | FD_CLOEXEC); + fcntl(sigpipe[0], F_SETFL, fcntl(sigpipe[0], F_GETFL) | O_NONBLOCK); + fcntl(sigpipe[1], F_SETFL, fcntl(sigpipe[1], F_GETFL) | O_NONBLOCK); + /* * Compute mask of all interesting signals and install signal handlers * for each. Only one signal handler may be active at a time. Therefore, @@ -727,15 +738,18 @@ setup_signals() * unit we are using. */ void -set_ifunit(iskey) - int iskey; +set_ifunit(int iskey) { + char ifkey[32]; + if (req_ifname[0] != '\0') slprintf(ifname, sizeof(ifname), "%s", req_ifname); else slprintf(ifname, sizeof(ifname), "%s%d", PPP_DRV_NAME, ifunit); info("Using interface %s", ifname); script_setenv("IFNAME", ifname, iskey); + slprintf(ifkey, sizeof(ifkey), "%d", ifunit); + script_setenv("UNIT", ifkey, iskey); if (iskey) { create_pidfile(getpid()); /* write pid to file */ create_linkpidfile(getpid()); @@ -746,9 +760,10 @@ set_ifunit(iskey) * detach - detach us from the controlling terminal. */ void -detach() +detach(void) { int pid; + int ret; char numbuf[16]; int pipefd[2]; @@ -766,12 +781,14 @@ detach() /* update pid files if they have been written already */ if (pidfilename[0]) create_pidfile(pid); - if (linkpidfile[0]) - create_linkpidfile(pid); + create_linkpidfile(pid); exit(0); /* parent dies */ } setsid(); - chdir("/"); + ret = chdir("/"); + if (ret != 0) { + fatal("Could not change directory to '/', %m"); + } dup2(fd_devnull, 0); dup2(fd_devnull, 1); dup2(fd_devnull, 2); @@ -791,7 +808,7 @@ detach() * reopen_log - (re)open our connection to syslog. */ void -reopen_log() +reopen_log(void) { openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP); setlogmask(LOG_UPTO(LOG_INFO)); @@ -801,13 +818,12 @@ reopen_log() * Create a file containing our process ID. */ static void -create_pidfile(pid) - int pid; +create_pidfile(int pid) { FILE *pidfile; slprintf(pidfilename, sizeof(pidfilename), "%s%s.pid", - _PATH_VARRUN, ifname); + PPP_PATH_VARRUN, ifname); if ((pidfile = fopen(pidfilename, "w")) != NULL) { fprintf(pidfile, "%d\n", pid); (void) fclose(pidfile); @@ -818,8 +834,7 @@ create_pidfile(pid) } void -create_linkpidfile(pid) - int pid; +create_linkpidfile(int pid) { FILE *pidfile; @@ -827,7 +842,7 @@ create_linkpidfile(pid) return; script_setenv("LINKNAME", linkname, 1); slprintf(linkpidfile, sizeof(linkpidfile), "%sppp-%s.pid", - _PATH_VARRUN, linkname); + PPP_PATH_VARRUN, linkname); if ((pidfile = fopen(linkpidfile, "w")) != NULL) { fprintf(pidfile, "%d\n", pid); if (ifname[0]) @@ -842,7 +857,7 @@ create_linkpidfile(pid) /* * remove_pidfile - remove our pid files */ -void remove_pidfiles() +void remove_pidfiles(void) { if (pidfilename[0] != 0 && unlink(pidfilename) < 0 && errno != ENOENT) warn("unable to delete pid file %s: %m", pidfilename); @@ -856,8 +871,7 @@ void remove_pidfiles() * holdoff_end - called via a timeout when the holdoff period ends. */ static void -holdoff_end(arg) - void *arg; +holdoff_end(void *arg) { new_phase(PHASE_DORMANT); } @@ -1001,8 +1015,7 @@ struct protocol_list { * protocol_name - find a name for a PPP protocol. */ const char * -protocol_name(proto) - int proto; +protocol_name(int proto) { struct protocol_list *lp; @@ -1016,7 +1029,7 @@ protocol_name(proto) * get_input - called when incoming data is available. */ static void -get_input() +get_input(void) { int len, i; u_char *p; @@ -1108,10 +1121,7 @@ get_input() * itself), otherwise 0. */ int -ppp_send_config(unit, mtu, accm, pcomp, accomp) - int unit, mtu; - u_int32_t accm; - int pcomp, accomp; +ppp_send_config(int unit, int mtu, u_int32_t accm, int pcomp, int accomp) { int errs; @@ -1129,10 +1139,7 @@ ppp_send_config(unit, mtu, accm, pcomp, accomp) * itself), otherwise 0. */ int -ppp_recv_config(unit, mru, accm, pcomp, accomp) - int unit, mru; - u_int32_t accm; - int pcomp, accomp; +ppp_recv_config(int unit, int mru, u_int32_t accm, int pcomp, int accomp) { int errs; @@ -1147,8 +1154,7 @@ ppp_recv_config(unit, mru, accm, pcomp, accomp) * new_phase - signal the start of a new phase of pppd's operation. */ void -new_phase(p) - int p; +new_phase(int p) { phase = p; if (new_phase_hook) @@ -1160,8 +1166,7 @@ new_phase(p) * die - clean up state and exit with the specified status. */ void -die(status) - int status; +die(int status) { if (!doing_multilink || multilink_master) print_link_stats(); @@ -1176,7 +1181,7 @@ die(status) */ /* ARGSUSED */ static void -cleanup() +cleanup(void) { sys_cleanup(); @@ -1186,7 +1191,7 @@ cleanup() (*the_channel->cleanup)(); remove_pidfiles(); -#ifdef USE_TDB +#ifdef PPP_WITH_TDB if (pppdb != NULL) cleanup_db(); #endif @@ -1194,7 +1199,7 @@ cleanup() } void -print_link_stats() +print_link_stats(void) { /* * Print connect time and statistics. @@ -1212,26 +1217,24 @@ print_link_stats() * reset_link_stats - "reset" stats when link goes up. */ void -reset_link_stats(u) - int u; +reset_link_stats(int u) { if (!get_ppp_stats(u, &old_link_stats)) return; - gettimeofday(&start_time, NULL); + get_time(&start_time); } /* * update_link_stats - get stats at link termination. */ void -update_link_stats(u) - int u; +update_link_stats(int u) { struct timeval now; char numbuf[32]; if (!get_ppp_stats(u, &link_stats) - || gettimeofday(&now, NULL) < 0) + || get_time(&now) < 0) return; link_connect_time = now.tv_sec - start_time.tv_sec; link_stats_valid = 1; @@ -1243,9 +1246,9 @@ update_link_stats(u) slprintf(numbuf, sizeof(numbuf), "%u", link_connect_time); script_setenv("CONNECT_TIME", numbuf, 0); - slprintf(numbuf, sizeof(numbuf), "%u", link_stats.bytes_out); + snprintf(numbuf, sizeof(numbuf), "%" PRIu64, link_stats.bytes_out); script_setenv("BYTES_SENT", numbuf, 0); - slprintf(numbuf, sizeof(numbuf), "%u", link_stats.bytes_in); + snprintf(numbuf, sizeof(numbuf), "%" PRIu64, link_stats.bytes_in); script_setenv("BYTES_RCVD", numbuf, 0); } @@ -1253,7 +1256,7 @@ update_link_stats(u) struct callout { struct timeval c_time; /* time at which to call routine */ void *c_arg; /* argument to routine */ - void (*c_func) __P((void *)); /* routine */ + void (*c_func)(void *); /* routine */ struct callout *c_next; }; @@ -1264,10 +1267,7 @@ static struct timeval timenow; /* Current time */ * timeout - Schedule a timeout. */ void -timeout(func, arg, secs, usecs) - void (*func) __P((void *)); - void *arg; - int secs, usecs; +timeout(void (*func)(void *), void *arg, int secs, int usecs) { struct callout *newp, *p, **pp; @@ -1278,7 +1278,7 @@ timeout(func, arg, secs, usecs) fatal("Out of memory in timeout()!"); newp->c_arg = arg; newp->c_func = func; - gettimeofday(&timenow, NULL); + get_time(&timenow); newp->c_time.tv_sec = timenow.tv_sec + secs; newp->c_time.tv_usec = timenow.tv_usec + usecs; if (newp->c_time.tv_usec >= 1000000) { @@ -1303,9 +1303,7 @@ timeout(func, arg, secs, usecs) * untimeout - Unschedule a timeout. */ void -untimeout(func, arg) - void (*func) __P((void *)); - void *arg; +untimeout(void (*func)(void *), void *arg) { struct callout **copp, *freep; @@ -1325,14 +1323,14 @@ untimeout(func, arg) * calltimeout - Call any timeout routines which are now due. */ static void -calltimeout() +calltimeout(void) { struct callout *p; while (callout != NULL) { p = callout; - if (gettimeofday(&timenow, NULL) < 0) + if (get_time(&timenow) < 0) fatal("Failed to get time of day: %m"); if (!(p->c_time.tv_sec < timenow.tv_sec || (p->c_time.tv_sec == timenow.tv_sec @@ -1351,13 +1349,12 @@ calltimeout() * timeleft - return the length of time until the next timeout is due. */ static struct timeval * -timeleft(tvp) - struct timeval *tvp; +timeleft(struct timeval *tvp) { if (callout == NULL) return NULL; - gettimeofday(&timenow, NULL); + get_time(&timenow); tvp->tv_sec = callout->c_time.tv_sec - timenow.tv_sec; tvp->tv_usec = callout->c_time.tv_usec - timenow.tv_usec; if (tvp->tv_usec < 0) { @@ -1376,8 +1373,7 @@ timeleft(tvp) * We assume that sig is currently blocked. */ static void -kill_my_pg(sig) - int sig; +kill_my_pg(int sig) { struct sigaction act, oldact; struct subprocess *chp; @@ -1423,8 +1419,7 @@ kill_my_pg(sig) * signal, we just take the link down. */ static void -hup(sig) - int sig; +hup(int sig) { /* can't log a message here, it can deadlock */ got_sighup = 1; @@ -1432,8 +1427,12 @@ hup(sig) /* Send the signal to the [dis]connector process(es) also */ kill_my_pg(sig); notify(sigreceived, sig); - if (waiting) - siglongjmp(sigjmp, 1); + if (waiting) { +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-result" + write(sigpipe[1], &sig, sizeof(sig)); +#pragma GCC diagnostic pop + } } @@ -1444,8 +1443,7 @@ hup(sig) */ /*ARGSUSED*/ static void -term(sig) - int sig; +term(int sig) { /* can't log a message here, it can deadlock */ got_sigterm = sig; @@ -1453,8 +1451,12 @@ term(sig) /* Send the signal to the [dis]connector process(es) also */ kill_my_pg(sig); notify(sigreceived, sig); - if (waiting) - siglongjmp(sigjmp, 1); + if (waiting) { +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-result" + write(sigpipe[1], &sig, sizeof(sig)); +#pragma GCC diagnostic pop + } } @@ -1463,12 +1465,15 @@ term(sig) * Sets a flag so we will call reap_kids in the mainline. */ static void -chld(sig) - int sig; +chld(int sig) { got_sigchld = 1; - if (waiting) - siglongjmp(sigjmp, 1); + if (waiting) { +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-result" + write(sigpipe[1], &sig, sizeof(sig)); +#pragma GCC diagnostic pop + } } @@ -1479,8 +1484,7 @@ chld(sig) */ /*ARGSUSED*/ static void -toggle_debug(sig) - int sig; +toggle_debug(int sig) { debug = !debug; if (debug) { @@ -1498,12 +1502,15 @@ toggle_debug(sig) */ /*ARGSUSED*/ static void -open_ccp(sig) - int sig; +open_ccp(int sig) { got_sigusr2 = 1; - if (waiting) - siglongjmp(sigjmp, 1); + if (waiting) { +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-result" + write(sigpipe[1], &sig, sizeof(sig)); +#pragma GCC diagnostic pop + } } @@ -1511,8 +1518,7 @@ open_ccp(sig) * bad_signal - We've caught a fatal signal. Clean up state and exit. */ static void -bad_signal(sig) - int sig; +bad_signal(int sig) { static int crashed = 0; @@ -1566,8 +1572,9 @@ safe_fork(int infd, int outfd, int errfd) /* Executing in the child */ sys_close(); -#ifdef USE_TDB - tdb_close(pppdb); +#ifdef PPP_WITH_TDB + if (pppdb != NULL) + tdb_close(pppdb); #endif /* make sure infd, outfd and errfd won't get tromped on below */ @@ -1612,9 +1619,7 @@ safe_fork(int infd, int outfd, int errfd) } static bool -add_script_env(pos, newstring) - int pos; - char *newstring; +add_script_env(int pos, char *newstring) { if (pos + 1 >= s_env_nalloc) { int new_n = pos + 17; @@ -1632,8 +1637,7 @@ add_script_env(pos, newstring) } static void -remove_script_env(pos) - int pos; +remove_script_env(int pos) { free(script_env[pos] - 1); while ((script_env[pos] = script_env[pos + 1]) != NULL) @@ -1645,7 +1649,7 @@ remove_script_env(pos) * and update the system environment. */ static void -update_system_environment() +update_system_environment(void) { struct userenv *uep; @@ -1660,22 +1664,20 @@ update_system_environment() /* * device_script - run a program to talk to the specified fds * (e.g. to run the connector or disconnector script). - * stderr gets connected to the log fd or to the _PATH_CONNERRS file. + * stderr gets connected to the log fd or to the PPP_PATH_CONNERRS file. */ int -device_script(program, in, out, dont_wait) - char *program; - int in, out; - int dont_wait; +device_script(char *program, int in, int out, int dont_wait) { int pid; int status = -1; int errfd; + int ret; if (log_to_fd >= 0) errfd = log_to_fd; else - errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0600); + errfd = open(PPP_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0644); ++conn_running; pid = safe_fork(in, out, errfd); @@ -1705,12 +1707,15 @@ device_script(program, in, out, dont_wait) } /* here we are executing in the child */ - - setgid(getgid()); - setuid(uid); - if (getuid() != uid) { - fprintf(stderr, "pppd: setuid failed\n"); - exit(1); + ret = setgid(getgid()); + if (ret != 0) { + perror("pppd: setgid failed\n"); + exit(1); + } + ret = setuid(uid); + if (ret != 0 || getuid() != uid) { + perror("pppd: setuid failed\n"); + exit(1); } update_system_environment(); execl("/bin/sh", "sh", "-c", program, (char *)0); @@ -1728,7 +1733,7 @@ device_script(program, in, out, dont_wait) * script_unsetenv() safely after this routine is run. */ static void -update_script_environment() +update_script_environment(void) { struct userenv *uep; @@ -1752,7 +1757,7 @@ update_script_environment() script_env[i] = newstring; else add_script_env(i, newstring); - } else { + } else if (p != NULL) { remove_script_env(i); } } @@ -1769,15 +1774,9 @@ update_script_environment() * reap_kids) iff the return value is > 0. */ pid_t -run_program(prog, args, must_exist, done, arg, wait) - char *prog; - char **args; - int must_exist; - void (*done) __P((void *)); - void *arg; - int wait; +run_program(char *prog, char **args, int must_exist, void (*done)(void *), void *arg, int wait) { - int pid, status; + int pid, status, ret; struct stat sbuf; /* @@ -1817,9 +1816,18 @@ run_program(prog, args, must_exist, done, arg, wait) /* Leave the current location */ (void) setsid(); /* No controlling tty. */ (void) umask (S_IRWXG|S_IRWXO); - (void) chdir ("/"); /* no current directory. */ - setuid(0); /* set real UID = root */ - setgid(getegid()); + ret = chdir ("/"); /* no current directory. */ + if (ret != 0) { + fatal("Failed to change directory to '/', %m"); + } + ret = setuid(0); /* set real UID = root */ + if (ret != 0) { + fatal("Failed to set uid, %m"); + } + ret = setgid(getegid()); + if (ret != 0) { + fatal("failed to set gid, %m"); + } #ifdef BSD /* Force the priority back to zero if pppd is running higher. */ @@ -1846,12 +1854,7 @@ run_program(prog, args, must_exist, done, arg, wait) * to use. */ void -record_child(pid, prog, done, arg, killable) - int pid; - char *prog; - void (*done) __P((void *)); - void *arg; - int killable; +record_child(int pid, char *prog, void (*done)(void *), void *arg, int killable) { struct subprocess *chp; @@ -1876,8 +1879,7 @@ record_child(pid, prog, done, arg, killable) * exit, send them all a SIGTERM. */ static void -childwait_end(arg) - void *arg; +childwait_end(void *arg) { struct subprocess *chp; @@ -1893,8 +1895,7 @@ childwait_end(arg) * forget_child - clean up after a dead child */ static void -forget_child(pid, status) - int pid, status; +forget_child(int pid, int status) { struct subprocess *chp, **prevp; @@ -1923,7 +1924,7 @@ forget_child(pid, status) * and log a message for abnormal terminations. */ static int -reap_kids() +reap_kids(void) { int pid, status; @@ -1945,10 +1946,7 @@ reap_kids() * add_notifier - add a new function to be called when something happens. */ void -add_notifier(notif, func, arg) - struct notifier **notif; - notify_func func; - void *arg; +add_notifier(struct notifier **notif, notify_func func, void *arg) { struct notifier *np; @@ -1966,10 +1964,7 @@ add_notifier(notif, func, arg) * be called when something happens. */ void -remove_notifier(notif, func, arg) - struct notifier **notif; - notify_func func; - void *arg; +remove_notifier(struct notifier **notif, notify_func func, void *arg) { struct notifier *np; @@ -1986,9 +1981,7 @@ remove_notifier(notif, func, arg) * notify - call a set of functions registered with add_notifier. */ void -notify(notif, val) - struct notifier *notif; - int val; +notify(struct notifier *notif, int val) { struct notifier *np; @@ -2002,8 +1995,7 @@ notify(notif, val) * novm - log an error message saying we ran out of memory, and die. */ void -novm(msg) - char *msg; +novm(char *msg) { fatal("Virtual memory exhausted allocating %s\n", msg); } @@ -2013,9 +2005,7 @@ novm(msg) * for scripts that we run (e.g. ip-up, auth-up, etc.) */ void -script_setenv(var, value, iskey) - char *var, *value; - int iskey; +script_setenv(char *var, char *value, int iskey) { size_t varl = strlen(var); size_t vl = varl + strlen(value) + 2; @@ -2032,13 +2022,13 @@ script_setenv(var, value, iskey) if (script_env != 0) { for (i = 0; (p = script_env[i]) != 0; ++i) { if (strncmp(p, var, varl) == 0 && p[varl] == '=') { -#ifdef USE_TDB +#ifdef PPP_WITH_TDB if (p[-1] && pppdb != NULL) delete_db_key(p); #endif free(p-1); script_env[i] = newstring; -#ifdef USE_TDB +#ifdef PPP_WITH_TDB if (pppdb != NULL) { if (iskey) add_db_key(newstring); @@ -2062,7 +2052,7 @@ script_setenv(var, value, iskey) if (!add_script_env(i, newstring)) return; -#ifdef USE_TDB +#ifdef PPP_WITH_TDB if (pppdb != NULL) { if (iskey) add_db_key(newstring); @@ -2076,8 +2066,7 @@ script_setenv(var, value, iskey) * for scripts. */ void -script_unsetenv(var) - char *var; +script_unsetenv(char *var) { int vl = strlen(var); int i; @@ -2087,7 +2076,7 @@ script_unsetenv(var) return; for (i = 0; (p = script_env[i]) != 0; ++i) { if (strncmp(p, var, vl) == 0 && p[vl] == '=') { -#ifdef USE_TDB +#ifdef PPP_WITH_TDB if (p[-1] && pppdb != NULL) delete_db_key(p); #endif @@ -2095,7 +2084,7 @@ script_unsetenv(var) break; } } -#ifdef USE_TDB +#ifdef PPP_WITH_TDB if (pppdb != NULL) update_db_entry(); #endif @@ -2111,9 +2100,9 @@ script_unsetenv(var) * lock_db - get an exclusive lock on the TDB database. * Used to ensure atomicity of various lookup/modify operations. */ -void lock_db() +void lock_db(void) { -#ifdef USE_TDB +#ifdef PPP_WITH_TDB TDB_DATA key; key.dptr = PPPD_LOCK_KEY; @@ -2125,9 +2114,9 @@ void lock_db() /* * unlock_db - remove the exclusive lock obtained by lock_db. */ -void unlock_db() +void unlock_db(void) { -#ifdef USE_TDB +#ifdef PPP_WITH_TDB TDB_DATA key; key.dptr = PPPD_LOCK_KEY; @@ -2136,12 +2125,12 @@ void unlock_db() #endif } -#ifdef USE_TDB +#ifdef PPP_WITH_TDB /* * update_db_entry - update our entry in the database. */ static void -update_db_entry() +update_db_entry(void) { TDB_DATA key, dbuf; int vlen, i; @@ -2175,8 +2164,7 @@ update_db_entry() * add_db_key - add a key that we can use to look up our database entry. */ static void -add_db_key(str) - const char *str; +add_db_key(const char *str) { TDB_DATA key, dbuf; @@ -2192,8 +2180,7 @@ add_db_key(str) * delete_db_key - delete a key for looking up our database entry. */ static void -delete_db_key(str) - const char *str; +delete_db_key(const char *str) { TDB_DATA key; @@ -2206,7 +2193,7 @@ delete_db_key(str) * cleanup_db - delete all the entries we put in the database. */ static void -cleanup_db() +cleanup_db(void) { TDB_DATA key; int i; @@ -2219,4 +2206,4 @@ cleanup_db() if (p[-1]) delete_db_key(p); } -#endif /* USE_TDB */ +#endif /* PPP_WITH_TDB */