10 files changed, 131 insertions, 45 deletions

diff --git a/contrib/aix/README b/contrib/aix/README
index 033fd0a5d..82fd8be1b 100644
--- a/contrib/aix/README
+++ b/contrib/aix/README
@@ -6,9 +6,15 @@ installable) openssh package.
 
 Directions:
 
+(optional) create config.local in your build dir
 ./configure [options]
-cd contrib/aix; ./buildbff.sh
+contrib/aix/buildbff.sh
 
+The file config.local or the environment is read to set the following options
+(default first):
+PERMIT_ROOT_LOGIN=[no|yes]
+X11_FORWARDING=[no|yes]
+AIX_SRC=[no|yes]
 
 Acknowledgements:
 
@@ -19,6 +25,8 @@ Jim Abbey's (GPL'ed) lppbuild-2.1 was used to learn how to build .bff's
 and for comparison with the output from this script, however no code
 from lppbuild is included and it is not required for operation.
 
+SRC support based on examples provided by Sandor Sklar and Maarten Kreuger.
+
 
 Other notes:
 
@@ -26,8 +34,7 @@ The script treats all packages as USR packages (not ROOT+USR when
 appropriate).  It seems to work, though......
 
 If there are any patches to this that have not yet been integrated they
-may be found at http://www.zip.com.au/~dtucker/openssh/ or
-http://home.usf.advantra.com.au/~dtucker/openssh/.
+may be found at http://www.zip.com.au/~dtucker/openssh/.
 
 
 Disclaimer:
diff --git a/contrib/aix/buildbff.sh b/contrib/aix/buildbff.sh
index 5c09c6b75..3b3699660 100755
--- a/contrib/aix/buildbff.sh
+++ b/contrib/aix/buildbff.sh
@@ -11,10 +11,12 @@
 
 #
 # Tunable configuration settings
-#       create a "config.local" in your build directory to override these.
+#       create a "config.local" in your build directory or set
+#       environment variables to override these.
 #
-PERMIT_ROOT_LOGIN=no
-X11_FORWARDING=no
+[ -z "$PERMIT_ROOT_LOGIN" ] || PERMIT_ROOT_LOGIN=no
+[ -z "$X11_FORWARDING" ] || X11_FORWARDING=no
+[ -z "$AIX_SRC" ] || AIX_SRC=no
 
 umask 022
 
@@ -167,6 +169,18 @@ For the full text of the license, see /usr/lpp/openssh/LICENCE
 EOD
 
 #
+# openssh.size file allows filesystem expansion as required
+# generate list of directories containing files
+# then calculate disk usage for each directory and store in openssh.size
+#
+files=`find . -type f -print`
+dirs=`for file in $files; do dirname $file; done | sort -u`
+for dir in $dirs
+do
+        du $dir
+done > ../openssh.size
+
+#
 # Create postinstall script
 #
 cat <<EOF >>../openssh.post_i
@@ -245,14 +259,42 @@ else
 fi
 echo
 
-# Add to system startup if required
-if grep $sbindir/sshd /etc/rc.tcpip >/dev/null
+# Set startup command depending on SRC support
+if [ "$AIX_SRC" = "yes" ]
+then
+        echo Creating SRC sshd subsystem.
+        rmssys -s sshd 2>&1 >/dev/null
+        mkssys -s sshd -p "$sbindir/sshd" -a '-D' -u 0 -S -n 15 -f 9 -R -G tcpip
+        startupcmd="start $sbindir/sshd \\\"\\\$src_running\\\""
+        oldstartcmd="$sbindir/sshd"
+else
+        startupcmd="$sbindir/sshd"
+        oldstartcmd="start $sbindir/sshd \\\"$src_running\\\""
+fi
+
+# If migrating to or from SRC, change previous startup command
+# otherwise add to rc.tcpip
+if egrep "^\$oldstartcmd" /etc/rc.tcpip >/dev/null
 then
-        echo "sshd found in rc.tcpip, not adding."
+        if sed "s|^\$oldstartcmd|\$startupcmd|g" /etc/rc.tcpip >/etc/rc.tcpip.new
+        then
+                chmod 0755 /etc/rc.tcpip.new
+                mv /etc/rc.tcpip /etc/rc.tcpip.old && \
+                mv /etc/rc.tcpip.new /etc/rc.tcpip
+        else
+                echo "Updating /etc/rc.tcpip failed, please check."
+        fi
 else
-        echo >>/etc/rc.tcpip
-        echo "echo Starting sshd" >>/etc/rc.tcpip
-        echo "$sbindir/sshd" >>/etc/rc.tcpip
+        # Add to system startup if required
+        if grep "^\$startupcmd" /etc/rc.tcpip >/dev/null
+        then
+                echo "sshd found in rc.tcpip, not adding."
+        else
+                echo "Adding sshd to rc.tcpip"
+                echo >>/etc/rc.tcpip
+                echo "# Start sshd" >>/etc/rc.tcpip
+                echo "\$startupcmd" >>/etc/rc.tcpip
+        fi
 fi
 EOF
 
@@ -262,7 +304,7 @@ EOF
 echo Creating liblpp.a
 (
         cd ..
-        for i in openssh.al openssh.copyright openssh.inventory openssh.post_i LICENCE README*
+        for i in openssh.al openssh.copyright openssh.inventory openssh.post_i openssh.size LICENCE README*
         do
                 ar -r liblpp.a $i
                 rm $i
diff --git a/contrib/aix/inventory.sh b/contrib/aix/inventory.sh
index 78df0d16e..619493ae2 100755
--- a/contrib/aix/inventory.sh
+++ b/contrib/aix/inventory.sh
@@ -2,9 +2,9 @@
 #
 # inventory.sh
 #
-# Originall written by Ben Lindstrom, modified by Darren Tucker to use perl
+# Originally written by Ben Lindstrom, modified by Darren Tucker to use perl
 #
-# This will produced and AIX package inventory file, which looks like:
+# This will produce an AIX package inventory file, which looks like:
 #
 # /usr/local/bin:
 #          class=apply,inventory,openssh
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index b7de22e8b..e70ac8f37 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -17,7 +17,7 @@
 #old cvs stuff.  please update before use.  may be deprecated.
 %define use_stable      1
 %if %{use_stable}
-  %define version       3.5p1
+  %define version       3.6p1
   %define cvs           %{nil}
   %define release       2
 %else
@@ -198,7 +198,7 @@ xmkmf
 %Install
 [ %{buildroot} != "/" ] && rm -rf %{buildroot}
 
-%makeinstall
+make install DESTDIR=%{buildroot}
 %makeinstall -C %{askpass} \
     BINDIR=%{_libexecdir} \
     MANPATH=%{_mandir} \
@@ -316,8 +316,16 @@ fi
 %defattr(-,root,root)
 %dir %{_sysconfdir}
 %config %{_sysconfdir}/ssh_config
-%{_bindir}/*
+%{_bindir}/scp
+%{_bindir}/sftp
+%{_bindir}/ssh
+%{_bindir}/slogin
+%{_bindir}/ssh-add
+%attr(2755,root,nobody) %{_bindir}/ssh-agent
+%{_bindir}/ssh-keygen
+%{_bindir}/ssh-keyscan
 %dir %{_libexecdir}
+%attr(4711,root,root) %{_libexecdir}/ssh-keysign
 %{_sbindir}/ssh-host-keygen
 %dir %{_defaultdocdir}/%{name}-%{version}
 %{_defaultdocdir}/%{name}-%{version}/CREDITS
@@ -328,10 +336,12 @@ fi
 %{_defaultdocdir}/%{name}-%{version}/TODO
 %{_defaultdocdir}/%{name}-%{version}/faq.html
 %{_mandir}/man1/*
+%{_mandir}/man8/ssh-keysign.8.gz
+%{_mandir}/man5/ssh_config.5.gz
  
 %Files server
 %defattr(-,root,root)
-%dir %attr(0700,root,root) %{_var}/empty/sshd
+%dir %{_var}/empty/sshd
 %config %{SVIdir}/sshd
 %config /etc/pam.d/sshd
 %config %{_sysconfdir}/moduli
@@ -339,6 +349,7 @@ fi
 %config %{SVIcdir}/sshd
 %{_libexecdir}/sftp-server
 %{_sbindir}/sshd
+%{_mandir}/man5/sshd_config.5.gz
 %{_mandir}/man8/sftp-server.8.gz
 %{_mandir}/man8/sshd.8.gz
  
@@ -353,4 +364,4 @@ fi
 * Mon Jan 01 1998 ...
 Template Version: 1.31
 
-$Id: openssh.spec,v 1.38 2002/10/03 01:56:59 djm Exp $
+$Id: openssh.spec,v 1.39.2.2 2003/03/21 04:52:56 tim Exp $
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index 4df5aa969..2c6db51e5 100644
--- a/contrib/cygwin/ssh-host-config
+++ b/contrib/cygwin/ssh-host-config
@@ -378,6 +378,8 @@ then
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
 
+# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
 # The strategy used for options in the default sshd_config shipped with
 # OpenSSH is to specify options with their default value where
 # possible, but leave them commented.  Uncommented options change a
@@ -394,7 +396,7 @@ Port $port_number
 #HostKey ${SYSCONFDIR}/ssh_host_rsa_key
 #HostKey ${SYSCONFDIR}/ssh_host_dsa_key
 
-# Lifetime and size of ephemeral version 1 server ke
+# Lifetime and size of ephemeral version 1 server key
 #KeyRegenerationInterval 3600
 #ServerKeyBits 768
 
@@ -405,7 +407,7 @@ Port $port_number
 
 # Authentication:
 
-#LoginGraceTime 600
+#LoginGraceTime 120
 #PermitRootLogin yes
 # The following setting overrides permission checks on host key files
 # and directories. For security reasons set this to "yes" when running
@@ -414,11 +416,11 @@ StrictModes no
 
 #RSAAuthentication yes
 #PubkeyAuthentication yes
-#AuthorizedKeysFile     %h/.ssh/authorized_keys
+#AuthorizedKeysFile     .ssh/authorized_keys
 
 # rhosts authentication should not be used
 #RhostsAuthentication no
-# Don't read ~/.rhosts and ~/.shosts files
+# Don't read the user's ~/.rhosts and ~/.shosts files
 #IgnoreRhosts yes
 # For this to work you will also need host keys in ${SYSCONFDIR}/ssh_known_hosts
 #RhostsRSAAuthentication no
@@ -443,6 +445,7 @@ StrictModes no
 #KeepAlive yes
 #UseLogin no
 UsePrivilegeSeparation $privsep_used
+#PermitUserEnvironment no
 #Compression yes
 
 #MaxStartups 10
diff --git a/contrib/gnome-ssh-askpass2.c b/contrib/gnome-ssh-askpass2.c
index 89a412aa8..9e8eaf920 100644
--- a/contrib/gnome-ssh-askpass2.c
+++ b/contrib/gnome-ssh-askpass2.c
@@ -36,10 +36,13 @@
  * you don't trust your X server. We grab the keyboard always.
  */
 
+#define GRAB_TRIES      16
+#define GRAB_WAIT       250 /* milliseconds */
+
 /*
  * Compile with:
  *
- * cc `pkg-config --cflags gtk+-2.0` \
+ * cc -Wall `pkg-config --cflags gtk+-2.0` \
  *    gnome-ssh-askpass2.c -o gnome-ssh-askpass \
  *    `pkg-config --libs gtk+-2.0`
  *
@@ -48,6 +51,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 #include <X11/Xlib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
@@ -84,13 +88,13 @@ passphrase_dialog(char *message)
 {
         const char *failed;
         char *passphrase, *local;
-        char **messages;
-        int result, i, grab_server, grab_pointer;
-        GtkWidget *dialog, *entry, *label;
+        int result, grab_tries, grab_server, grab_pointer;
+        GtkWidget *dialog, *entry;
         GdkGrabStatus status;
 
         grab_server = (getenv("GNOME_SSH_ASKPASS_GRAB_SERVER") != NULL);
         grab_pointer = (getenv("GNOME_SSH_ASKPASS_GRAB_POINTER") != NULL);
+        grab_tries = 0;
 
         dialog = gtk_message_dialog_new(NULL, 0,
                                         GTK_MESSAGE_QUESTION,
@@ -117,23 +121,35 @@ passphrase_dialog(char *message)
 
         /* Grab focus */
         gtk_widget_show_now(dialog);
-        if (grab_server) {
-                gdk_x11_grab_server();
-        }
         if (grab_pointer) {
-                status =  gdk_pointer_grab((GTK_WIDGET(dialog))->window, TRUE,
-                                           0, NULL, NULL, GDK_CURRENT_TIME);
-                if (status != GDK_GRAB_SUCCESS) {
-                        failed = "mouse";
-                        goto nograb;
+                for(;;) {
+                        status = gdk_pointer_grab(
+                           (GTK_WIDGET(dialog))->window, TRUE, 0, NULL, 
+                           NULL, GDK_CURRENT_TIME);
+                        if (status == GDK_GRAB_SUCCESS)
+                                break;
+                        usleep(GRAB_WAIT * 1000);
+                        if (++grab_tries > GRAB_TRIES) {
+                                failed = "mouse";
+                                goto nograb;
+                        }
                 }
         }
-        status = gdk_keyboard_grab((GTK_WIDGET(dialog))->window, FALSE,
-                                   GDK_CURRENT_TIME);
-        if (status != GDK_GRAB_SUCCESS) {
-                failed = "keyboard";
-                goto nograbkb;
+        for(;;) {
+                status = gdk_keyboard_grab((GTK_WIDGET(dialog))->window,
+                   FALSE, GDK_CURRENT_TIME);
+                if (status == GDK_GRAB_SUCCESS)
+                        break;
+                usleep(GRAB_WAIT * 1000);
+                if (++grab_tries > GRAB_TRIES) {
+                        failed = "keyboard";
+                        goto nograbkb;
+                }
         }
+        if (grab_server) {
+                gdk_x11_grab_server();
+        }
+
         result = gtk_dialog_run(GTK_DIALOG(dialog));
 
         /* Ungrab */
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index e7005064d..f71c0b261 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
-%define ver 3.5p1
+%define ver 3.6p1
 %define rel 1
 
 # OpenSSH privilege separation requires a user & group ID
@@ -21,7 +21,7 @@
 %define scard 0
 
 # Use GTK2 instead of GNOME in gnome-ssh-askpass
-%define gtk2 0
+%define gtk2 1
 
 # Is this build for RHL 6.x?
 %define build6x 0
diff --git a/contrib/solaris/opensshd.in b/contrib/solaris/opensshd.in
index e7ca2489f..48b6c5702 100755
--- a/contrib/solaris/opensshd.in
+++ b/contrib/solaris/opensshd.in
@@ -3,6 +3,8 @@
 #
 # Stripped PRNGd out of it for the time being.
 
+umask 022
+
 CAT=/usr/bin/cat
 KILL=/usr/bin/kill
 
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 2346761f7..a1ad34a8d 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -29,7 +29,12 @@ if [ -z "`eval $GET_ID`" -a -r "${ID_FILE}" ] ; then
 fi
 
 if [ -z "`eval $GET_ID`" ]; then
-  echo "$0: ERROR: No identities found"
+  echo "$0: ERROR: No identities found" >&2
+  exit 1
+fi
+
+if [ "$#" -lt 1 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
+  echo "Usage: $0 [-i [identity_file]] [user@]machine" >&2
   exit 1
 fi
 
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 3ae1dfc80..55de013dc 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.5p1
+Version: 3.6p1
 URL: http://www.openssh.com/
 Release: 1
 Source0: openssh-%{version}.tar.gz