From 905571c0311920c9a0cde9c6632b52466b92903a Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Tue, 28 Sep 2010 20:57:14 +0000 Subject: [PATCH] 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) --- crypto/openssh/session.c | 18 ------------------ usr.bin/login/login.c | 7 ------- 2 files changed, 25 deletions(-) diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c index c11a68a1f4ca..9fa7213d0c56 100644 --- a/crypto/openssh/session.c +++ b/crypto/openssh/session.c @@ -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 diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c index da182aa90e89..3e826d57bda8 100644 --- a/usr.bin/login/login.c +++ b/usr.bin/login/login.c @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); * login -f name (for pre-authenticated login: datakit, xterm, etc.) */ -#include #include #include #include @@ -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);