From owner-svn-src-all@FreeBSD.ORG  Mon Oct 19 21:24:19 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C1C77106566B;
	Mon, 19 Oct 2009 21:24:19 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B16C28FC19;
	Mon, 19 Oct 2009 21:24:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9JLOJpL015699;
	Mon, 19 Oct 2009 21:24:19 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9JLOJaP015697;
	Mon, 19 Oct 2009 21:24:19 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200910192124.n9JLOJaP015697@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Mon, 19 Oct 2009 21:24:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198254 - head/usr.sbin/tzsetup
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Oct 2009 21:24:19 -0000

Author: edwin
Date: Mon Oct 19 21:24:19 2009
New Revision: 198254
URL: http://svn.freebsd.org/changeset/base/198254

Log:
  When tzsetup is run as non-root and the "CMOS clock question on
  UTC" is answered as No, it would abort without properly ending the
  dialog session.
  
  MFC after:	 1 week

Modified:
  head/usr.sbin/tzsetup/tzsetup.c

Modified: head/usr.sbin/tzsetup/tzsetup.c
==============================================================================
--- head/usr.sbin/tzsetup/tzsetup.c	Mon Oct 19 21:10:56 2009	(r198253)
+++ head/usr.sbin/tzsetup/tzsetup.c	Mon Oct 19 21:24:19 2009	(r198254)
@@ -709,9 +709,11 @@ main(int argc, char **argv)
 				fd = open(_PATH_WALL_CMOS_CLOCK,
 				    O_WRONLY | O_CREAT | O_TRUNC,
 				    S_IRUSR | S_IRGRP | S_IROTH);
-				if (fd < 0)
+				if (fd < 0) {
+					end_dialog();
 					err(1, "create %s",
 					    _PATH_WALL_CMOS_CLOCK);
+				}
 				close(fd);
 			}
 		}