- (djm) Sync with V_3_7 branch

diff --git a/ChangeLog b/ChangeLog
index 39e3a287cc17f9b82673944aa12ccf85c022734e..779c2e8ab71c026d4028e8eb3fb70a263d98a3df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/auth-pam.c b/auth-pam.c
index 0f337de23ce133e47b9ba5d5df08205652f37ec4..bc1af4663a007ec84ca2deedbcd2998ea962dbdf 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -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 68e59c76b890a890c4a1d8a7b096dcb04fb5e27c..3465875dbe267c42e19ce0a7452e9eed1efdeb2d 100644 (file)
--- 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

diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 656e692e8a0bc0b6190218723a4e871d8790e37c..ce7c564c3109a46a2d36ae26116e6fcf3ce1945a 100644 (file)
--- 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 707c3a221d8bbe3d674dc1ec4c0dc4a628c5d11f..ca7437bd6c7cfe1c25290b17c5240ec19e928c7c 100644 (file)
--- 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 f9fdc9ee57dc20c8c087ec6964e6f99e93bee1f0..e0384491d224c28da3be7483a06b213cf6cc426e 100644 (file)
--- 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)
 {