Merged trunk changes r9797:9829 into 217update branch.
--- gnome-vfs-2.13.3/libgnomevfs/gnome-vfs-pty.c.orig Wed Dec 21 15:13:34 2005
+++ gnome-vfs-2.13.3/libgnomevfs/gnome-vfs-pty.c Wed Dec 21 15:19:31 2005
@@ -307,6 +307,8 @@
}
#ifdef HAVE_UTMP_H
+/* Solaris doesn't have login_tty. It uses utmpx. */
+#if !defined(sun) || !defined(__SVR4)
/* This sets stdin, stdout, stderr to the socket */
if (login && login_tty (fd) == -1) {
g_printerr ("mount child process login_tty failed: %s\n", strerror (errno));
@@ -313,6 +315,7 @@
return -1;
}
#endif
+#endif
/* Signal to the parent that we've finished setting things up by
* sending an arbitrary byte over the status pipe and waiting for