From owner-svn-src-head@FreeBSD.ORG  Tue Sep 28 20:57:14 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BDFFB10656C0;
	Tue, 28 Sep 2010 20:57:14 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 91EA68FC18;
	Tue, 28 Sep 2010 20:57:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8SKvEbJ085333;
	Tue, 28 Sep 2010 20:57:14 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8SKvEVt085330;
	Tue, 28 Sep 2010 20:57:14 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201009282057.o8SKvEVt085330@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 28 Sep 2010 20:57:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213250 - in head: crypto/openssh usr.bin/login
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Sep 2010 20:57:14 -0000

Author: emaste
Date: Tue Sep 28 20:57:14 2010
New Revision: 213250
URL: http://svn.freebsd.org/changeset/base/213250

Log:
  Remove copyright strings printed at login time via login(1) or sshd(8).
  It is not clear to what this copyright should apply, and this is in line
  with what other operating systems do.
  
  For ssh specifically, printing of the copyright string is not in the
  upstream version so this reduces our FreeBSD-local diffs.
  
  Approved by:	core, des (ssh)

Modified:
  head/crypto/openssh/session.c
  head/usr.bin/login/login.c

Modified: head/crypto/openssh/session.c
==============================================================================
--- head/crypto/openssh/session.c	Tue Sep 28 19:17:39 2010	(r213249)
+++ head/crypto/openssh/session.c	Tue Sep 28 20:57:14 2010	(r213250)
@@ -893,24 +893,6 @@ do_motd(void)
 {
 	FILE *f;
 	char buf[256];
-#ifdef HAVE_LOGIN_CAP
-	const char *fname;
-#endif
-
-#ifdef HAVE_LOGIN_CAP
-	fname = login_getcapstr(lc, "copyright", NULL, NULL);
-	if (fname != NULL && (f = fopen(fname, "r")) != NULL) {
-		while (fgets(buf, sizeof(buf), f) != NULL)
-			fputs(buf, stdout);
-			fclose(f);
-	} else
-#endif /* HAVE_LOGIN_CAP */
-		(void)printf("%s\n\t%s %s\n",
-	"Copyright (c) 1980, 1983, 1986, 1988, 1990, 1991, 1993, 1994",
-	"The Regents of the University of California. ",
-	"All rights reserved.");
-
-	(void)printf("\n");
 
 	if (options.print_motd) {
 #ifdef HAVE_LOGIN_CAP

Modified: head/usr.bin/login/login.c
==============================================================================
--- head/usr.bin/login/login.c	Tue Sep 28 19:17:39 2010	(r213249)
+++ head/usr.bin/login/login.c	Tue Sep 28 20:57:14 2010	(r213250)
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
  * login -f name	(for pre-authenticated login: datakit, xterm, etc.)
  */
 
-#include <sys/copyright.h>
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/stat.h>
@@ -590,12 +589,6 @@ main(int argc, char *argv[])
 	if (!quietlog) {
 		const char *cw;
 
-		cw = login_getcapstr(lc, "copyright", NULL, NULL);
-		if (cw == NULL || motd(cw) == -1)
-			(void)printf("%s", copyright);
-
-		(void)printf("\n");
-
 		cw = login_getcapstr(lc, "welcome", NULL, NULL);
 		if (cw != NULL && access(cw, F_OK) == 0)
 			motd(cw);