Changeset 4 for heimdal/trunk/appl

Timestamp:

Jul 11, 2015, 9:56:07 AM (10 years ago)

Author:

Paul Smedley

Message:

heimdal: applied os2 patches, added conf.cmd

Location:

heimdal/trunk/appl

Files:

• login/stty_default.c (modified) (1 diff)
• rsh/rsh.c (modified) (1 diff)
• rsh/rshd.c (modified) (1 diff)
• telnet/telnet/sys_bsd.c (modified) (1 diff)
• telnet/telnetd/sys_term.c (modified) (3 diffs)

heimdal/trunk/appl/login/stty_default.c

@@ -87 +87 @@
     termios.c_lflag &= ~(ECHOPRT|TOSTOP|FLUSHO);
 
+#ifndef __OS2__
     termios.c_oflag |= (OPOST|ONLCR);
+#else
+    termios.c_oflag |= (OPOST);
+#endif
     termios.c_oflag &= ~OXTABS;
 

heimdal/trunk/appl/rsh/rsh.c

@@ -850 +850 @@
 
     priv_port1 = priv_port2 = IPPORT_RESERVED-1;
+#ifndef __OS2__
     priv_socket1 = rresvport(&priv_port1);
     priv_socket2 = rresvport(&priv_port2);
+#endif
     uid = getuid ();
     if (setuid (uid) || (uid != 0 && setuid(0) == 0))

heimdal/trunk/appl/rsh/rshd.c

@@ -660 +660 @@
          */
 
+#ifndef __OS2__
         if (erraddr->sa_family == AF_INET)
             errsock = rresvport (&priv_port);
         else
+#endif
             errsock = socket (erraddr->sa_family, SOCK_STREAM, 0);
         if (errsock < 0)

heimdal/trunk/appl/telnet/telnet/sys_bsd.c

@@ -356 +356 @@
     if (f&MODE_ECHO) {
         tmp_tc.c_lflag |= ECHO;
+#ifndef __OS2__
         tmp_tc.c_oflag |= ONLCR;
+#endif
         if (crlf)
                 tmp_tc.c_iflag |= ICRNL;
     } else {
         tmp_tc.c_lflag &= ~ECHO;
+#ifndef __OS2__
         tmp_tc.c_oflag &= ~ONLCR;
+#endif
 # ifdef notdef
         if (crlf)

heimdal/trunk/appl/telnet/telnetd/sys_term.c

@@ -933 +933 @@
      */
     set_termbuf();
+#ifndef __OS2__
     if (login_tty(t) == -1)
         fatalperror(net, "login_tty");
+#endif
     if (net > 2)
         close(net);
@@ -1644 +1646 @@
 cleanup(int sig)
 {
+#ifndef __OS2__
 #if defined(HAVE_UTMPX_H) || !defined(HAVE_LOGWTMP)
     rmut();
@@ -1662 +1665 @@
     chmod(line, 0666);
     chown(line, 0, 0);
+#endif
 #endif
     shutdown(net, 2);