diff options
author | Dirk Meyer <dinoex@FreeBSD.org> | 2002-10-17 04:15:13 +0000 |
---|---|---|
committer | Dirk Meyer <dinoex@FreeBSD.org> | 2002-10-17 04:15:13 +0000 |
commit | 9ccfb67c610e68c20f669b67584d9bdb10e7191a (patch) | |
tree | 547456c65a74e28ac5d0086f61f93f7630a4cfa0 /security/openssh | |
parent | b1775dfaf3c286d185da8dc4387badc43443d857 (diff) | |
download | ports-9ccfb67c610e68c20f669b67584d9bdb10e7191a.tar.gz ports-9ccfb67c610e68c20f669b67584d9bdb10e7191a.zip |
Notes
Diffstat (limited to 'security/openssh')
-rw-r--r-- | security/openssh/Makefile | 3 | ||||
-rw-r--r-- | security/openssh/distinfo | 4 | ||||
-rw-r--r-- | security/openssh/files/patch-session.c | 104 | ||||
-rw-r--r-- | security/openssh/files/patch-ssh-keysign-Makefile | 11 | ||||
-rw-r--r-- | security/openssh/files/patch-sshd_config | 14 |
5 files changed, 47 insertions, 89 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 2969a1c8d7e0..bef768a28782 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -6,8 +6,7 @@ # PORTNAME= openssh -PORTVERSION= 3.4 -PORTREVISION= 4 +PORTVERSION= 3.5 CATEGORIES= security MASTER_SITES= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/ \ ftp://ftp.usa.openbsd.org/pub/OpenBSD/OpenSSH/ \ diff --git a/security/openssh/distinfo b/security/openssh/distinfo index 73b6801ed2f7..0b7ec7e4bcfe 100644 --- a/security/openssh/distinfo +++ b/security/openssh/distinfo @@ -1,2 +1,2 @@ -MD5 (openssh-3.4.tgz) = 39659226ff5b0d16d0290b21f67c46f2 -MD5 (openbsd28_3.4.patch) = 46cfc2332b357e338e421dd456435a65 +MD5 (openssh-3.5.tgz) = 79fc225dbe0fe71ebb6910f449101d23 +MD5 (openbsd28_3.5.patch) = 0447cd23214b7ef54aa957da790bddb7 diff --git a/security/openssh/files/patch-session.c b/security/openssh/files/patch-session.c index 7a36132b613f..5716ed69ffc1 100644 --- a/security/openssh/files/patch-session.c +++ b/security/openssh/files/patch-session.c @@ -1,5 +1,5 @@ ---- session.c.orig Sun Jun 30 21:25:39 2002 -+++ session.c Mon Jul 1 06:45:09 2002 +--- session.c.orig Thu Oct 17 05:36:12 2002 ++++ session.c Thu Oct 17 05:46:14 2002 @@ -58,6 +58,13 @@ #include "session.h" #include "monitor_wrap.h" @@ -14,43 +14,19 @@ /* func */ Session *session_new(void); -@@ -437,6 +444,10 @@ - if (s == NULL) - fatal("do_exec_no_pty: no session"); - -+#ifdef USE_PAM -+ do_pam_setcred(); -+#endif /* USE_PAM */ -+ - session_proctitle(s); - - /* Fork the child. */ -@@ -445,6 +456,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. - */ -@@ -539,17 +557,42 @@ +@@ -419,6 +426,9 @@ + do_exec_no_pty(Session *s, const char *command) { - int fdout, ptyfd, ttyfd, ptymaster; pid_t pid; +#ifdef USE_PAM + const char *shorttty; +#endif /* USE_PAM */ + #ifdef USE_PIPES + int pin[2], pout[2], perr[2]; +@@ -437,6 +447,20 @@ if (s == NULL) - fatal("do_exec_pty: no session"); - ptyfd = s->ptyfd; - ttyfd = s->ttyfd; + fatal("do_exec_no_pty: no session"); +#ifdef USE_PAM + /* check if we have a pathname in the ttyname */ @@ -66,23 +42,24 @@ + do_pam_setcred(); +#endif /* USE_PAM */ + - /* Fork the child. */ - if ((pid = fork()) == 0) { + session_proctitle(s); - /* Child. Reinitialize the log because the pid has changed. */ + /* Fork the child. */ +@@ -447,6 +471,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; + - /* Close the master side of the pseudo tty. */ - close(ptyfd); - -@@ -638,6 +681,18 @@ ++ /* + * Create a new session and process group since the 4.4BSD + * setlogin() affects the entire process group. + */ +@@ -641,6 +672,18 @@ struct sockaddr_storage from; struct passwd * pw = s->pw; pid_t pid = getpid(); @@ -101,9 +78,9 @@ /* * Get IP address of client. If the connection is not a socket, let -@@ -660,10 +715,97 @@ +@@ -663,10 +706,97 @@ options.verify_reverse_mapping), - (struct sockaddr *)&from); + (struct sockaddr *)&from, fromlen); +#ifdef USE_PAM + /* @@ -200,7 +177,7 @@ time_string = ctime(&s->last_login_time); if (strchr(time_string, '\n')) *strchr(time_string, '\n') = 0; -@@ -674,7 +816,30 @@ +@@ -677,7 +807,30 @@ s->hostname); } @@ -232,7 +209,7 @@ } /* -@@ -690,9 +855,9 @@ +@@ -693,9 +846,9 @@ #ifdef HAVE_LOGIN_CAP f = fopen(login_getcapstr(lc, "welcome", "/etc/motd", "/etc/motd"), "r"); @@ -244,7 +221,7 @@ if (f) { while (fgets(buf, sizeof(buf), f)) fputs(buf, stdout); -@@ -719,10 +884,10 @@ +@@ -722,10 +875,10 @@ #ifdef HAVE_LOGIN_CAP if (login_getcapbool(lc, "hushlogin", 0) || stat(buf, &st) >= 0) return 1; @@ -257,7 +234,7 @@ return 0; } -@@ -813,12 +978,39 @@ +@@ -816,12 +969,39 @@ fclose(f); } @@ -297,28 +274,19 @@ struct passwd *pw = s->pw; /* Initialize the environment. */ -@@ -826,17 +1018,15 @@ +@@ -829,6 +1009,11 @@ env = xmalloc(envsize * sizeof(char *)); env[0] = NULL; -+ if (getenv("TZ")) -+ child_set_env(&env, &envsize, "TZ", getenv("TZ")); - if (!options.use_login) { ++#ifdef __FreeBSD__ ++ if (getenv("TZ")) ++ child_set_env(&env, &envsize, "TZ", getenv("TZ")); ++#endif /* __FreeBSD__ */ + + if (!options.use_login) { /* Set basic environment. */ child_set_env(&env, &envsize, "USER", pw->pw_name); - child_set_env(&env, &envsize, "LOGNAME", pw->pw_name); - child_set_env(&env, &envsize, "HOME", pw->pw_dir); --#ifdef HAVE_LOGIN_CAP -- (void) setusercontext(lc, pw, pw->pw_uid, LOGIN_SETPATH); -- child_set_env(&env, &envsize, "PATH", getenv("PATH")); --#else - child_set_env(&env, &envsize, "PATH", _PATH_STDPATH); --#endif - - snprintf(buf, sizeof buf, "%.200s/%.50s", - _PATH_MAILDIR, pw->pw_name); -@@ -844,9 +1034,21 @@ +@@ -849,9 +1034,21 @@ /* Normal systems set SHELL by default. */ child_set_env(&env, &envsize, "SHELL", shell); @@ -342,7 +310,7 @@ /* Set custom environment options from RSA authentication. */ if (!options.use_login) { -@@ -889,6 +1091,10 @@ +@@ -900,6 +1097,10 @@ child_set_env(&env, &envsize, "KRB5CCNAME", s->authctxt->krb5_ticket_file); #endif @@ -353,7 +321,7 @@ if (auth_sock_name != NULL) child_set_env(&env, &envsize, SSH_AUTHSOCKET_ENV_NAME, auth_sock_name); -@@ -1005,7 +1211,7 @@ +@@ -1018,7 +1219,7 @@ if (getuid() == 0 || geteuid() == 0) { #ifdef HAVE_LOGIN_CAP if (setusercontext(lc, pw, pw->pw_uid, @@ -362,7 +330,7 @@ perror("unable to set user context"); exit(1); } -@@ -1045,6 +1251,36 @@ +@@ -1058,6 +1259,36 @@ exit(1); } @@ -399,7 +367,7 @@ /* * Performs common processing for the child, such as setting up the * environment, closing extra file descriptors, setting the user and group -@@ -1123,7 +1359,7 @@ +@@ -1136,7 +1367,7 @@ * initgroups, because at least on Solaris 2.3 it leaves file * descriptors open. */ @@ -408,7 +376,7 @@ close(i); /* -@@ -1153,6 +1389,31 @@ +@@ -1166,6 +1397,31 @@ exit(1); #endif } diff --git a/security/openssh/files/patch-ssh-keysign-Makefile b/security/openssh/files/patch-ssh-keysign-Makefile index 0ac135575072..ba566dc100a6 100644 --- a/security/openssh/files/patch-ssh-keysign-Makefile +++ b/security/openssh/files/patch-ssh-keysign-Makefile @@ -1,5 +1,5 @@ ---- ssh-keysign/Makefile.orig Fri May 31 12:30:33 2002 -+++ ssh-keysign/Makefile Sat Jun 22 12:38:35 2002 +--- ssh-keysign/Makefile.orig Wed Jul 3 16:21:05 2002 ++++ ssh-keysign/Makefile Thu Oct 17 06:01:24 2002 @@ -7,12 +7,12 @@ BINMODE?=4555 @@ -9,11 +9,10 @@ +BINDIR= /libexec +MAN8= ssh-keysign.8 - SRCS= ssh-keysign.c + SRCS= ssh-keysign.c readconf.c .include <bsd.prog.mk> -LDADD+= -lcrypto -lz --DPADD+= ${LIBCRYPTO} ${LIBZ} -+LDADD+= ${CRYPTOLIBS} -lcrypt -lz -+DPADD+= ${LIBCRYPTO} ${LIBZ} ++LDADD+= ${CRYPTOLIBS} -lcrypt -lz + DPADD+= ${LIBCRYPTO} ${LIBZ} diff --git a/security/openssh/files/patch-sshd_config b/security/openssh/files/patch-sshd_config index 6ed602861a63..c8758f3fa78e 100644 --- a/security/openssh/files/patch-sshd_config +++ b/security/openssh/files/patch-sshd_config @@ -1,8 +1,8 @@ ---- sshd_config.orig Sun Jun 30 21:25:40 2002 -+++ sshd_config Wed Jul 3 06:22:22 2002 +--- sshd_config.orig Thu Oct 17 06:02:17 2002 ++++ sshd_config Thu Oct 17 06:02:17 2002 @@ -32,6 +32,7 @@ - #LoginGraceTime 600 + #LoginGraceTime 120 #PermitRootLogin yes +PermitRootLogin no #StrictModes yes @@ -16,11 +16,3 @@ # Kerberos options #KerberosAuthentication no -@@ -75,6 +77,7 @@ - #KeepAlive yes - #UseLogin no - #UsePrivilegeSeparation yes -+UsePrivilegeSeparation yes - #Compression yes - - #MaxStartups 10 |