From owner-svn-src-stable@FreeBSD.ORG  Fri Nov  1 16:03:38 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B58554AE;
 Fri,  1 Nov 2013 16:03:38 +0000 (UTC) (envelope-from jlh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A2A87268A;
 Fri,  1 Nov 2013 16:03:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA1G3ccg050420;
 Fri, 1 Nov 2013 16:03:38 GMT (envelope-from jlh@svn.freebsd.org)
Received: (from jlh@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA1G3cIm050419;
 Fri, 1 Nov 2013 16:03:38 GMT (envelope-from jlh@svn.freebsd.org)
Message-Id: <201311011603.rA1G3cIm050419@svn.freebsd.org>
From: Jeremie Le Hen <jlh@FreeBSD.org>
Date: Fri, 1 Nov 2013 16:03:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r257508 - stable/10/etc/defaults
X-SVN-Group: stable-10
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: Fri, 01 Nov 2013 16:03:38 -0000

Author: jlh
Date: Fri Nov  1 16:03:38 2013
New Revision: 257508
URL: http://svnweb.freebsd.org/changeset/base/257508

Log:
  MFC r257361:
    Fix compatibility function for old daily_status_security_${name}_enable
    variables.
  
    PR:           conf/183137
  
  MFC r257364:
    Fix indentation.
  
  Approved by:	re (gjb)

Modified:
  stable/10/etc/defaults/periodic.conf
Directory Properties:
  stable/10/etc/   (props changed)

Modified: stable/10/etc/defaults/periodic.conf
==============================================================================
--- stable/10/etc/defaults/periodic.conf	Fri Nov  1 15:54:57 2013	(r257507)
+++ stable/10/etc/defaults/periodic.conf	Fri Nov  1 16:03:38 2013	(r257508)
@@ -319,7 +319,7 @@ if [ -z "${source_periodic_confs_defined
 	security_daily_compat_var() {
 		local var=$1 dailyvar value
 
-		dailyvar=daily_status_security${#status_security}
+		dailyvar=daily_status_security${var#security_status}
 		periodvar=${var%enable}period
 		eval value=\"\$$dailyvar\"
 		[ -z "$value" ] && return
@@ -331,7 +331,7 @@ if [ -z "${source_periodic_confs_defined
 			$periodvar=daily
 			;;
 		*)
-			$var="$value"
+			eval $var=\"$value\"
 			;;
 		esac
 	}