Attachment 60 Details for Bug 184 – better style (no c++ comments), and incorporation of suggestions

[patch] better style (no c++ comments), and incorporation of suggestions

openssh-3.1p1-hpux-submited2.patch (text/plain), 4.71 KB, created by Darren Cole on 2002-04-04 08:10:24 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Cole

Created: 2002-04-04 08:10:24 AEST

Size: 4.71 KB

patch

obsolete

>diff -rc openssh-3.1p1.orig/acconfig.h openssh-3.1p1/acconfig.h
>*** openssh-3.1p1.orig/acconfig.h	Tue Feb 26 16:40:49 2002
>--- openssh-3.1p1/acconfig.h	Thu Mar 21 23:19:56 2002
>***************
>*** 222,227 ****
>--- 222,229 ----
>  
>  /* Defined if in_systm.h needs to be included with netinet/ip.h (HPUX - <sigh/>) */
>  #undef NEED_IN_SYSTM_H
>+ /* Defined if on a Trusted HPUX system */
>+ #undef TRUSTED_HPUX
>  
>  /* Define if you have an old version of PAM which takes only one argument */
>  /* to pam_strerror */
>diff -rc openssh-3.1p1.orig/auth-passwd.c openssh-3.1p1/auth-passwd.c
>*** openssh-3.1p1.orig/auth-passwd.c	Tue Mar  5 01:45:57 2002
>--- openssh-3.1p1/auth-passwd.c	Wed Apr  3 19:55:47 2002
>***************
>*** 186,192 ****
>--- 186,196 ----
>  #endif /* defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW) */
>  
>  #if defined(__hpux)
>+ # ifdef TRUSTED_HPUX
>+ 	if ((spw = getprpwnam(pw->pw_name)) != NULL)
>+ # else
>  	if (iscomsec() && (spw = getprpwnam(pw->pw_name)) != NULL)
>+ # endif
>  		pw_password = spw->ufld.fd_encrypt;
>  #endif /* defined(__hpux) */
>  
>***************
>*** 206,215 ****
>--- 210,223 ----
>  		encrypted_password = crypt(password, salt);
>  #else /* HAVE_MD5_PASSWORDS */
>  # ifdef __hpux
>+ #  ifdef TRUSTED_HPUX
>+ 		encrypted_password = bigcrypt(password, salt);
>+ #  else
>  	if (iscomsec())
>  		encrypted_password = bigcrypt(password, salt);
>  	else
>  		encrypted_password = crypt(password, salt);
>+ #  endif
>  # else
>  #  ifdef HAVE_SCO_PROTECTED_PW
>  	encrypted_password = bigcrypt(password, salt);
>Common subdirectories: openssh-3.1p1.orig/autom4te.cache and openssh-3.1p1/autom4te.cache
>diff -rc openssh-3.1p1.orig/configure.ac openssh-3.1p1/configure.ac
>*** openssh-3.1p1.orig/configure.ac	Wed Feb 27 06:12:35 2002
>--- openssh-3.1p1/configure.ac	Tue Mar 26 20:18:18 2002
>***************
>*** 80,85 ****
>--- 80,101 ----
>  *-*-darwin*)
>  	AC_DEFINE(BROKEN_GETADDRINFO)
>  	;;
>+ *-*-hpux10.26)
>+ 	if test -z "$GCC"; then
>+ 		CFLAGS="$CFLAGS -Ae"
>+ 	fi
>+ 	CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
>+ 	IPADDR_IN_DISPLAY=yes
>+ 	# AC_DEFINE(HAVE_SCO_PROTECTED_PW)
>+ 	AC_DEFINE(USE_PIPES)
>+ 	AC_DEFINE(TRUSTED_HPUX)
>+ 	AC_DEFINE(LOGIN_NEEDS_UTMPX)
>+ 	AC_DEFINE(DISABLE_SHADOW)
>+ 	AC_DEFINE(DISABLE_UTMP)
>+ 	AC_DEFINE(SPT_TYPE,SPT_PSTAT)
>+ 	LIBS="$LIBS -lxnet -lsec -lsecpw"
>+ 	disable_ptmx_check=yes
>+ 	;;
>  *-*-hpux10*)
>  	if test -z "$GCC"; then
>  		CFLAGS="$CFLAGS -Ae"
>***************
>*** 1769,1780 ****
>  fi
>  
>  if test -z "$no_dev_ptmx" ; then
>! 	AC_CHECK_FILE("/dev/ptmx", 
>! 		[
>! 			AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX)
>! 			have_dev_ptmx=1
>! 		]
>! 	)
>  fi
>  AC_CHECK_FILE("/dev/ptc", 
>  	[
>--- 1785,1798 ----
>  fi
>  
>  if test -z "$no_dev_ptmx" ; then
>! 	if test "x$disable_ptmx_check" != "xyes" ; then
>! 		AC_CHECK_FILE("/dev/ptmx", 
>! 			[
>! 				AC_DEFINE_UNQUOTED(HAVE_DEV_PTMX)
>! 				have_dev_ptmx=1
>! 			]
>! 		)
>! 	fi
>  fi
>  AC_CHECK_FILE("/dev/ptc", 
>  	[
>diff -rc openssh-3.1p1.orig/session.c openssh-3.1p1/session.c
>*** openssh-3.1p1.orig/session.c	Mon Feb 25 15:48:03 2002
>--- openssh-3.1p1/session.c	Tue Apr  2 00:08:12 2002
>***************
>*** 1285,1291 ****
>--- 1285,1296 ----
>  #ifdef LOGIN_NEEDS_TERM
>  		    (s->term ? s->term : "unknown"),
>  #endif /* LOGIN_NEEDS_TERM */
>+ #ifdef TRUSTED_HPUX
>+ 			/* The "--" makes login hang on Trusted HP-UX 10.26 */
>+ 		    "-p", "-f", pw->pw_name, (char *)NULL);
>+ #else
>  		    "-p", "-f", "--", pw->pw_name, (char *)NULL);
>+ #endif
>  
>  		/* Login couldn't be executed, die. */
>  
>***************
>*** 1736,1741 ****
>--- 1741,1760 ----
>  	 */
>  	if (c->ostate != CHAN_OUTPUT_CLOSED)
>  		chan_write_failed(c);
>+ #ifdef TRUSTED_HPUX
>+ #if 0
>+ 	/*
>+ 	 * Took two lines from a patch at:
>+ 	 *	<http://www.math.ualberta.ca/imaging/snfs/>
>+ 	 * by John C. Bowman
>+ 	 * There is some speculation that you could possibly
>+ 	 * see data loss from this on usenet.  But without
>+ 	 * this sshd does not exit on logout.
>+ 	 */
>+ 	if (s->ttyfd != -1 && c->istate == CHAN_INPUT_OPEN)
>+ 		chan_read_failed(c);
>+ #endif
>+ #endif
>  	s->chanid = -1;
>  }
>  
>diff -rc openssh-3.1p1.orig/sshd.c openssh-3.1p1/sshd.c
>*** openssh-3.1p1.orig/sshd.c	Tue Mar  5 01:31:30 2002
>--- openssh-3.1p1/sshd.c	Tue Mar 26 01:42:43 2002
>***************
>*** 45,50 ****
>--- 45,54 ----
>  #include <openssl/dh.h>
>  #include <openssl/bn.h>
>  #include <openssl/md5.h>
>+ #ifdef TRUSTED_HPUX
>+ #include <sys/security.h>
>+ #include <prot.h>
>+ #endif
>  
>  #include "ssh.h"
>  #include "ssh1.h"
>***************
>*** 596,601 ****
>--- 600,612 ----
>  	int startups = 0;
>  	Key *key;
>  	int ret, key_used = 0;
>+ #ifdef TRUSTED_HPUX
>+ 	/*
>+ 	 * This call is needed for getprpwnam in auth2.c
>+ 	 * to initialize the security system for Trusted HP-UX
>+ 	 */
>+ 	set_auth_parameters(ac, av);
>+ #endif
>  
>  	__progname = get_progname(av[0]);
>  	init_rng();

Actions: View | Diff

Attachments on bug 184: 60 | 67