diff options
| author | jschauma <jschauma@pkgsrc.org> | 2002-07-27 15:20:05 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2002-07-27 15:20:05 +0000 |
| commit | ba8147a24488f6118d997e8c6ef1afd3744f0b73 (patch) | |
| tree | 58265ef0fca80bad5ed0367fb40b745c0488558f /x11/gdm/patches | |
| parent | 1ade3e519c08d35350307ab615ca0f81a955c217 (diff) | |
| download | pkgsrc-ba8147a24488f6118d997e8c6ef1afd3744f0b73.tar.gz | |
gdm's "Face Browser" is broken in that it does not display faces for any
user who's pw_passwd is set to "*". NetBSD gives all users "*", same if
shadow passwords are used on Linux, Solaris etc. Commenting out that part
makes the face-browser work. (I'll submit this to the gdm-folks, as well.)
Change pid-file from /var/run/xdm.pid to /var/run/gdm.pid now that we have
our own ${PREFIX}/etc/rc.d/gdm script.
Bump PKGREVISION.
(Changes suggested in PR pkg/17184 by Cliff <cliff at snipe444 dot org>,
applied after feedback from MAINTAINER and tron. This closes said PR.)
Diffstat (limited to 'x11/gdm/patches')
| -rw-r--r-- | x11/gdm/patches/patch-ab | 11 | ||||
| -rw-r--r-- | x11/gdm/patches/patch-bd | 24 |
2 files changed, 29 insertions, 6 deletions
diff --git a/x11/gdm/patches/patch-ab b/x11/gdm/patches/patch-ab index 0fc6f81ceef..2641f031395 100644 --- a/x11/gdm/patches/patch-ab +++ b/x11/gdm/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2001/03/20 02:42:14 mjl Exp $ +$NetBSD: patch-ab,v 1.4 2002/07/27 15:20:06 jschauma Exp $ ---- config/gdm.conf.in.orig Tue Mar 20 02:18:54 2001 -+++ config/gdm.conf.in Tue Mar 20 02:22:19 2001 -@@ -1,21 +1,21 @@ +--- config/gdm.conf.in.orig Sun Mar 4 15:27:12 2001 ++++ config/gdm.conf.in Fri Jul 26 19:51:41 2002 +@@ -1,10 +1,10 @@ [daemon] AutomaticLogin= Chooser=@EXPANDED_BINDIR@/gdmchooser --disable-sound --disable-crash-dialog @@ -15,8 +15,7 @@ $NetBSD: patch-ab,v 1.3 2001/03/20 02:42:14 mjl Exp $ HaltCommand=/sbin/shutdown -h now KillInitClients=true LogDir=@EXPANDED_AUTHDIR@ --PidFile=/var/run/gdm.pid -+PidFile=/var/run/xdm.pid +@@ -12,10 +12,10 @@ PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/ PreSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PreSession/ RebootCommand=/sbin/shutdown -r now diff --git a/x11/gdm/patches/patch-bd b/x11/gdm/patches/patch-bd new file mode 100644 index 00000000000..31b3b389e81 --- /dev/null +++ b/x11/gdm/patches/patch-bd @@ -0,0 +1,24 @@ +$NetBSD: patch-bd,v 1.1 2002/07/27 15:20:06 jschauma Exp $ + +--- gui/gdmlogin.c.orig Sun Mar 11 23:24:07 2001 ++++ gui/gdmlogin.c Sat Jul 27 11:07:27 2002 +@@ -1971,11 +1971,19 @@ + const char * const lockout_passes[] = { "*", "!!", NULL }; + gint i; + ++ /* ++ * pw_passwd is set to "*" on NetBSD as well as when shadow passwords are ++ * used; in these cases, the following code effectively eliminates any ++ * functionality from the 'faces browser'. ++ * (pointed out by Cliff in PR pkg/17184) ++ */ ++#ifdef broken + for (i=0 ; lockout_passes[i] != NULL ; i++) { + if (strcmp (lockout_passes[i], pwent->pw_passwd) == 0) { + return TRUE; + } + } ++#endif + + if (GdmExclude != NULL && + GdmExclude[0] != '\0') { |