Mercurial Mercurial > upstream > oracle > x-cons > x-s11-update-clone / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
open-src/app/xdm/bug-6822636.patch
author X gate hg captive account <xhg@xserver.us.oracle.com>
Wed, 19 Aug 2015 13:48:41 -0700
changeset 1484 bc8922b8e1d2
parent 930 1d5fde7d897b
permissions -rw-r--r--
Added tag s11u3_30 for changeset 221e9d9cc9cb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
930
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
     1
 
--- greeter/Login.c-orig	Tue Mar 23 22:11:38 2010
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
     2
 
+++ greeter/Login.c	Tue Mar 23 22:12:41 2010
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
     3
 
@@ -766,20 +766,8 @@
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
     4
 
     }
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
     5
 
     RedrawFail (w);
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
     6
 
     XorCursor (w);
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
     7
 
-    /*
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
     8
 
-     * The GrabKeyboard here is needed only because of
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
     9
 
-     * a bug in the R3 server -- the keyboard is grabbed on
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
    10
 
-     * the root window, and the server won't dispatch events
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
    11
 
-     * to the focus window unless the focus window is a ancestor
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
    12
 
-     * of the grab window.  Bug in server already found and fixed,
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
    13
 
-     * compatibility until at least R4.
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
    14
 
-     */
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
    15
 
-    if (XGrabKeyboard (XtDisplay (w), XtWindow (w), False, GrabModeAsync,
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
    16
 
-		       GrabModeAsync, CurrentTime) != GrabSuccess)
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
    17
 
-    {
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
    18
 
-	XSetInputFocus (XtDisplay (w), XtWindow (w),
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
    19
 
-			RevertToPointerRoot, CurrentTime);
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
    20
 
-    }
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
    21
 
+    XSetInputFocus (XtDisplay (w), XtWindow (w),
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
    22
 
+		RevertToPointerRoot, CurrentTime);
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
    23
 
 }
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
    24
1d5fde7d897b 6822636 xdm: Xterminals unable to login via XDM due to possible race condition - Sol 10
Naveen Gundlagutta <Naveen.Gundlagutta@Sun.COM>
parents:
diff changeset 
    25
 
 /* Returns 0 on success, -1 on failure */
upstream/oracle/x-cons/x-s11-update-clone