patches/gnome-vfs-10-login_tty.diff
author dcarbery
Fri, 24 Nov 2006 16:37:59 +0000
branch217update
changeset 19096 d542fc2c823e
parent 8534 c80aa9e01f37
permissions -rw-r--r--
Merged trunk changes r9797:9829 into 217update branch.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8520
ace81fd20222 2006-11-07 Ghee Seng Teo - <[email protected]>
gheet
parents:
diff changeset
     1
--- gnome-vfs-2.13.3/libgnomevfs/gnome-vfs-pty.c.orig	Wed Dec 21 15:13:34 2005
ace81fd20222 2006-11-07 Ghee Seng Teo - <[email protected]>
gheet
parents:
diff changeset
     2
+++ gnome-vfs-2.13.3/libgnomevfs/gnome-vfs-pty.c	Wed Dec 21 15:19:31 2005
ace81fd20222 2006-11-07 Ghee Seng Teo - <[email protected]>
gheet
parents:
diff changeset
     3
@@ -307,6 +307,8 @@
ace81fd20222 2006-11-07 Ghee Seng Teo - <[email protected]>
gheet
parents:
diff changeset
     4
 	}
ace81fd20222 2006-11-07 Ghee Seng Teo - <[email protected]>
gheet
parents:
diff changeset
     5
 
ace81fd20222 2006-11-07 Ghee Seng Teo - <[email protected]>
gheet
parents:
diff changeset
     6
 #ifdef HAVE_UTMP_H
ace81fd20222 2006-11-07 Ghee Seng Teo - <[email protected]>
gheet
parents:
diff changeset
     7
+/* Solaris doesn't have login_tty. It uses utmpx. */
ace81fd20222 2006-11-07 Ghee Seng Teo - <[email protected]>
gheet
parents:
diff changeset
     8
+#if !defined(sun) || !defined(__SVR4)
ace81fd20222 2006-11-07 Ghee Seng Teo - <[email protected]>
gheet
parents:
diff changeset
     9
 	/* This sets stdin, stdout, stderr to the socket */	
ace81fd20222 2006-11-07 Ghee Seng Teo - <[email protected]>
gheet
parents:
diff changeset
    10
 	if (login && login_tty (fd) == -1) {
ace81fd20222 2006-11-07 Ghee Seng Teo - <[email protected]>
gheet
parents:
diff changeset
    11
 		g_printerr ("mount child process login_tty failed: %s\n", strerror (errno));
ace81fd20222 2006-11-07 Ghee Seng Teo - <[email protected]>
gheet
parents:
diff changeset
    12
@@ -313,6 +315,7 @@
ace81fd20222 2006-11-07 Ghee Seng Teo - <[email protected]>
gheet
parents:
diff changeset
    13
 		return -1;
ace81fd20222 2006-11-07 Ghee Seng Teo - <[email protected]>
gheet
parents:
diff changeset
    14
 	}
ace81fd20222 2006-11-07 Ghee Seng Teo - <[email protected]>
gheet
parents:
diff changeset
    15
 #endif
ace81fd20222 2006-11-07 Ghee Seng Teo - <[email protected]>
gheet
parents:
diff changeset
    16
+#endif
ace81fd20222 2006-11-07 Ghee Seng Teo - <[email protected]>
gheet
parents:
diff changeset
    17
 	
ace81fd20222 2006-11-07 Ghee Seng Teo - <[email protected]>
gheet
parents:
diff changeset
    18
 	/* Signal to the parent that we've finished setting things up by
ace81fd20222 2006-11-07 Ghee Seng Teo - <[email protected]>
gheet
parents:
diff changeset
    19
 	 * sending an arbitrary byte over the status pipe and waiting for