summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-09-16 15:39:56 +1100
committerDamien Miller <djm@mindrot.org>2000-09-16 15:39:56 +1100
commit606f880e0fd1a31f5beb3b37ece0c12317a9ed61 (patch)
treeb4afe2d6f8b77d73d309b3ed6ea2b89ad768d820
parente4340be5b3ff16f4d9ba5e3ea7e449dc1b6fa7a8 (diff)
- (djm) Shadow expiry check fix from Pavel Troller <patrol@omni.sinus.cz>
- (djm) Re-enable int64_t types - we need them for sftp - (djm) Use libexecdir from configure , rather than libexecdir/ssh - (djm) Update Redhat SPEC file accordingly - (djm) Add Kevin Steves <stevesk@sweden.hp.com> HP/UX contrib files - (djm) Add Charles Levert <charles@comm.polymtl.ca> getpgrp patch - (djm) Fix password auth on HP/UX 10.20. Patch from Dirk De Wachter <Dirk.DeWachter@rug.ac.be> - (djm) Fixprogs and entropy list fixes from Larry Jones <larry.jones@sdrc.com> - (djm) Fix for SuSE spec file from Takashi YOSHIDA <tyoshida@gemini.rc.kyushu-u.ac.jp>
-rw-r--r--CREDITS3
-rw-r--r--ChangeLog12
-rw-r--r--Makefile.in9
-rw-r--r--auth-passwd.c14
-rw-r--r--auth.c4
-rw-r--r--configure.in2
-rw-r--r--contrib/hpux/README19
-rw-r--r--contrib/hpux/sshd5
-rwxr-xr-xcontrib/hpux/sshd.rc90
-rw-r--r--contrib/redhat/openssh.spec20
-rw-r--r--contrib/suse/openssh.spec21
-rw-r--r--defines.h10
-rwxr-xr-xfixprogs6
-rw-r--r--next-posix.h1
-rw-r--r--ssh_prng_cmds.in9
15 files changed, 185 insertions, 40 deletions
diff --git a/CREDITS b/CREDITS
index b2ea280dc..63dc64add 100644
--- a/CREDITS
+++ b/CREDITS
@@ -46,7 +46,9 @@ Juergen Keil <jk@tools.de> - scp bugfixing
46Kees Cook <cook@cpoint.net> - scp fixes 46Kees Cook <cook@cpoint.net> - scp fixes
47Kenji Miyake <kenji@miyake.org> - Configure fixes 47Kenji Miyake <kenji@miyake.org> - Configure fixes
48Kevin O'Connor <kevin_oconnor@standardandpoors.com> - RSAless operation 48Kevin O'Connor <kevin_oconnor@standardandpoors.com> - RSAless operation
49Kevin Steves <stevesk@sweden.hp.com> - HP support, bugfixes, improvements
49Kiyokazu SUTO <suto@ks-and-ks.ne.jp> - Bugfixes 50Kiyokazu SUTO <suto@ks-and-ks.ne.jp> - Bugfixes
51Larry Jones <larry.jones@sdrc.com> - Bugfixes
50Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> - Bugfixes 52Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> - Bugfixes
51Marc G. Fournier <marc.fournier@acadiau.ca> - Solaris patches 53Marc G. Fournier <marc.fournier@acadiau.ca> - Solaris patches
52Mark Miller <markm@swoon.net> - Bugfixes 54Mark Miller <markm@swoon.net> - Bugfixes
@@ -55,6 +57,7 @@ Michael Stone <mstone@cs.loyola.edu> - Irix enhancements
55Nalin Dahyabhai <nalin.dahyabhai@pobox.com> - PAM environment patch 57Nalin Dahyabhai <nalin.dahyabhai@pobox.com> - PAM environment patch
56Nate Itkin <nitkin@europa.com> - SunOS 4.1.x fixes 58Nate Itkin <nitkin@europa.com> - SunOS 4.1.x fixes
57Niels Kristian Bech Jensen <nkbj@image.dk> - Assorted patches 59Niels Kristian Bech Jensen <nkbj@image.dk> - Assorted patches
60Pavel Troller <patrol@omni.sinus.cz> - Bugfixes
58Peter Kocks <peter.kocks@baygate.com> - Makefile fixes 61Peter Kocks <peter.kocks@baygate.com> - Makefile fixes
59Phil Hands <phil@hands.com> - Debian scripts, assorted patches 62Phil Hands <phil@hands.com> - Debian scripts, assorted patches
60Phil Karn <karn@ka9q.ampr.org> - Autoconf fix 63Phil Karn <karn@ka9q.ampr.org> - Autoconf fix
diff --git a/ChangeLog b/ChangeLog
index 4b337ebd0..55b626235 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,16 @@
120000916 120000916
2 - (djm) Shadow expiry check fix from Pavel Troller <patrol@omni.sinus.cz>
3 - (djm) Re-enable int64_t types - we need them for sftp
4 - (djm) Use libexecdir from configure , rather than libexecdir/ssh
5 - (djm) Update Redhat SPEC file accordingly
6 - (djm) Add Kevin Steves <stevesk@sweden.hp.com> HP/UX contrib files
7 - (djm) Add Charles Levert <charles@comm.polymtl.ca> getpgrp patch
8 - (djm) Fix password auth on HP/UX 10.20. Patch from Dirk De Wachter
9 <Dirk.DeWachter@rug.ac.be>
10 - (djm) Fixprogs and entropy list fixes from Larry Jones
11 <larry.jones@sdrc.com>
12 - (djm) Fix for SuSE spec file from Takashi YOSHIDA
13 <tyoshida@gemini.rc.kyushu-u.ac.jp>
2 - (djm) Merge OpenBSD changes: 14 - (djm) Merge OpenBSD changes:
3 - markus@cvs.openbsd.org 2000/09/05 02:59:57 15 - markus@cvs.openbsd.org 2000/09/05 02:59:57
4 [session.c] 16 [session.c]
diff --git a/Makefile.in b/Makefile.in
index f8a0ee291..f3a19c0fd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,8 +15,7 @@ DESTDIR=
15VPATH=@srcdir@ 15VPATH=@srcdir@
16 16
17SSH_PROGRAM=@bindir@/ssh 17SSH_PROGRAM=@bindir@/ssh
18LIBEXEC=@libexecdir@/ssh 18ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
19ASKPASS_PROGRAM=$(LIBEXEC)/ssh-askpass
20 19
21CC=@CC@ 20CC=@CC@
22LD=@LD@ 21LD=@LD@
@@ -49,7 +48,7 @@ MANPAGES = @MANTYPE@
49 48
50CONFIGFILES=sshd_config ssh_config 49CONFIGFILES=sshd_config ssh_config
51 50
52PATHSUBS = -D/etc/ssh_config=$(sysconfdir)/ssh_config -D/etc/known_hosts=$(sysconfdir)/ssh_known_hosts -D/etc/sshd_config=$(sysconfdir)/sshd_config -D/usr/libexec=$(LIBEXEC) -D/etc/shosts.equiv=$(sysconfdir)/shosts.equiv -D/etc/ssh_host_key=$(sysconfdir)/ssh_host_key -D/var/run/sshd.pid=$(piddir)/sshd.pid 51PATHSUBS = -D/etc/ssh_config=$(sysconfdir)/ssh_config -D/etc/known_hosts=$(sysconfdir)/ssh_known_hosts -D/etc/sshd_config=$(sysconfdir)/sshd_config -D/usr/libexec=$(libexecdir) -D/etc/shosts.equiv=$(sysconfdir)/shosts.equiv -D/etc/ssh_host_key=$(sysconfdir)/ssh_host_key -D/var/run/sshd.pid=$(piddir)/sshd.pid
53 52
54FIXPATHSCMD = $(PERL) $(srcdir)/fixpaths $(PATHSUBS) 53FIXPATHSCMD = $(PERL) $(srcdir)/fixpaths $(PATHSUBS)
55 54
@@ -127,14 +126,14 @@ install-files:
127 ./mkinstalldirs $(DESTDIR)$(mandir) 126 ./mkinstalldirs $(DESTDIR)$(mandir)
128 ./mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1 127 ./mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1
129 ./mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8 128 ./mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
130 ./mkinstalldirs $(DESTDIR)$(LIBEXEC) 129 ./mkinstalldirs $(DESTDIR)$(libexecdir)
131 $(INSTALL) -m 4755 -s ssh $(DESTDIR)$(bindir)/ssh 130 $(INSTALL) -m 4755 -s ssh $(DESTDIR)$(bindir)/ssh
132 $(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp 131 $(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp
133 $(INSTALL) -m 0755 -s ssh-add $(DESTDIR)$(bindir)/ssh-add 132 $(INSTALL) -m 0755 -s ssh-add $(DESTDIR)$(bindir)/ssh-add
134 $(INSTALL) -m 0755 -s ssh-agent $(DESTDIR)$(bindir)/ssh-agent 133 $(INSTALL) -m 0755 -s ssh-agent $(DESTDIR)$(bindir)/ssh-agent
135 $(INSTALL) -m 0755 -s ssh-keygen $(DESTDIR)$(bindir)/ssh-keygen 134 $(INSTALL) -m 0755 -s ssh-keygen $(DESTDIR)$(bindir)/ssh-keygen
136 $(INSTALL) -m 0755 -s sshd $(DESTDIR)$(sbindir)/sshd 135 $(INSTALL) -m 0755 -s sshd $(DESTDIR)$(sbindir)/sshd
137 $(INSTALL) -m 0755 -s sftp-server $(DESTDIR)$(LIBEXEC)/sftp-server 136 $(INSTALL) -m 0755 -s sftp-server $(DESTDIR)$(libexecdir)/sftp-server
138 $(INSTALL) -m 644 ssh.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 137 $(INSTALL) -m 644 ssh.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
139 $(INSTALL) -m 644 scp.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 138 $(INSTALL) -m 644 scp.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
140 $(INSTALL) -m 644 ssh-add.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 139 $(INSTALL) -m 644 ssh-add.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
diff --git a/auth-passwd.c b/auth-passwd.c
index 27824165f..055a03629 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -111,6 +111,9 @@ auth_password(struct passwd * pw, const char *password)
111#ifdef HAVE_GETPWANAM 111#ifdef HAVE_GETPWANAM
112 struct passwd_adjunct *spw; 112 struct passwd_adjunct *spw;
113#endif 113#endif
114# ifdef HAVE_HPUX_TRUSTED_SYSTEM_PW
115 struct pr_passwd *prpw;
116#endif
114#ifdef WITH_AIXAUTHENTICATE 117#ifdef WITH_AIXAUTHENTICATE
115 char *authmsg; 118 char *authmsg;
116 char *loginmsg; 119 char *loginmsg;
@@ -167,12 +170,17 @@ auth_password(struct passwd * pw, const char *password)
167 } 170 }
168#endif 171#endif
169 172
173# ifdef HAVE_HPUX_TRUSTED_SYSTEM_PW
174 prpw = getprpwnam(pw->pw_name);
175 pw_password = prpw->ufld.fd_encrypt;
176#else
177 pw_password = pw->pw_passwd;
178#endif
179
170 /* Check for users with no password. */ 180 /* Check for users with no password. */
171 if (strcmp(password, "") == 0 && strcmp(pw->pw_passwd, "") == 0) 181 if (strcmp(password, "") == 0 && strcmp(pw_password, "") == 0)
172 return 1; 182 return 1;
173 183
174 pw_password = pw->pw_passwd;
175
176#if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) 184#if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW)
177 spw = getspnam(pw->pw_name); 185 spw = getspnam(pw->pw_name);
178 if (spw != NULL) 186 if (spw != NULL)
diff --git a/auth.c b/auth.c
index ccce644a7..ae8c79843 100644
--- a/auth.c
+++ b/auth.c
@@ -98,8 +98,8 @@ allowed_user(struct passwd * pw)
98 return 0; 98 return 0;
99 99
100 /* Check password expiry */ 100 /* Check password expiry */
101 if ((spw->sp_lstchg > 0) && (spw->sp_inact > 0) && 101 if ((spw->sp_lstchg > 0) && (spw->sp_max > 0) &&
102 (days > (spw->sp_lstchg + spw->sp_inact))) 102 (days > (spw->sp_lstchg + spw->sp_max)))
103 return 0; 103 return 0;
104 } 104 }
105#else 105#else
diff --git a/configure.in b/configure.in
index 9fb78f1ff..d509619ff 100644
--- a/configure.in
+++ b/configure.in
@@ -296,6 +296,8 @@ int main(void){char b[5];snprintf(b,5,"123456789");return(b[4]!='\0');}
296 ) 296 )
297fi 297fi
298 298
299AC_FUNC_GETPGRP
300
299PAM_MSG="no" 301PAM_MSG="no"
300AC_ARG_WITH(pam, 302AC_ARG_WITH(pam,
301 [ --without-pam Disable PAM support ], 303 [ --without-pam Disable PAM support ],
diff --git a/contrib/hpux/README b/contrib/hpux/README
new file mode 100644
index 000000000..edddfc018
--- /dev/null
+++ b/contrib/hpux/README
@@ -0,0 +1,19 @@
1README for OpenSSH HP-UX contrib files
2Kevin Steves <stevesk@sweden.hp.com>
3
4sshd: configuration file for sshd.rc
5sshd.rc: SSH startup script
6
7To install:
8
9o Verify paths in sshd.rc match your local installation
10 (WHAT_PATH and WHAT_PID)
11o Customize sshd if needed (SSHD_ARGS)
12o Install:
13
14 # cp sshd /etc/rc.config.d
15 # chmod 444 /etc/rc.config.d/sshd
16 # cp sshd.rc /sbin/init.d
17 # chmod 555 /sbin/init.d/sshd.rc
18 # ln -s /sbin/init.d/sshd.rc /sbin/rc1.d/K100sshd
19 # ln -s /sbin/init.d/sshd.rc /sbin/rc2.d/S900sshd
diff --git a/contrib/hpux/sshd b/contrib/hpux/sshd
new file mode 100644
index 000000000..8eb5e92a3
--- /dev/null
+++ b/contrib/hpux/sshd
@@ -0,0 +1,5 @@
1# SSHD_START: Set to 1 to start SSH daemon
2# SSHD_ARGS: Command line arguments to pass to sshd
3#
4SSHD_START=1
5SSHD_ARGS=
diff --git a/contrib/hpux/sshd.rc b/contrib/hpux/sshd.rc
new file mode 100755
index 000000000..f9a10999b
--- /dev/null
+++ b/contrib/hpux/sshd.rc
@@ -0,0 +1,90 @@
1#!/sbin/sh
2
3#
4# sshd.rc: SSH daemon start-up and shutdown script
5#
6
7# Allowed exit values:
8# 0 = success; causes "OK" to show up in checklist.
9# 1 = failure; causes "FAIL" to show up in checklist.
10# 2 = skip; causes "N/A" to show up in the checklist.
11# Use this value if execution of this script is overridden
12# by the use of a control variable, or if this script is not
13# appropriate to execute for some other reason.
14# 3 = reboot; causes the system to be rebooted after execution.
15
16# Input and output:
17# stdin is redirected from /dev/null
18#
19# stdout and stderr are redirected to the /etc/rc.log file
20# during checklist mode, or to the console in raw mode.
21
22PATH=/usr/sbin:/usr/bin:/sbin
23export PATH
24
25WHAT='OpenSSH'
26WHAT_PATH=/opt/openssh/sbin/sshd
27WHAT_PID=/var/run/sshd.pid
28WHAT_CONFIG=/etc/rc.config.d/sshd
29
30# NOTE: If your script executes in run state 0 or state 1, then /usr might
31# not be available. Do not attempt to access commands or files in
32# /usr unless your script executes in run state 2 or greater. Other
33# file systems typically not mounted until run state 2 include /var
34# and /opt.
35
36rval=0
37
38# Check the exit value of a command run by this script. If non-zero, the
39# exit code is echoed to the log file and the return value of this script
40# is set to indicate failure.
41
42set_return() {
43 x=$?
44 if [ $x -ne 0 ]; then
45 echo "EXIT CODE: $x"
46 rval=1 # script FAILed
47 fi
48}
49
50case $1 in
51'start_msg')
52 echo "Starting $WHAT"
53 ;;
54
55'stop_msg')
56 echo "Stopping $WHAT"
57 ;;
58
59'start')
60 if [ -f $WHAT_CONFIG ] ; then
61 . $WHAT_CONFIG
62 else
63 echo "ERROR: $WHAT_CONFIG defaults file MISSING"
64 fi
65
66 if [ "$SSHD_START" -eq 1 -a -x "$WHAT_PATH" ]; then
67 $WHAT_PATH $SSHD_ARGS && echo "$WHAT started"
68 set_return
69 else
70 rval=2
71 fi
72 ;;
73
74'stop')
75 if kill `cat $WHAT_PID`; then
76 echo "$WHAT stopped"
77 else
78 rval=1
79 echo "Unable to stop $WHAT"
80 fi
81 set_return
82 ;;
83
84*)
85 echo "usage: $0 {start|stop|start_msg|stop_msg}"
86 rval=1
87 ;;
88esac
89
90exit $rval
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 810af1500..37316d21e 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -167,8 +167,8 @@ This package contains the GNOME passphrase dialog.
167 167
168%build 168%build
169 169
170%configure --sysconfdir=/etc/ssh --with-tcp-wrappers \ 170%configure --sysconfdir=/etc/ssh --libexecdir=/usr/libexec/openssh \
171 --with-rsh=/usr/bin/rsh 171 --with-tcp-wrappers --with-rsh=/usr/bin/rsh
172 172
173make 173make
174 174
@@ -193,17 +193,17 @@ make install DESTDIR=$RPM_BUILD_ROOT/
193 193
194install -d $RPM_BUILD_ROOT/etc/pam.d/ 194install -d $RPM_BUILD_ROOT/etc/pam.d/
195install -d $RPM_BUILD_ROOT/etc/rc.d/init.d 195install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
196install -d $RPM_BUILD_ROOT/usr/libexec/ssh 196install -d $RPM_BUILD_ROOT/usr/libexec/openssh
197install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd 197install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd
198install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd 198install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd
199 199
200%if ! %{no_x11_askpass} 200%if ! %{no_x11_askpass}
201install -s x11-ssh-askpass-%{aversion}/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/x11-ssh-askpass 201install -s x11-ssh-askpass-%{aversion}/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/x11-ssh-askpass
202ln -s /usr/libexec/ssh/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/ssh-askpass 202ln -s /usr/libexec/openssh/x11-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/ssh-askpass
203%endif 203%endif
204 204
205%if ! %{no_gnome_askpass} 205%if ! %{no_gnome_askpass}
206install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/gnome-ssh-askpass 206install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/gnome-ssh-askpass
207%endif 207%endif
208 208
209%clean 209%clean
@@ -230,7 +230,7 @@ fi
230%attr(0644,root,root) /usr/man/man1/ssh-keygen.1* 230%attr(0644,root,root) /usr/man/man1/ssh-keygen.1*
231%attr(0644,root,root) /usr/man/man1/scp.1* 231%attr(0644,root,root) /usr/man/man1/scp.1*
232%attr(0755,root,root) %dir /etc/ssh 232%attr(0755,root,root) %dir /etc/ssh
233%attr(0755,root,root) %dir /usr/libexec/ssh 233%attr(0755,root,root) %dir /usr/libexec/openssh
234 234
235%files clients 235%files clients
236%defattr(-,root,root) 236%defattr(-,root,root)
@@ -258,12 +258,12 @@ fi
258%doc x11-ssh-askpass-%{aversion}/README 258%doc x11-ssh-askpass-%{aversion}/README
259%doc x11-ssh-askpass-%{aversion}/ChangeLog 259%doc x11-ssh-askpass-%{aversion}/ChangeLog
260%doc x11-ssh-askpass-%{aversion}/SshAskpass*.ad 260%doc x11-ssh-askpass-%{aversion}/SshAskpass*.ad
261%attr(0755,root,root) /usr/libexec/ssh/ssh-askpass 261%attr(0755,root,root) /usr/libexec/openssh/ssh-askpass
262%attr(0755,root,root) /usr/libexec/ssh/x11-ssh-askpass 262%attr(0755,root,root) /usr/libexec/openssh/x11-ssh-askpass
263%endif 263%endif
264 264
265%if ! %{no_gnome_askpass} 265%if ! %{no_gnome_askpass}
266%files askpass-gnome 266%files askpass-gnome
267%defattr(-,root,root) 267%defattr(-,root,root)
268%attr(0755,root,root) /usr/libexec/ssh/gnome-ssh-askpass 268%attr(0755,root,root) /usr/libexec/openssh/gnome-ssh-askpass
269%endif 269%endif
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 5c2e56e62..324d88aea 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -150,8 +150,9 @@ This package contains the GNOME passphrase dialog.
150 150
151%build 151%build
152CFLAGS="$RPM_OPT_FLAGS" \ 152CFLAGS="$RPM_OPT_FLAGS" \
153./configure --prefix=/usr --sysconfdir=/etc/ssh --with-gnome-askpass \ 153./configure --prefix=/usr --sysconfdir=/etc/ssh \
154 --with-tcp-wrappers --with-ipv4-default 154 --libexecdir=/usr/libexec/ssh --with-gnome-askpass \
155 --with-tcp-wrappers --with-ipv4-default
155make 156make
156 157
157cd contrib 158cd contrib
@@ -167,12 +168,12 @@ install -d $RPM_BUILD_ROOT/etc/ssh/
167install -d $RPM_BUILD_ROOT/etc/pam.d/ 168install -d $RPM_BUILD_ROOT/etc/pam.d/
168install -d $RPM_BUILD_ROOT/sbin/init.d/ 169install -d $RPM_BUILD_ROOT/sbin/init.d/
169install -d $RPM_BUILD_ROOT/var/adm/fillup-templates 170install -d $RPM_BUILD_ROOT/var/adm/fillup-templates
170install -d $RPM_BUILD_ROOT/usr/libexec/ssh 171install -d $RPM_BUILD_ROOT/usr/libexec/openssh
171install -m644 sshd.pam.generic $RPM_BUILD_ROOT/etc/pam.d/sshd 172install -m644 contrib/sshd.pam.generic $RPM_BUILD_ROOT/etc/pam.d/sshd
172install -m744 contrib/suse/rc.sshd $RPM_BUILD_ROOT/sbin/init.d/sshd 173install -m744 contrib/suse/rc.sshd $RPM_BUILD_ROOT/sbin/init.d/sshd
173ln -s ../../sbin/init.d/sshd $RPM_BUILD_ROOT/usr/sbin/rcsshd 174ln -s ../../sbin/init.d/sshd $RPM_BUILD_ROOT/usr/sbin/rcsshd
174install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/gnome-ssh-askpass 175install -s contrib/gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/gnome-ssh-askpass
175ln -s gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/ssh/ssh-askpass 176ln -s gnome-ssh-askpass $RPM_BUILD_ROOT/usr/libexec/openssh/ssh-askpass
176install -m744 contrib/suse/rc.config.sshd \ 177install -m744 contrib/suse/rc.config.sshd \
177 $RPM_BUILD_ROOT/var/adm/fillup-templates 178 $RPM_BUILD_ROOT/var/adm/fillup-templates
178 179
@@ -230,7 +231,7 @@ fi
230%attr(0644,root,root) %doc /usr/man/man1/ssh-keygen.1* 231%attr(0644,root,root) %doc /usr/man/man1/ssh-keygen.1*
231%attr(0644,root,root) %doc /usr/man/man1/scp.1* 232%attr(0644,root,root) %doc /usr/man/man1/scp.1*
232%attr(0755,root,root) %dir /etc/ssh 233%attr(0755,root,root) %dir /etc/ssh
233%attr(0755,root,root) %dir /usr/libexec/ssh 234%attr(0755,root,root) %dir /usr/libexec/openssh
234 235
235%files clients 236%files clients
236%defattr(-,root,root) 237%defattr(-,root,root)
@@ -247,7 +248,7 @@ fi
247%files server 248%files server
248%defattr(-,root,root) 249%defattr(-,root,root)
249%attr(0755,root,root) /usr/sbin/sshd 250%attr(0755,root,root) /usr/sbin/sshd
250%attr(0755,root,root) /usr/libexec/ssh/sftp-server 251%attr(0755,root,root) /usr/libexec/openssh/sftp-server
251%attr(0644,root,root) %doc /usr/man/man8/sshd.8* 252%attr(0644,root,root) %doc /usr/man/man8/sshd.8*
252%attr(0644,root,root) %doc /usr/man/man8/sftp-server.8* 253%attr(0644,root,root) %doc /usr/man/man8/sftp-server.8*
253%attr(0600,root,root) %config /etc/ssh/sshd_config 254%attr(0600,root,root) %config /etc/ssh/sshd_config
@@ -258,6 +259,6 @@ fi
258 259
259%files askpass 260%files askpass
260%defattr(-,root,root) 261%defattr(-,root,root)
261%attr(0755,root,root) /usr/libexec/ssh/ssh-askpass 262%attr(0755,root,root) /usr/libexec/openssh/ssh-askpass
262%attr(0755,root,root) /usr/libexec/ssh/gnome-ssh-askpass 263%attr(0755,root,root) /usr/libexec/openssh/gnome-ssh-askpass
263 264
diff --git a/defines.h b/defines.h
index 69b8baf27..0ac3e96b2 100644
--- a/defines.h
+++ b/defines.h
@@ -123,7 +123,6 @@ typedef int int32_t;
123# else 123# else
124# error "32 bit int type not found." 124# error "32 bit int type not found."
125# endif 125# endif
126/*
127# if (SIZEOF_LONG_INT == 8) 126# if (SIZEOF_LONG_INT == 8)
128typedef long int int64_t; 127typedef long int int64_t;
129# else 128# else
@@ -134,7 +133,6 @@ typedef long long int int64_t;
134# error "64 bit int type not found." 133# error "64 bit int type not found."
135# endif 134# endif
136# endif 135# endif
137*/
138#endif 136#endif
139 137
140/* If sys/types.h does not supply u_intXX_t, supply them ourselves */ 138/* If sys/types.h does not supply u_intXX_t, supply them ourselves */
@@ -143,9 +141,7 @@ typedef long long int int64_t;
143typedef uint8_t u_int8_t; 141typedef uint8_t u_int8_t;
144typedef uint16_t u_int16_t; 142typedef uint16_t u_int16_t;
145typedef uint32_t u_int32_t; 143typedef uint32_t u_int32_t;
146/*
147typedef uint64_t u_int64_t; 144typedef uint64_t u_int64_t;
148*/
149# define HAVE_U_INTXX_T 1 145# define HAVE_U_INTXX_T 1
150# else 146# else
151# if (SIZEOF_CHAR == 1) 147# if (SIZEOF_CHAR == 1)
@@ -163,7 +159,6 @@ typedef unsigned int u_int32_t;
163# else 159# else
164# error "32 bit int type not found." 160# error "32 bit int type not found."
165# endif 161# endif
166/*
167# if (SIZEOF_LONG_INT == 8) 162# if (SIZEOF_LONG_INT == 8)
168typedef unsigned long int u_int64_t; 163typedef unsigned long int u_int64_t;
169# else 164# else
@@ -174,7 +169,6 @@ typedef unsigned long long int u_int64_t;
174# error "64 bit int type not found." 169# error "64 bit int type not found."
175# endif 170# endif
176# endif 171# endif
177*/
178# endif 172# endif
179#endif 173#endif
180 174
@@ -326,6 +320,10 @@ typedef int mode_t;
326# define USE_VHANGUP 320# define USE_VHANGUP
327#endif /* defined(HAVE_VHANGUP) && !defined(BROKEN_VHANGUP) */ 321#endif /* defined(HAVE_VHANGUP) && !defined(BROKEN_VHANGUP) */
328 322
323#ifndef GETPGRP_VOID
324# define getpgrp() getpgrp(0)
325#endif
326
329/** 327/**
330 ** login recorder definitions 328 ** login recorder definitions
331 **/ 329 **/
diff --git a/fixprogs b/fixprogs
index 4a70d2f9f..f781fec08 100755
--- a/fixprogs
+++ b/fixprogs
@@ -44,9 +44,9 @@ foreach (@infile) {
44 if (! ($pid = fork())) { 44 if (! ($pid = fork())) {
45 # child 45 # child
46 close STDIN; close STDOUT; close STDERR; 46 close STDIN; close STDOUT; close STDERR;
47 open STDIN, "</dev/null"; 47 open (STDIN, "</dev/null");
48 open STDOUT, ">/dev/null"; 48 open (STDOUT, ">/tmp/foo");
49 open STDERR, ">/dev/null"; 49 open (STDERR, ">/dev/null");
50 exec $path @args; 50 exec $path @args;
51 exit 1; # shouldn't be here 51 exit 1; # shouldn't be here
52 } 52 }
diff --git a/next-posix.h b/next-posix.h
index 13aaaa2cb..06149d5b5 100644
--- a/next-posix.h
+++ b/next-posix.h
@@ -44,7 +44,6 @@ pid_t posix_wait(int *status); /* new wait() */
44 44
45/* MISC functions */ 45/* MISC functions */
46int waitpid(int pid,int *stat_loc,int options); 46int waitpid(int pid,int *stat_loc,int options);
47#define getpgrp() getpgrp(0)
48pid_t setsid(void); 47pid_t setsid(void);
49 48
50/* TC */ 49/* TC */
diff --git a/ssh_prng_cmds.in b/ssh_prng_cmds.in
index 355c1b90a..0f86c7627 100644
--- a/ssh_prng_cmds.in
+++ b/ssh_prng_cmds.in
@@ -14,6 +14,15 @@
14"ls -alni /tmp" @PROG_LS@ 0.02 14"ls -alni /tmp" @PROG_LS@ 0.02
15"ls -alni /var/tmp" @PROG_LS@ 0.02 15"ls -alni /var/tmp" @PROG_LS@ 0.02
16"ls -alni /usr/tmp" @PROG_LS@ 0.02 16"ls -alni /usr/tmp" @PROG_LS@ 0.02
17"ls -alTi /var/log" @PROG_LS@ 0.02
18"ls -alTi /var/adm" @PROG_LS@ 0.02
19"ls -alTi /var/mail" @PROG_LS@ 0.02
20"ls -alTi /var/adm/syslog" @PROG_LS@ 0.02
21"ls -alTi /var/spool/mail" @PROG_LS@ 0.02
22"ls -alTi /proc" @PROG_LS@ 0.02
23"ls -alTi /tmp" @PROG_LS@ 0.02
24"ls -alTi /var/tmp" @PROG_LS@ 0.02
25"ls -alTi /usr/tmp" @PROG_LS@ 0.02
17 26
18"netstat -an" @PROG_NETSTAT@ 0.05 27"netstat -an" @PROG_NETSTAT@ 0.05
19"netstat -in" @PROG_NETSTAT@ 0.05 28"netstat -in" @PROG_NETSTAT@ 0.05