diff options
| author |   brian <brian@openbsd.org> | 1999-01-25 10:33:32 +0000 |
|---|---|---|
| committer | brian <brian@openbsd.org> | 1999-01-25 10:33:32 +0000 |
| commit | cfe2f7f2a2510016caace8760f502d3cb5e8b065 (patch) | |
| tree | 8224ce3541821c67031ede663370ce7a8b77f8f2 | |
| parent | Update CPP_SPEC. (diff) | |
| download | wireguard-openbsd-cfe2f7f2a2510016caace8760f502d3cb5e8b065.tar.xz wireguard-openbsd-cfe2f7f2a2510016caace8760f502d3cb5e8b065.zip | |
Don't SEGV when ``set proctitle'' is used in the default
section.
Submitted by: Dan Lukes <dan@obluda.cz>
| -rw-r--r-- | usr.sbin/ppp/ppp/main.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/usr.sbin/ppp/ppp/main.c b/usr.sbin/ppp/ppp/main.c index cbcdfb7d116..3f4e0c7f864 100644 --- a/usr.sbin/ppp/ppp/main.c +++ b/usr.sbin/ppp/ppp/main.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: main.c,v 1.5 1998/12/10 18:40:41 brian Exp $ + * $Id: main.c,v 1.6 1999/01/25 10:33:32 brian Exp $ * * TODO: */ @@ -251,6 +251,7 @@ int main(int argc, char **argv) { char *name; + const char *lastlabel; int nfds, mode, alias, label, arg; struct bundle *bundle; struct prompt *prompt; @@ -325,6 +326,9 @@ main(int argc, char **argv) log_Printf(LogWARN, "bundle_Create: %s\n", strerror(errno)); return EX_START; } + + /* NOTE: We may now have changed argv[1] via a ``set proctitle'' */ + if (prompt) { prompt->bundle = bundle; /* couldn't do it earlier */ prompt_Printf(prompt, "Using interface: %s\n", bundle->iface->name); @@ -349,15 +353,17 @@ main(int argc, char **argv) sig_signal(SIGUSR2, BringDownServer); + lastlabel = argc == 2 ? bundle->argv1 : argv[argc - 1]; for (arg = label; arg < argc; arg++) { /* In case we use LABEL or ``set enddisc label'' */ - bundle_SetLabel(bundle, argv[argc - 1]); - system_Select(bundle, argv[arg], CONFFILE, prompt, NULL); + bundle_SetLabel(bundle, lastlabel); + system_Select(bundle, arg == 1 ? bundle->argv1 : argv[arg], + CONFFILE, prompt, NULL); } if (label < argc) /* In case the last label did a ``load'' */ - bundle_SetLabel(bundle, argv[argc - 1]); + bundle_SetLabel(bundle, lastlabel); if (mode == PHYS_AUTO && bundle->ncp.ipcp.cfg.peer_range.ipaddr.s_addr == INADDR_ANY) { |