From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 22 09:04:56 2014
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])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D696A8C9;
 Wed, 22 Oct 2014 09:04:56 +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 C2BF8EA2;
 Wed, 22 Oct 2014 09:04:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9M94uHl034078;
 Wed, 22 Oct 2014 09:04:56 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9M94uUH034077;
 Wed, 22 Oct 2014 09:04:56 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201410220904.s9M94uUH034077@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 22 Oct 2014 09:04:56 +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: r273460 - stable/10/sys/kern
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.18-1
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: Wed, 22 Oct 2014 09:04:57 -0000

Author: kib
Date: Wed Oct 22 09:04:56 2014
New Revision: 273460
URL: https://svnweb.freebsd.org/changeset/base/273460

Log:
  MFC r273129:
  Implement FIODTYPE for master ptys.

Modified:
  stable/10/sys/kern/tty_pts.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/tty_pts.c
==============================================================================
--- stable/10/sys/kern/tty_pts.c	Wed Oct 22 08:59:23 2014	(r273459)
+++ stable/10/sys/kern/tty_pts.c	Wed Oct 22 09:04:56 2014	(r273460)
@@ -269,6 +269,9 @@ ptsdev_ioctl(struct file *fp, u_long cmd
 	int error = 0, sig;
 
 	switch (cmd) {
+	case FIODTYPE:
+		*(int *)data = D_TTY;
+		return (0);
 	case FIONBIO:
 		/* This device supports non-blocking operation. */
 		return (0);