$NetBSD: patch-ao,v 1.1 2007/11/30 20:08:39 drochner Exp $

--- ./daemon/slave.c.orig	2007-09-17 16:45:50.000000000 +0200
+++ ./daemon/slave.c
@@ -3694,7 +3694,7 @@ session_child_run (struct passwd *pwent,
 				       "/usr/local/share/:/usr/share/";
 
 		new_system_data_dirs = g_build_path (":",
-			 old_system_data_dirs, DATADIR "/gdm/", NULL);
+			 old_system_data_dirs, DATADIR "/gdm/", DATADIR "/", NULL);
 
 		g_setenv ("XDG_DATA_DIRS", new_system_data_dirs, TRUE);
 
@@ -3792,7 +3792,7 @@ session_child_run (struct passwd *pwent,
 		gdm_child_exit (DISPLAY_REMANAGE,
 				_("%s: setusercontext () failed for %s. "
 				  "Aborting."), "session_child_run",
-				login);
+				login_user);
 #else
 	if G_UNLIKELY (setuid (pwent->pw_uid) < 0)
 		gdm_child_exit (DISPLAY_REMANAGE,
