tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) Sync with V_3_7 branch

This commit is contained in:
Damien Miller 2003-09-17 07:24:25 +10:00
parent e121048392
commit f2728099ba
6 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,6 @@
20030917
- (djm) Sync with V_3_7 branch
20030916 20030916
- (dtucker) [acconfig.h configure.ac defines.h session.c] Bug #252: Retrieve - (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 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. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au 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 $

18
auth-pam.c
View File

@ -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 $ */ /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
#include "includes.h" #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 #ifdef USE_PAM
#include <security/pam_appl.h> #include <security/pam_appl.h>
@ -672,17 +672,19 @@ do_pam_chauthtok(void)
int int
do_pam_putenv(char *name, char *value) do_pam_putenv(char *name, char *value)
{ {
char *compound;
int ret = 1; int ret = 1;
#ifdef HAVE_PAM_PUTENV #ifdef HAVE_PAM_PUTENV
compound = xmalloc(strlen(name)+strlen(value)+2); char *compound;
if (compound) { size_t len;
sprintf(compound,"%s=%s",name,value);
ret = pam_putenv(sshpam_handle,compound); len = strlen(name) + strlen(value) + 2;
compound = xmalloc(len);
snprintf(compound, len, "%s=%s", name, value);
ret = pam_putenv(sshpam_handle, compound);
xfree(compound); xfree(compound);
}
#endif #endif
return (ret); return (ret);
} }

6
contrib/caldera/openssh.spec
View File

@ -17,9 +17,9 @@
#old cvs stuff. please update before use. may be deprecated. #old cvs stuff. please update before use. may be deprecated.
%define use_stable 1 %define use_stable 1
%if %{use_stable} %if %{use_stable}
%define version 3.6.1p2 %define version 3.7p1
%define cvs %{nil} %define cvs %{nil}
%define release 2 %define release 1
%else %else
%define version 2.9.9p2 %define version 2.9.9p2
%define cvs cvs20011009 %define cvs cvs20011009
@ -364,4 +364,4 @@ fi
* Mon Jan 01 1998 ... * Mon Jan 01 1998 ...
Template Version: 1.31 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 $

6
contrib/redhat/openssh.spec
View File

@ -1,5 +1,5 @@
%define ver 3.6.1p2 %define ver 3.7p1
%define rel 3 %define rel 1
# OpenSSH privilege separation requires a user & group ID # OpenSSH privilege separation requires a user & group ID
%define sshd_uid 74 %define sshd_uid 74
@ -84,7 +84,7 @@ BuildPreReq: /bin/login
%if ! %{build6x} %if ! %{build6x}
BuildPreReq: glibc-devel, pam BuildPreReq: glibc-devel, pam
%else %else
BuildPreReq: db1-devel, /usr/include/security/pam_appl.h BuildPreReq: /usr/include/security/pam_appl.h
%endif %endif
%if ! %{no_x11_askpass} %if ! %{no_x11_askpass}
BuildPreReq: XFree86-devel BuildPreReq: XFree86-devel

2
contrib/suse/openssh.spec
View File

@ -1,6 +1,6 @@
Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation
Name: openssh Name: openssh
Version: 3.6.1p2 Version: 3.7p1
URL: http://www.openssh.com/ URL: http://www.openssh.com/
Release: 1 Release: 1
Source0: openssh-%{version}.tar.gz Source0: openssh-%{version}.tar.gz

1
openbsd-compat/inet_ntoa.c
View File

@ -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 <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <stdio.h> #include <stdio.h>
#include "inet_ntoa.h"
char *inet_ntoa(struct in_addr in) char *inet_ntoa(struct in_addr in)
{ {