[PATCH app/xauth 0/2] Fix xauth interaction with wildcard entries.

[Michal Srb]

These patches attempt to fix how 'xauth add' and 'xauth merge' interacts with
FamilyWild entries and entries with no display number.

Ultimately it is attempt to fix this downstream bug:
https://bugzilla.opensuse.org/show_bug.cgi?id=1083869

The problem in that bug is that GDM creates Xauthority file that contains
FamilyWild entry with no display number. This matches everything. That works as
long as the Xauthority file is used for only one X server. But if user uses the
vncserver script, it tries to add additional record using the xauth command.
This record gets "merged" with the wildcard record and replaces it.

Since wildcard entries and entries with no display numbers are valid (see email
"Is xauth entry without display number valid?" on xorg at lists.x.org), lets fix
how the merge works and sort the entries from most specific to most generic.

Michal Srb (2):
  Merge only entries with equal dpy and protoname.
  Sort entries from most specific to most generic.

 process.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 51 insertions(+), 15 deletions(-)

-- 
2.13.6