remove ultrix support

[oweals/cde.git] / cde / lib / tt / lib / mp / mp_session.C

diff --git a/cde/lib/tt/lib/mp/mp_session.C b/cde/lib/tt/lib/mp/mp_session.C
index ed96227500857a6a4271b8d03bafaf7df85e2c4b..21bc4a3260a4fa9ae2ac00054ed3bd25e3a818fa 100644 (file)
--- a/cde/lib/tt/lib/mp/mp_session.C
+++ b/cde/lib/tt/lib/mp/mp_session.C
@@ -16,7 +16,7 @@
  * details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with these librararies and programs; if not, write
+ * License along with these libraries and programs; if not, write
  * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110-1301 USA
  */
@@ -66,6 +66,10 @@ _Tt_session()
        _is_server = 0;         // default server mode
        _is_dead = 0;
        _rpc_version = 0;
+       _pid = 0;
+       _rpc_program = 0;
+       _server_num = 0;
+       _server_uid = 0;
 }
 
 
@@ -145,7 +149,7 @@ c_open_unix_socket(char *socket_name)
        memset(&server_addr, 0, sizeof(server_addr));
        server_addr.sun_family = AF_UNIX;
        strcpy(server_addr.sun_path, socket_name);
-#if defined(ultrix) || defined(_AIX) || defined(hpux) || defined(__osf__)
+#if defined(_AIX) || defined(hpux)
         int servlen = strlen(server_addr.sun_path) + sizeof(server_addr.sun_fam\
 ily);
         if (connect(sock, (sockaddr *)&server_addr, servlen) < 0) {
@@ -793,8 +797,17 @@ set_id(char *id)
                        if (sscanf((char *)id, "X %s %d", host, &svnum) != 2) {
                                return(TT_ERR_SESSION);
                        }
+                       /* We _cannot_ set _displayname based solely on host and svnum, 
+                        * because :0 is NOT the same as 127.0.0.1:0 as far as X11
+                        * is concerned: by default, it will only accept connections
+                        * to the former. (XOpenDisplay etc. will fail if you try the below!)
                        sprintf(dpname, "%s:%d", host, svnum);
                        _displayname = dpname;
+                        */
+                       if (! _displayname.len()) {
+                               _displayname = _tt_global->xdisplayname;
+                       }
+
                        _server_num = svnum;
                        _env = _TT_ENV_X11;
                        break;