aboutsummaryrefslogtreecommitdiffstats
path: root/security/openssh-portable/files/patch-session.c
blob: 28dc7a851ec36fd44712515baa6a826195de82fe (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
--- session.c.orig  Mon Sep 17 00:17:15 2001
+++ session.c   Wed Oct  3 14:18:36 2001
@@ -437,6 +437,13 @@
        log_init(__progname, options.log_level, options.log_facility, log_stderr);
 
        /*
+        * Using login and executing a specific "command" are mutually
+        * exclusive, so turn off use_login if there's a command.
+        */
+       if (command != NULL)
+           options.use_login = 0;
+
+       /*
         * Create a new session and process group since the 4.4BSD
         * setlogin() affects the entire process group.
         */
@@ -551,6 +558,14 @@
 
        /* Child.  Reinitialize the log because the pid has changed. */
        log_init(__progname, options.log_level, options.log_facility, log_stderr);
+
+       /*
+        * Using login and executing a specific "command" are mutually
+        * exclusive, so turn off use_login if there's a command.
+        */
+       if (command != NULL)
+           options.use_login = 0;
+
        /* Close the master side of the pseudo tty. */
        close(ptyfd);
 
@@ -682,6 +697,11 @@
    time_t last_login_time;
    struct passwd * pw = s->pw;
    pid_t pid = getpid();
+#ifdef HAVE_LOGIN_CAP
+   FILE *f;
+   char buf[256];
+   char *fname;
+#endif /* HAVE_LOGIN_CAP */
 
    /*
     * Get IP address of client. If the connection is not a socket, let
@@ -742,6 +762,21 @@
            printf("Last login: %s from %s\r\n", time_string, hostname);
    }
 
+#ifdef HAVE_LOGIN_CAP
+   if (!options.use_login) {
+       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
+           (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.");
+   }
+#endif /* HAVE_LOGIN_CAP */
+
    do_motd();
 }
 
@@ -1340,7 +1375,7 @@
     * initgroups, because at least on Solaris 2.3 it leaves file
     * descriptors open.
     */
-   for (i = 3; i < 64; i++)
+   for (i = 3; i < getdtablesize(); i++)
        close(i);
 
    /* Change current directory to the user\'s home directory. */
@@ -1376,6 +1411,28 @@
     * in this order).
     */
    if (!options.use_login) {
+#ifdef __FreeBSD__
+       /*
+        * If the password change time is set and has passed, give the
+        * user a password expiry notice and chance to change it.
+        */
+       if (pw->pw_change != 0) {
+           struct timeval tv;
+
+           (void)gettimeofday(&tv, NULL);
+           if (tv.tv_sec >= pw->pw_change) {
+               (void)printf(
+                   "Sorry -- your password has expired.\n");
+               syslog(LOG_INFO,
+                   "%s Password expired - forcing change",
+                   pw->pw_name);
+               if (system("/usr/bin/passwd") != 0) {
+                   perror("/usr/bin/passwd");
+                   exit(1);
+               }
+           }
+       }
+#endif /* __FreeBSD__ */
        /* ignore _PATH_SSH_USER_RC for subsystems */
        if (!s->is_subsystem && (stat(_PATH_SSH_USER_RC, &st) >= 0)) {
            snprintf(cmd, sizeof cmd, "%s -c '%s %s'",