- (bal) [configure.ac defines.h loginrec.c sshd.c sshpty.c] Partial sync

   with Cray (mostly #ifdef renaming).  Patch by wendyp@cray.com.

diff --git a/ChangeLog b/ChangeLog
index 33809c2ad1c320d775fd432b8466c075a751c885..bd657947714cf0808cce760efdce0e895edabfed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20020722
  - (bal) AIX tty data limiting patch fix by leigh@solinno.co.uk
  - (stevesk) [xmmap.c] missing prototype for fatal()
+ - (bal) [configure.ac defines.h loginrec.c sshd.c sshpty.c] Partial sync
+   with Cray (mostly #ifdef renaming).  Patch by wendyp@cray.com.
 
 20020721
  - (stevesk) [auth-pam.c] merge cosmetic changes from solar's

diff --git a/configure.ac b/configure.ac
index 1436e815c98756c74f391c378f7af1e5daca8e6e..648e23e937ab940f6a859b4fcadfa9aef93028ca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -279,13 +279,22 @@ mips-sony-bsd|mips-sony-newsos4)
        AC_CHECK_FUNCS(getluid setluid)
        MANTYPE=man
        ;;
+*-*-unicosmk*)
+       no_libsocket=1
+       no_libnsl=1
+       AC_DEFINE(USE_PIPES)
+       AC_DEFINE(DISABLE_FD_PASSING)
+       LDFLAGS="$LDFLAGS"
+       LIBS="$LIBS -lgen -lrsc -lshare -luex -lacm"
+       MANTYPE=cat
 *-*-unicos*)
        no_libsocket=1
        no_libnsl=1
        AC_DEFINE(USE_PIPES)
        AC_DEFINE(DISABLE_FD_PASSING)
-       LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal,-L/usr/local/lib"
-       LIBS="$LIBS -lgen -lrsc"
+       LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal"
+       LIBS="$LIBS -lgen -lrsc -lshare -luex -lacm"
+       MANTYPE=cat
        ;;
 *-dec-osf*)
        AC_MSG_CHECKING(for Digital Unix SIA)

diff --git a/defines.h b/defines.h
index 06515c2cafe9a04659b684c069293abbe6a34f9b..2bf3ebba5a456b64c1497a1aa34493079eb9c48c 100644 (file)
--- a/defines.h
+++ b/defines.h
@@ -124,7 +124,7 @@ typedef char int8_t;
 # if (SIZEOF_SHORT_INT == 2)
 typedef short int int16_t;
 # else
-#  ifdef _CRAY
+#  if defined(_CRAY) && !defined(_CRAYSV2)
 #   if (SIZEOF_SHORT_INT == 4)
 typedef short int16_t;
 #   else
@@ -137,7 +137,7 @@ typedef long  int16_t;
 # if (SIZEOF_INT == 4)
 typedef int int32_t;
 # else
-#  ifdef _CRAY
+#  if defined(_CRAY) && !defined(_CRAYSV2)
 typedef long  int32_t;
 #  else
 #   error "32 bit int type not found."
@@ -161,7 +161,7 @@ typedef unsigned char u_int8_t;
 #  if (SIZEOF_SHORT_INT == 2)
 typedef unsigned short int u_int16_t;
 #  else
-#   ifdef _CRAY
+#   if defined(_CRAY) && !defined(_CRAYSV2)
 #    if (SIZEOF_SHORT_INT == 4)
 typedef unsigned short u_int16_t;
 #    else
@@ -174,7 +174,7 @@ typedef unsigned long  u_int16_t;
 #  if (SIZEOF_INT == 4)
 typedef unsigned int u_int32_t;
 #  else
-#   ifdef _CRAY
+#   if defined(_CRAY) && !defined(_CRAYSV2)
 typedef unsigned long  u_int32_t;
 #   else
 #    error "32 bit int type not found."

diff --git a/loginrec.c b/loginrec.c
index 8a8dabe0ec224df31a3c4065befbcc885445fb3a..0b874d3eac81f9bd98d38d10acd1d0e39fc5be4f 100644 (file)
--- a/loginrec.c
+++ b/loginrec.c
@@ -622,13 +622,13 @@ construct_utmp(struct logininfo *li,
        switch (li->type) {
        case LTYPE_LOGIN:
                ut->ut_type = USER_PROCESS;
-#ifdef _CRAY
+#if defined(_CRAY) && !defined(_CRAYSV2)
                cray_set_tmpdir(ut);
 #endif
                break;
        case LTYPE_LOGOUT:
                ut->ut_type = DEAD_PROCESS;
-#ifdef _CRAY
+#if defined(_CRAY) && !defined(_CRAYSV2)
                cray_retain_utmp(ut, li->pid);
 #endif
                break;

diff --git a/sshd.c b/sshd.c
index c04f55f4be703cbc4e84fb0e5df3fb220712fc1d..8f9d3c3928448ee5c666be2dc84b0c5504c156cd 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -934,7 +934,7 @@ main(int ac, char **av)
            SYSLOG_FACILITY_AUTH : options.log_facility,
            !inetd_flag);
 
-#ifdef _CRAY
+#if defined(_CRAY) && !defined(_CRAYSV2)
        /* Cray can define user privs drop all prives now!
         * Not needed on PRIV_SU systems!
         */

diff --git a/sshpty.c b/sshpty.c
index 64ac4e5994fa8d636431b88d043c561217c9030f..e3027ca2ec50acb5deb3d2a3c0dfbd4d782a8f87 100644 (file)
--- a/sshpty.c
+++ b/sshpty.c
@@ -162,7 +162,7 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
        }
        return 1;
 #else /* HAVE_DEV_PTS_AND_PTC */
-#ifdef _CRAY
+#if defined(_CRAY) && !defined(_CRAYSV2)
        char buf[64];
        int i;
        int highpty;
@@ -268,7 +268,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname)
        void *old;
 #endif /* USE_VHANGUP */
 
-#ifdef _CRAY
+#if defined(_CRAY) && !defined(_CRAYSV2)
        if (setsid() < 0)
                error("setsid: %.100s", strerror(errno));