From owner-svn-src-stable-11@freebsd.org Tue May 23 08:41:42 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9341FD784BE; Tue, 23 May 2017 08:41:42 +0000 (UTC) (envelope-from royger@gmail.com) Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 26DAC13CD; Tue, 23 May 2017 08:41:42 +0000 (UTC) (envelope-from royger@gmail.com) Received: by mail-wm0-x244.google.com with SMTP id g15so18010770wmc.2; Tue, 23 May 2017 01:41:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=xuYvszDsPVBQKA7dC/HJVDM2nwYpy7dHUh7h4nIXzT0=; b=ZsVwLdFAHHEBH0DqvNPpmcmxX4phGcAL/sBbIsclbuYgigNf9yq7ogihHI3sBgCBVG 1bQcL9X81di5ACNoHMQ6FdAvDgJubGdwXIEb45vqXatwrQbKGtCsmWkFeDsmnnocXFsa tOEeDBjeUkoc9/rINCtq0ueMkIftqcjAAI9rWwBv7m8u/BMhTIx4BYiJvKk8uDln4jBb oaXHGIjxdLpojCzi3LYiTw9bYf+pOaqUK41mLXqMxUjN/vgdnzLriBT2/xVcQxMssqM2 t1cegDgbbxNBX+28s6SdU2AFyKO2IjmJRBFLe4oRbOq716yCB43g+xI2RSZLIc4lDyRQ QHPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=xuYvszDsPVBQKA7dC/HJVDM2nwYpy7dHUh7h4nIXzT0=; b=OYrIn/vn+blAleuTp6IrIGdMwYRL0NEy25lvshuoH8cSzQ/lhyiVjB+LE102qIDtld +LdkSGcDTddw3WBwtdoMOf2aZmkGLK4RqHYAasuyFebpC3B6ZnZqlqNuwuZF5rIJogY8 YcHj2qdVop9cY379FLiABK8hjEEZisLLH0JfBJ3boqCAtPsDZvWojG9Vaa+eqipwCGry OND3tHQftgj0vhPJcaI8WsVA/TVPuBo8yIKeosvwfiUPWkK71+FDmMiqVo+kVOgrVRr9 S8vI/lh5tTzcG5dWpsNuA5WWyVoMk3W8jT7IQsQA/LFcr6CYUNLIpdx/V08yXVjGjjcO +EDQ== X-Gm-Message-State: AODbwcAZUIpF4EZE86KyTy73R/lu12Z5alcl1m5Q9rPReGwKPFQ0vhmd lnkfDf5Bmo95IjC/ X-Received: by 10.80.187.68 with SMTP id y62mr20440846ede.51.1495528900290; Tue, 23 May 2017 01:41:40 -0700 (PDT) Received: from localhost (default-46-102-197-194.interdsl.co.uk. [46.102.197.194]) by smtp.gmail.com with ESMTPSA id g29sm24993eda.43.2017.05.23.01.41.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 May 2017 01:41:39 -0700 (PDT) Sender: =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= Date: Tue, 23 May 2017 09:41:36 +0100 From: Roger Pau =?iso-8859-1?Q?Monn=E9?= To: Nick Hibma Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r318630 - stable/11/sbin/dhclient Message-ID: <20170523084136.m4apjlyyvpaoqpwt@dhcp-3-128.uk.xensource.com> References: <201705221028.v4MASHNe041436@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201705221028.v4MASHNe041436@repo.freebsd.org> User-Agent: NeoMutt/20170428 (1.8.2) X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 May 2017 08:41:42 -0000 On Mon, May 22, 2017 at 10:28:17AM +0000, Nick Hibma wrote: > Author: n_hibma > Date: Mon May 22 10:28:17 2017 > New Revision: 318630 > URL: https://svnweb.freebsd.org/changeset/base/318630 > > Log: > MFC: > > ------------------------------------------------------------------------ > r317923 | n_hibma | 2017-05-07 23:11:28 +0200 (Sun, 07 May 2017) | 8 lines > > Fix the output of very large rebind, renew and lease time options in > lease file. > > Some routers set very large values for rebind time (Netgear) and these > are erroneously reported as negative in the leasefile. This was due to a > wrong printf format specification of %ld for an unsigned long on 32-bit > platforms. > > ------------------------------------------------------------------------ > r317915 | n_hibma | 2017-05-07 21:59:37 +0200 (Sun, 07 May 2017) | 16 lines > > Fix handling of large DHCP expiry values. > > They would overflow a signed 32-bit time_t on 32 bit architectures. This > was taken care of, but a compiler optimisation makes this behave > erratically. This could be resolved by adding a -fwrapv flag, but > instead we can check the value before adding the current timestamp to > it. > > In the lease file values are still wrong though: > > option dhcp-rebinding-time -644245096; > > PR: 218980 > > Modified: > stable/11/sbin/dhclient/dhclient.c > stable/11/sbin/dhclient/options.c This is missing the mergeinfo in stable/11. Roger.