summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2008-10-02 23:19:19 +0000
committerderaadt <deraadt@openbsd.org>2008-10-02 23:19:19 +0000
commit5eace78a836a402b2f32907e448d7a345472efce (patch)
tree98e25582c495a8c5568a7678115708c5af5d6f50
parentzap trailing whitespace; (diff)
downloadwireguard-openbsd-5eace78a836a402b2f32907e448d7a345472efce.tar.xz
wireguard-openbsd-5eace78a836a402b2f32907e448d7a345472efce.zip
Repair "set reconnect random 0" from PR 5368. This bug report was ignored
since Feb 2007, even though it had a patch. How did this happen??
-rw-r--r--usr.sbin/ppp/ppp/datalink.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/usr.sbin/ppp/ppp/datalink.c b/usr.sbin/ppp/ppp/datalink.c
index 80273d21078..b19a600c959 100644
--- a/usr.sbin/ppp/ppp/datalink.c
+++ b/usr.sbin/ppp/ppp/datalink.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $OpenBSD: datalink.c,v 1.47 2005/07/18 22:51:03 brad Exp $
+ * $OpenBSD: datalink.c,v 1.48 2008/10/02 23:19:19 deraadt Exp $
*/
#include <sys/param.h>
@@ -1158,7 +1158,13 @@ int
datalink_SetReconnect(struct cmdargs const *arg)
{
if (arg->argc == arg->argn+2) {
- arg->cx->cfg.reconnect.timeout = atoi(arg->argv[arg->argn]);
+ if (strncasecmp(arg->argv[arg->argn], "random", 6) == 0 &&
+ (arg->argv[arg->argn][6] == '\0')) {
+ arg->cx->cfg.reconnect.timeout = -1;
+ randinit();
+ } else {
+ arg->cx->cfg.reconnect.timeout = atoi(arg->argv[arg->argn]);
+ }
arg->cx->cfg.reconnect.max = atoi(arg->argv[arg->argn+1]);
return 0;
}