Accepting request 195901 from X11:XOrg

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/195901
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xdm?expand=0&rev=20
This commit is contained in:
Tomáš Chvátal 2013-08-23 09:08:54 +00:00 committed by Git OBS Bridge
commit 5bd7bcd242
2 changed files with 8 additions and 6 deletions

View File

@ -47,8 +47,7 @@ Index: xdm-1.1.10/session.c
SessionExit (d, RESERVER_DISPLAY, FALSE); SessionExit (d, RESERVER_DISPLAY, FALSE);
} }
Debug ("XGrabKeyboard succeeded %s\n", d->name); Debug ("XGrabKeyboard succeeded %s\n", d->name);
@@ -515,8 +520,7 @@ UnsecureDisplay (struct display *d, Disp @@ -516,7 +521,6 @@ UnsecureDisplay (struct display *d, Disp
}
void void
-SessionExit (struct display *d, int status, int removeAuth) -SessionExit (struct display *d, int status, int removeAuth)
@ -57,10 +56,7 @@ Index: xdm-1.1.10/session.c
#ifdef USE_PAM #ifdef USE_PAM
pam_handle_t *pamh = thepamh(); pam_handle_t *pamh = thepamh();
@@ -527,7 +531,11 @@ SessionExit (struct display *d, int stat @@ -530,4 +534,8 @@ SessionExit (struct display *d, int stat
pamh = NULL;
}
#endif
+} +}
+void +void

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Aug 13 16:35:01 UTC 2013 - sndirsch@suse.com
- adjusted u_xdm-sig11-bug-598422.diff for openSUSE 12.2 build
(which still applies xdm-consolekit.diff)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 29 09:25:40 UTC 2013 - sndirsch@suse.com Mon Jul 29 09:25:40 UTC 2013 - sndirsch@suse.com