From owner-svn-src-stable@FreeBSD.ORG  Sun Mar  3 19:26:06 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1717D4B8;
 Sun,  3 Mar 2013 19:26:06 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 090743D5;
 Sun,  3 Mar 2013 19:26:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r23JQ5i7055689;
 Sun, 3 Mar 2013 19:26:05 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r23JQ5ZL055687;
 Sun, 3 Mar 2013 19:26:05 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201303031926.r23JQ5ZL055687@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Sun, 3 Mar 2013 19:26:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r247728 - stable/9/usr.sbin/tzsetup
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Mar 2013 19:26:06 -0000

Author: dteske
Date: Sun Mar  3 19:26:05 2013
New Revision: 247728
URL: http://svnweb.freebsd.org/changeset/base/247728

Log:
  MFC r230296:
  
  Don't write /var/db/zoneinfo when zone is not actually changed.
  
  If the specified zone file does not exist or the -n flag is specified,
  do not update /var/db/zoneinfo.
  
  PR:		bin/164039
  Submitted by:	dteske

Modified:
  stable/9/usr.sbin/tzsetup/tzsetup.c

Modified: stable/9/usr.sbin/tzsetup/tzsetup.c
==============================================================================
--- stable/9/usr.sbin/tzsetup/tzsetup.c	Sun Mar  3 19:20:30 2013	(r247727)
+++ stable/9/usr.sbin/tzsetup/tzsetup.c	Sun Mar  3 19:26:05 2013	(r247728)
@@ -836,9 +836,11 @@ install_zoneinfo(const char *zoneinfo)
 	rv = install_zoneinfo_file(path_zoneinfo_file);
 
 	/* Save knowledge for later */
-	if ((f = fopen(path_db, "w")) != NULL) {
-		fprintf(f, "%s\n", zoneinfo);
-		fclose(f);
+	if (reallydoit && (rv & DITEM_FAILURE) == 0) {
+		if ((f = fopen(path_db, "w")) != NULL) {
+			fprintf(f, "%s\n", zoneinfo);
+			fclose(f);
+		}
 	}
 
 	return (rv);