[ViewVC] Diff of: cvs/rxvt-unicode/src/ptytty.C

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.40 by root, Tue Jan 17 15:17:39 2006 UTC vs.
Revision 1.43 by root, Tue Jan 17 16:50:42 2006 UTC

   int pfd;
 #ifdef PTYS_ARE_OPENPTY
   char tty_name[sizeof "/dev/pts/????\0"];
-  rxvt_privileges(RESTORE);
   int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
-  rxvt_privileges(IGNORE);
   if (res != -1)
     {
       *ttydev = strdup (tty_name);
       return pfd;
 rxvt_ptytty_unix::privileges (rxvt_privaction action)
 {
   if (!name || !*name)
     return;
-  rxvt_privileges (RESTORE);
   if (action == SAVE)
     {
 # ifndef RESET_TTY_TO_COMMON_DEFAULTS
       /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
       if (lstat (name, &savestat) < 0)       /* you lose out */
       chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
       chown (name, 0, 0);
 # endif
     }
-  rxvt_privileges (IGNORE);
 }
 #endif
 rxvt_ptytty_unix::rxvt_ptytty_unix ()
 {
 #endif
 }
 rxvt_ptytty_unix::~rxvt_ptytty_unix ()
 {
+#if UTMP_SUPPORT
   logout ();
+#endif
   put ();
 }
 void
 rxvt_ptytty_unix::put ()
 struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty
 {
   rxvt_ptytty *id;
-  rxvt_ptytty_proxy ();
   ~rxvt_ptytty_proxy ();
   bool get ();
   void login (int cmd_pid, bool login_shell, const char *hostname);
 };
               write (sock_fd, &cmd.id, sizeof (cmd.id));
             }
         }
       else if (cmd.type == command::login)
         {
+#if UTMP_SUPPORT
           if (find (ptys.begin (), ptys.end (), cmd.id))
             {
               cmd.hostname[sizeof (cmd.hostname) - 1] = 0;
               cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname);
             }
-          else printf ("xxx hiya login no match %p\n", cmd.id);
+#endif
         }
       else if (cmd.type == command::destroy)
         {
           rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id);
-          if (*pty)
+          if (pty)
             {
+              delete *pty;
               ptys.erase (pty);
-              delete *pty;
             }
-          else printf ("xxx hiya destroy no match %p\n", cmd.id);
         }
       else
         break;
     }
       close (sv[1]);
       fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
     }
   else
     {
+      setgid (getegid ());
+      setuid (geteuid ());
       // server, pty-helper
       sock_fd = sv[1];
-      close (sv[0]);//D
-//      for (int fd = 0; fd < 1023; fd++)
+      for (int fd = 0; fd < 1023; fd++)
-//        if (fd != sock_fd)
+        if (fd != sock_fd && fd != 1)
-//          close (fd);
+          close (fd);
       serve ();
       _exit (EXIT_SUCCESS);
     }
 }
 rxvt_ptytty *
 rxvt_new_ptytty ()
 {
 #if PTYTTY_HELPER
   if (pid > 0)
-    {
-      // use helper process
+    // use helper process
-      return new rxvt_ptytty_proxy;
+    return new rxvt_ptytty_proxy;
-    }
   else
 #endif
     return new rxvt_ptytty_unix;
 }

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/ptytty.C (file contents): Revision 1.40 by root, Tue Jan 17 15:17:39 2006 UTC vs. Revision 1.43 by root, Tue Jan 17 16:50:42 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.40 by root, Tue Jan 17 15:17:39 2006 UTC vs.
Revision 1.43 by root, Tue Jan 17 16:50:42 2006 UTC