From owner-svn-src-stable@FreeBSD.ORG  Sun Jan  1 23:51:39 2012
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 392CD1065781;
	Sun,  1 Jan 2012 23:51:39 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 232558FC12;
	Sun,  1 Jan 2012 23:51:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q01NpdXE038192;
	Sun, 1 Jan 2012 23:51:39 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q01NpdsA038190;
	Sun, 1 Jan 2012 23:51:39 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201201012351.q01NpdsA038190@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 1 Jan 2012 23:51:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229249 - stable/9/usr.sbin/uhsoctl
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 01 Jan 2012 23:51:39 -0000

Author: dim
Date: Sun Jan  1 23:51:38 2012
New Revision: 229249
URL: http://svn.freebsd.org/changeset/base/229249

Log:
  MFC r228721:
  
  In usr.sbin/uhsoctl/uhsoctl.c, fix a few warnings about format strings
  not being literals.

Modified:
  stable/9/usr.sbin/uhsoctl/uhsoctl.c
Directory Properties:
  stable/9/usr.sbin/uhsoctl/   (props changed)

Modified: stable/9/usr.sbin/uhsoctl/uhsoctl.c
==============================================================================
--- stable/9/usr.sbin/uhsoctl/uhsoctl.c	Sun Jan  1 23:51:18 2012	(r229248)
+++ stable/9/usr.sbin/uhsoctl/uhsoctl.c	Sun Jan  1 23:51:38 2012	(r229249)
@@ -340,7 +340,7 @@ logger(int pri, const char *fmt, ...)
 	va_start(ap, fmt);
 	vasprintf(&buf, fmt, ap);
 	if (syslog_open)
-		syslog(pri, buf);
+		syslog(pri, "%s", buf);
 	else {
 		switch (pri) {
 		case LOG_INFO:
@@ -1174,7 +1174,7 @@ do_connect(struct ctx *ctx, const char *
 			buf = ra.val[0].ptr;
 			if (strstr(buf[0], "+CME ERROR:") != NULL) {
 				buf[0] += 12;
-				errx(1, buf[0]);
+				errx(1, "%s", buf[0]);
 			}
 			freeresp(&ra);
 		} else