d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove copyright strings printed at login time via login(1) or sshd(8).

Browse Source 
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)
This commit is contained in:
Ed Maste 2010-09-28 20:57:14 +00:00
parent 1115f627db
commit 905571c031
2 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crypto/openssh/session.c
View File

@ -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

7
usr.bin/login/login.c
View File

@ -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);