rpms/gnome-volume-manager/devel gnome-volume-manager-2.17.0-add-console-user-check.patch, NONE, 1.1 gnome-volume-manager.spec, 1.52, 1.53

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Nov 7 19:51:09 UTC 2006


Author: mclasen

Update of /cvs/dist/rpms/gnome-volume-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7952

Modified Files:
	gnome-volume-manager.spec 
Added Files:
	gnome-volume-manager-2.17.0-add-console-user-check.patch 
Log Message:
fix patch


gnome-volume-manager-2.17.0-add-console-user-check.patch:
 manager.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletion(-)

--- NEW FILE gnome-volume-manager-2.17.0-add-console-user-check.patch ---
--- gnome-volume-manager-2.17.0/src/manager.c.add-console-user-check	2006-11-07 13:01:17.000000000 -0500
+++ gnome-volume-manager-2.17.0/src/manager.c	2006-11-07 14:41:14.000000000 -0500
@@ -3185,6 +3185,7 @@
 	size_t n;
 	DIR *dir;
 	int vt;
+        gchar *console_path;
 	
 	if (local & LOCAL_USER_CHECKED)
 		return (local & LOCAL_USER_FOUND);
@@ -3210,7 +3211,14 @@
 	
 	if (!(local & LOCAL_USER_FOUND)) {
 		setutent ();
-		
+                console_path = g_build_filename (GVM_CONSOLE_AUTH_DIR, user, NULL);
+	        if (g_file_test (console_path, G_FILE_TEST_EXISTS)) {
+			g_free (console_path);
+		 	local = LOCAL_USER_FOUND;	
+         	}
+
+         	g_free (console_path);
+ 	
 		while (!(local & LOCAL_USER_FOUND) && (utmp = getutent ())) {
 			if (utmp->ut_type != USER_PROCESS || strncmp (utmp->ut_user, user, n) != 0)
 				continue;


Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gnome-volume-manager.spec	7 Nov 2006 19:22:55 -0000	1.52
+++ gnome-volume-manager.spec	7 Nov 2006 19:51:07 -0000	1.53
@@ -11,7 +11,7 @@
 Source4: cdda-url-handler.schemas
 Patch0: gnome-volume-manager-0.9.10.add-to-base.patch
 Patch1: gnome-volume-manager-1.5.11-rh-defaults.patch
-Patch2: gnome-volume-manager-2.15.0.add-console-user-check.patch 
+Patch2: gnome-volume-manager-2.17.0.add-console-user-check.patch 
 BuildRoot: /var/tmp/%{name}-root
 BuildPrereq: libgnomeui-devel, libglade2-devel, dbus-devel >= 0.90, dbus-glib-devel >= 0.70
 BuildPrereq: hal-devel >= 0.5.0




More information about the fedora-cvs-commits mailing list