diff options
| author | tron <tron> | 1999-11-11 11:57:20 +0000 |
|---|---|---|
| committer | tron <tron> | 1999-11-11 11:57:20 +0000 |
| commit | 7a130fd0a99b6e8df332911ffc23b0542ccae0d2 (patch) | |
| tree | cc47771829ad239d20b5fe4ee958fc8b5163385c /x11/gdm | |
| parent | dc8908d53767cd3efc77fbb2f2bae82f669cb0d0 (diff) | |
| download | pkgsrc-7a130fd0a99b6e8df332911ffc23b0542ccae0d2.tar.gz | |
Fix bug in communication between "gdm" and "gdmlogin" process.
Diffstat (limited to 'x11/gdm')
| -rw-r--r-- | x11/gdm/files/patch-sum | 4 | ||||
| -rw-r--r-- | x11/gdm/patches/patch-af | 21 |
2 files changed, 18 insertions, 7 deletions
diff --git a/x11/gdm/files/patch-sum b/x11/gdm/files/patch-sum index a00e166b83d..376f9ef1ca5 100644 --- a/x11/gdm/files/patch-sum +++ b/x11/gdm/files/patch-sum @@ -1,8 +1,8 @@ -$NetBSD: patch-sum,v 1.3 1999/11/11 11:27:44 tron Exp $ +$NetBSD: patch-sum,v 1.4 1999/11/11 11:57:20 tron Exp $ MD5 (patch-aa) = 2467d33da85bef94f9af52c61e0dcd3a MD5 (patch-ab) = 74545f81c15f33c95d30736d2c7ada06 MD5 (patch-ac) = e79133c3fccf8671ee1be210a0e9b111 MD5 (patch-ad) = 40cad34a11fd0c81b9016fa170a70b9e MD5 (patch-ae) = 68d772ee3a07c03eb122332bc5bf8822 -MD5 (patch-af) = bca20e137cc1976adc151bef41cdf580 +MD5 (patch-af) = e03399ea802e3a2cd9206d9d228164e7 diff --git a/x11/gdm/patches/patch-af b/x11/gdm/patches/patch-af index a60f2f08cf7..5f1ca562347 100644 --- a/x11/gdm/patches/patch-af +++ b/x11/gdm/patches/patch-af @@ -1,8 +1,19 @@ -$NetBSD: patch-af,v 1.3 1999/11/11 11:27:16 tron Exp $ +$NetBSD: patch-af,v 1.4 1999/11/11 11:57:20 tron Exp $ --- daemon/slave.c.orig Thu Sep 30 00:56:35 1999 -+++ daemon/slave.c Thu Nov 11 11:41:17 1999 -@@ -331,11 +332,11 @@ ++++ daemon/slave.c Thu Nov 11 12:30:39 1999 +@@ -300,8 +300,8 @@ + setegid (GdmGroupId); + seteuid (0); + +- session = gdm_slave_greeter_ctl (GDM_SESS, usrsess); +- language = gdm_slave_greeter_ctl (GDM_LANG, usrlang); ++ session = gdm_slave_greeter_ctl (GDM_SESS, usrsess ? usrsess : ""); ++ language = gdm_slave_greeter_ctl (GDM_LANG, usrlang ? usrlang : ""); + + if (strlen (gdm_slave_greeter_ctl (GDM_SSESS, ""))) + savesess = TRUE; +@@ -331,11 +331,11 @@ setenv ("DISPLAY", d->name, TRUE); setenv ("LOGNAME", login, TRUE); setenv ("USER", login, TRUE); @@ -16,7 +27,7 @@ $NetBSD: patch-af,v 1.3 1999/11/11 11:27:16 tron Exp $ /* Special PATH for root */ if(pwent->pw_uid == 0) -@@ -385,6 +386,9 @@ +@@ -385,6 +385,9 @@ if (setgid (pwent->pw_gid) < 0) gdm_remanage (_("gdm_slave_session_start: Could not setgid %d. Aborting."), pwent->pw_gid); @@ -26,7 +37,7 @@ $NetBSD: patch-af,v 1.3 1999/11/11 11:27:16 tron Exp $ if (initgroups (login, pwent->pw_gid) < 0) gdm_remanage (_("gdm_slave_session_start: initgroups() failed for %s. Aborting."), login); -@@ -423,7 +427,7 @@ +@@ -423,7 +426,7 @@ /* Restore sigmask inherited from init */ sigprocmask (SIG_SETMASK, &sysmask, NULL); |