$NetBSD: patch-ao,v 1.3 2009/04/07 11:40:20 drochner Exp $

--- ./daemon/slave.c.orig	2009-03-19 05:59:27.000000000 +0100
+++ ./daemon/slave.c
@@ -3721,7 +3721,7 @@ session_child_run (struct passwd *pwent,
 		char *new_system_data_dirs;
 
 		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);
 
@@ -3820,7 +3820,7 @@ session_child_run (struct passwd *pwent,
 		gdm_child_exit (DISPLAY_REMANAGE,
 				_("%s: setusercontext () failed for %s. "
 				  "Aborting."), "session_child_run",
-				login ? login : "(null)");
+				login_user ? login_user : "(null)");
 #else
 	if G_UNLIKELY (setuid (pwent->pw_uid) < 0)
 		gdm_child_exit (DISPLAY_REMANAGE,