* [gentoo-commits] gentoo-x86 commit in kde-base/ksmserver/files: ksmserver-3.5.8-gdm_interop_197133.patch digest-ksmserver-3.5.8-r1
@ 2007-11-03 22:58 Wulf Krueger (philantrop)
0 siblings, 0 replies; only message in thread
From: Wulf Krueger (philantrop) @ 2007-11-03 22:58 UTC (permalink / raw
To: gentoo-commits
philantrop 07/11/03 22:58:19
Added: ksmserver-3.5.8-gdm_interop_197133.patch
digest-ksmserver-3.5.8-r1
Log:
Added an upstream patch to fix GDM interoperability. Fixes bug 197133. Thanks to pauldv for providing a patch, too.
(Portage version: 2.1.3.16)
Revision Changes Path
1.1 kde-base/ksmserver/files/ksmserver-3.5.8-gdm_interop_197133.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/ksmserver/files/ksmserver-3.5.8-gdm_interop_197133.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/ksmserver/files/ksmserver-3.5.8-gdm_interop_197133.patch?rev=1.1&content-type=text/plain
Index: ksmserver-3.5.8-gdm_interop_197133.patch
===================================================================
--- branches/KDE/3.5/kdebase/kdmlib/dmctl.cpp 2006/10/31 11:38:26 600659
+++ branches/KDE/3.5/kdebase/kdmlib/dmctl.cpp 2007/11/01 22:10:25 731815
@@ -65,21 +65,28 @@
if ((fd = ::socket( PF_UNIX, SOCK_STREAM, 0 )) < 0)
return;
sa.sun_family = AF_UNIX;
- if (DMType == GDM)
- strcpy( sa.sun_path, "/tmp/.gdm_socket" );
- else {
+ if (DMType == GDM) {
+ strcpy( sa.sun_path, "/var/run/gdm_socket" );
+ if (::connect( fd, (struct sockaddr *)&sa, sizeof(sa) )) {
+ strcpy( sa.sun_path, "/tmp/.gdm_socket" );
+ if (::connect( fd, (struct sockaddr *)&sa, sizeof(sa) )) {
+ ::close( fd );
+ fd = -1;
+ break;
+ }
+ }
+ GDMAuthenticate();
+ } else {
if ((ptr = strchr( dpy, ':' )))
ptr = strchr( ptr, '.' );
snprintf( sa.sun_path, sizeof(sa.sun_path),
"%s/dmctl-%.*s/socket",
- ctl, ptr ? ptr - dpy : 512, dpy );
- }
- if (::connect( fd, (struct sockaddr *)&sa, sizeof(sa) )) {
- ::close( fd );
- fd = -1;
+ ctl, ptr ? int(ptr - dpy) : 512, dpy );
+ if (::connect( fd, (struct sockaddr *)&sa, sizeof(sa) )) {
+ ::close( fd );
+ fd = -1;
+ }
}
- if (DMType == GDM)
- GDMAuthenticate();
break;
case OldKDM:
{
1.1 kde-base/ksmserver/files/digest-ksmserver-3.5.8-r1
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/ksmserver/files/digest-ksmserver-3.5.8-r1?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/ksmserver/files/digest-ksmserver-3.5.8-r1?rev=1.1&content-type=text/plain
Index: digest-ksmserver-3.5.8-r1
===================================================================
MD5 9a0c6a4983427e41226dee8d0ce23369 kdebase-3.5-patchset-07.tar.bz2 22868
RMD160 37e81cd0bc3943cbbdc100634d79a8eeed73503b kdebase-3.5-patchset-07.tar.bz2 22868
SHA256 fca283e0719231b0716f333034e29727b4d1e1f30cead4e1ae1bca330f00c81b kdebase-3.5-patchset-07.tar.bz2 22868
MD5 9990c669229daaaa8fca4c5e354441fd kdebase-3.5.8.tar.bz2 24200172
RMD160 6441b5eaead5fff5c42c532fb11c0d37001cb6ea kdebase-3.5.8.tar.bz2 24200172
SHA256 0f1876d1c68f01ed8fee346c1bae4f53dd2c1dc56db94e309b3d1adfc6138493 kdebase-3.5.8.tar.bz2 24200172
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-11-03 22:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-03 22:58 [gentoo-commits] gentoo-x86 commit in kde-base/ksmserver/files: ksmserver-3.5.8-gdm_interop_197133.patch digest-ksmserver-3.5.8-r1 Wulf Krueger (philantrop)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox