aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2010-09-28 20:57:14 +0000
committerEd Maste <emaste@FreeBSD.org>2010-09-28 20:57:14 +0000
commit905571c0311920c9a0cde9c6632b52466b92903a (patch)
treee042184ca44509ba5193693efc5ec080468d927a
parent1115f627db84132bf4166792627c4b3ce5d1c65d (diff)
Notes
-rw-r--r--crypto/openssh/session.c18
-rw-r--r--usr.bin/login/login.c7
2 files changed, 0 insertions, 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 <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);