diff options
Diffstat (limited to 'security/ssh/files/patch-af')
| -rw-r--r-- | security/ssh/files/patch-af | 106 |
1 files changed, 53 insertions, 53 deletions
diff --git a/security/ssh/files/patch-af b/security/ssh/files/patch-af index f0cea2252274..17d22fcf7540 100644 --- a/security/ssh/files/patch-af +++ b/security/ssh/files/patch-af @@ -1,7 +1,7 @@ -*** sshd.c.WAS Thu Jun 11 23:11:47 1998 ---- sshd.c Thu Jun 11 23:30:30 1998 +*** sshd.c.orig Wed May 12 20:19:29 1999 +--- sshd.c Sun Jun 6 02:37:18 1999 *************** -*** 2014,2020 **** +*** 2222,2228 **** pwcopy.pw_class = xstrdup(pw->pw_class); pwcopy.pw_change = pw->pw_change; pwcopy.pw_expire = pw->pw_expire; @@ -9,7 +9,7 @@ pwcopy.pw_dir = xstrdup(pw->pw_dir); pwcopy.pw_shell = xstrdup(pw->pw_shell); pw = &pwcopy; ---- 2014,2020 ---- +--- 2222,2228 ---- pwcopy.pw_class = xstrdup(pw->pw_class); pwcopy.pw_change = pw->pw_change; pwcopy.pw_expire = pw->pw_expire; @@ -18,7 +18,7 @@ pwcopy.pw_shell = xstrdup(pw->pw_shell); pw = &pwcopy; *************** -*** 3045,3054 **** +*** 3285,3294 **** struct pty_cleanup_context cleanup_context; #if defined (__FreeBSD__) && defined(HAVE_LOGIN_CAP_H) login_cap_t *lc; @@ -27,9 +27,9 @@ struct timeval tp; ! #endif /* __bsdi__ && _BSDI_VERSION >= 199510 */ - #ifdef HAVE_OSF1_C2_SECURITY - { ---- 3045,3055 ---- + /* We no longer need the child running on user's privileges. */ + userfile_uninit(); +--- 3285,3295 ---- struct pty_cleanup_context cleanup_context; #if defined (__FreeBSD__) && defined(HAVE_LOGIN_CAP_H) login_cap_t *lc; @@ -39,14 +39,14 @@ struct timeval tp; ! #endif /* __FreeBSD__ || (__bsdi__ && _BSDI_VERSION >= 199510) */ - #ifdef HAVE_OSF1_C2_SECURITY - { + /* We no longer need the child running on user's privileges. */ + userfile_uninit(); *************** -*** 3183,3188 **** ---- 3184,3197 ---- - "The Regents of the University of California. ", - "All rights reserved."); - } +*** 3446,3451 **** +--- 3447,3460 ---- + "The Regents of the University of California. ", + "All rights reserved."); + } + #ifdef HAVE_LOGIN_CAP_H + #define DEFAULT_WARN (2L * 7L * 86400L) /* Two weeks */ + @@ -59,50 +59,50 @@ /* Print /etc/motd unless a command was specified or printing it was *************** -*** 3206,3212 **** - fputs(line, stdout); - fclose(f); - } +*** 3469,3475 **** + fputs(line, stdout); + fclose(f); + } ! #if defined (__bsdi__) && _BSDI_VERSION >= 199510 - if (pw->pw_change || pw->pw_expire) - (void)gettimeofday(&tp, (struct timezone *)NULL); - if (pw->pw_change) ---- 3215,3221 ---- - fputs(line, stdout); - fclose(f); - } + if (pw->pw_change || pw->pw_expire) + (void)gettimeofday(&tp, (struct timezone *)NULL); + if (pw->pw_change) +--- 3478,3484 ---- + fputs(line, stdout); + fclose(f); + } ! #if defined(__FreeBSD__) || (defined(__bsdi__) && _BSDI_VERSION >= 199510) - if (pw->pw_change || pw->pw_expire) - (void)gettimeofday(&tp, (struct timezone *)NULL); - if (pw->pw_change) + if (pw->pw_change || pw->pw_expire) + (void)gettimeofday(&tp, (struct timezone *)NULL); + if (pw->pw_change) *************** -*** 3575,3581 **** - while (fgets(buf, sizeof(buf), f)) - fputs(buf, stderr); - fclose(f); +*** 3922,3928 **** + while (fgets(buf, sizeof(buf), f)) + fputs(buf, stderr); + fclose(f); ! #if defined (__bsdi__) && _BSDI_VERSION >= 199510 - if (pw->pw_uid != UID_ROOT && - !login_getcapbool(lc, "ignorenologin", 0)) - exit(254); ---- 3584,3590 ---- - while (fgets(buf, sizeof(buf), f)) - fputs(buf, stderr); - fclose(f); + if (pw->pw_uid != UID_ROOT && + !login_getcapbool(lc, "ignorenologin", 0)) + exit(254); +--- 3931,3937 ---- + while (fgets(buf, sizeof(buf), f)) + fputs(buf, stderr); + fclose(f); ! #if (defined(__FreeBSD__) && defined(HAVE_LOGIN_CAP_H)) || (defined (__bsdi__) && _BSDI_VERSION >= 199510) - if (pw->pw_uid != UID_ROOT && - !login_getcapbool(lc, "ignorenologin", 0)) - exit(254); + if (pw->pw_uid != UID_ROOT && + !login_getcapbool(lc, "ignorenologin", 0)) + exit(254); *************** -*** 4121,4127 **** ---- 4130,4140 ---- - struct stat mailbuf; - - if (stat(mailbox, &mailbuf) == -1 || mailbuf.st_size == 0) +*** 4525,4531 **** +--- 4534,4544 ---- + struct stat mailbuf; + + if (stat(mailbox, &mailbuf) == -1 || mailbuf.st_size == 0) + #ifdef __FreeBSD__ -+ ; ++ ; + #else - printf("No mail.\n"); + printf("No mail.\n"); + #endif - else if (mailbuf.st_atime > mailbuf.st_mtime) - printf("You have mail.\n"); - else + else if (mailbuf.st_atime > mailbuf.st_mtime) + printf("You have mail.\n"); + else |