patches/gnome-vfs-12-login_tty.diff
author gheet
Tue, 07 Nov 2006 14:55:35 +0000
changeset 8520 ace81fd20222
permissions -rw-r--r--
2006-11-07 Ghee Seng Teo - <[email protected]> * gnome-vfs.spec: removed patches/gnome-vfs-02-uninstalled-pc.diff. No longer needed. but has logged bugzilla bug 371610. * patches/gnome-vfs-02-uninstalled-pc.diff: removed * patches/gnome-vfs-03-gopher-proxy-schema.diff: renamed * patches/gnome-vfs-04-default-url-handler.diff: renamed. * patches/gnome-vfs-05-mime-info-file-path.diff: renamed. * patches/gnome-vfs-06-g11n-i18n-ui.diff: renamed. * patches/gnome-vfs-07-trash-only-home.diff: renamed. * patches/gnome-vfs-08-mount-points-fix.diff: renamed. * patches/gnome-vfs-09-trash-files-from-different-filesystem.diff: renamed. * patches/gnome-vfs-10-socks-version.diff: renamed. * patches/gnome-vfs-11-audio-cd-show-icon.diff: renamed. * patches/gnome-vfs-12-trash-skip-copy.diff: renamed. * patches/gnome-vfs-13-login_tty.diff: renamed. * patches/gnome-vfs-14-krb5-config-no-gssapi.diff: renamed. * patches/gnome-vfs-15-hidden.diff: renamed. * patches/gnome-vfs-16-acl-permissions.diff: renamed.
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