diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | auth-pam.c | 20 | ||||
| -rw-r--r-- | contrib/caldera/openssh.spec | 6 | ||||
| -rw-r--r-- | contrib/redhat/openssh.spec | 6 | ||||
| -rw-r--r-- | contrib/suse/openssh.spec | 2 | ||||
| -rw-r--r-- | openbsd-compat/inet_ntoa.c | 1 |
6 files changed, 23 insertions, 17 deletions
@@ -1,3 +1,6 @@ +20030917 + - (djm) Sync with V_3_7 branch + 20030916 - (dtucker) [acconfig.h configure.ac defines.h session.c] Bug #252: Retrieve PATH (or SUPATH) and UMASK from /etc/default/login on platforms that have it @@ -1105,4 +1108,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.2996 2003/09/16 17:23:29 mouring Exp $ +$Id: ChangeLog,v 1.2997 2003/09/16 21:24:25 djm Exp $ @@ -31,7 +31,7 @@ /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ #include "includes.h" -RCSID("$Id: auth-pam.c,v 1.72 2003/09/13 12:12:11 dtucker Exp $"); +RCSID("$Id: auth-pam.c,v 1.73 2003/09/16 21:24:25 djm Exp $"); #ifdef USE_PAM #include <security/pam_appl.h> @@ -672,17 +672,19 @@ do_pam_chauthtok(void) int do_pam_putenv(char *name, char *value) { - char *compound; int ret = 1; - #ifdef HAVE_PAM_PUTENV - compound = xmalloc(strlen(name)+strlen(value)+2); - if (compound) { - sprintf(compound,"%s=%s",name,value); - ret = pam_putenv(sshpam_handle,compound); - xfree(compound); - } + char *compound; + size_t len; + + len = strlen(name) + strlen(value) + 2; + compound = xmalloc(len); + + snprintf(compound, len, "%s=%s", name, value); + ret = pam_putenv(sshpam_handle, compound); + xfree(compound); #endif + return (ret); } diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 8e97c381..8e8ac44d 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec @@ -17,9 +17,9 @@ #old cvs stuff. please update before use. may be deprecated. %define use_stable 1 %if %{use_stable} - %define version 3.6.1p2 + %define version 3.7p1 %define cvs %{nil} - %define release 2 + %define release 1 %else %define version 2.9.9p2 %define cvs cvs20011009 @@ -364,4 +364,4 @@ fi * Mon Jan 01 1998 ... Template Version: 1.31 -$Id: openssh.spec,v 1.43 2003/04/29 13:22:40 djm Exp $ +$Id: openssh.spec,v 1.44 2003/09/16 21:24:25 djm Exp $ diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 656e692e..ce7c564c 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -1,5 +1,5 @@ -%define ver 3.6.1p2 -%define rel 3 +%define ver 3.7p1 +%define rel 1 # OpenSSH privilege separation requires a user & group ID %define sshd_uid 74 @@ -84,7 +84,7 @@ BuildPreReq: /bin/login %if ! %{build6x} BuildPreReq: glibc-devel, pam %else -BuildPreReq: db1-devel, /usr/include/security/pam_appl.h +BuildPreReq: /usr/include/security/pam_appl.h %endif %if ! %{no_x11_askpass} BuildPreReq: XFree86-devel diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index 707c3a22..ca7437bd 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec @@ -1,6 +1,6 @@ Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation Name: openssh -Version: 3.6.1p2 +Version: 3.7p1 URL: http://www.openssh.com/ Release: 1 Source0: openssh-%{version}.tar.gz diff --git a/openbsd-compat/inet_ntoa.c b/openbsd-compat/inet_ntoa.c index f9fdc9ee..e0384491 100644 --- a/openbsd-compat/inet_ntoa.c +++ b/openbsd-compat/inet_ntoa.c @@ -43,6 +43,7 @@ static char rcsid[] = "$OpenBSD: inet_ntoa.c,v 1.4 2003/06/02 20:18:35 millert E #include <netinet/in.h> #include <arpa/inet.h> #include <stdio.h> +#include "inet_ntoa.h" char *inet_ntoa(struct in_addr in) { |