From owner-svn-src-all@FreeBSD.ORG  Thu May 22 09:28:37 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 47871CA9;
 Thu, 22 May 2014 09:28:37 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 350B12CF2;
 Thu, 22 May 2014 09:28:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4M9SbUX043179;
 Thu, 22 May 2014 09:28:37 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4M9Sbvo043178;
 Thu, 22 May 2014 09:28:37 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201405220928.s4M9Sbvo043178@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Thu, 22 May 2014 09:28:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r266539 - head/usr.bin/lock
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
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/options/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: Thu, 22 May 2014 09:28:37 -0000

Author: ray
Date: Thu May 22 09:28:36 2014
New Revision: 266539
URL: http://svnweb.freebsd.org/changeset/base/266539

Log:
  Rollback r266496.
  Different meaning of flags for lock(1) and vidcontrol(1) confuse me.
  
  Pointy hat to:	ray
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/usr.bin/lock/lock.c

Modified: head/usr.bin/lock/lock.c
==============================================================================
--- head/usr.bin/lock/lock.c	Thu May 22 07:27:04 2014	(r266538)
+++ head/usr.bin/lock/lock.c	Thu May 22 09:28:36 2014	(r266539)
@@ -121,7 +121,7 @@ main(int argc, char **argv)
 			no_timeout = 1;
 			break;
 		case 'v':
-			vtylock = 0x2;
+			vtylock = 1;
 			break;
 		case '?':
 		default:
@@ -193,7 +193,7 @@ main(int argc, char **argv)
 			(void)tcsetattr(0, TCSADRAIN|TCSASOFT, &tty);
 			err(1, "locking vty");
 		}
-		vtyunlock = 0x1;
+		vtyunlock = 0x2;
 	}
 
 	/* header info */