- (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>

1 files changed, 4 insertions, 6 deletions

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;
 # else
 #  error "32 bit int type not found."
 # endif
-/*
 # if (SIZEOF_LONG_INT == 8)
 typedef long int int64_t;
 # else
@@ -134,7 +133,6 @@ typedef long long int int64_t;
 #   error "64 bit int type not found."
 #  endif
 # endif
-*/
 #endif
 
 /* If sys/types.h does not supply u_intXX_t, supply them ourselves */
@@ -143,9 +141,7 @@ typedef long long int int64_t;
 typedef uint8_t u_int8_t;
 typedef uint16_t u_int16_t;
 typedef uint32_t u_int32_t;
-/*
 typedef  uint64_t u_int64_t;
-*/
 # define HAVE_U_INTXX_T 1
 # else
 #  if (SIZEOF_CHAR == 1)
@@ -163,7 +159,6 @@ typedef unsigned int u_int32_t;
 #  else
 #   error "32 bit int type not found."
 #  endif
-/*
 #  if (SIZEOF_LONG_INT == 8)
 typedef unsigned long int u_int64_t;
 #  else
@@ -174,7 +169,6 @@ typedef unsigned long long int u_int64_t;
 #    error "64 bit int type not found."
 #   endif
 #  endif
-*/
 # endif
 #endif
 
@@ -326,6 +320,10 @@ typedef int mode_t;
 #  define USE_VHANGUP
 #endif /* defined(HAVE_VHANGUP) && !defined(BROKEN_VHANGUP) */
 
+#ifndef GETPGRP_VOID
+# define getpgrp() getpgrp(0)
+#endif
+
 /**
  ** login recorder definitions
  **/