xauth: Changes to 'master'

[GitLab Mirror]

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

New commits:
commit 42239054b088dcdfc637880a8edf39b841c5ea51
Author: Michal Srb <msrb at suse.com>
Date:   Thu May 31 15:12:36 2018 +0200

    Sort entries from most specific to most generic.
    
    There is no point in adding entry or merging lists if a FamilyWild entry would
    end in front of any entry, or entry without display number would end in front
    of entry with number.
    
    This sorts all entries in order:
      * FamilyWild without display number
      * FamilyWild with display number
      * Other family without display number
      * Other family with display number
    
    The order of the entries in each category is kept.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 06a21f7c3d5eb5dc9a86418e87946cc7ac83e437
Author: Michal Srb <msrb at suse.com>
Date:   Thu May 31 15:12:35 2018 +0200

    Merge only entries with equal dpy and protoname.
    
    Merging two lists, or adding entry a into list acts unexpectedly if the list
    contains FamilyWild or entry with an empty display numbers. For example:
    
      > xauth list
      #ffff#6f70656e737573652d74756d626c6577656564#:  MIT-MAGIC-COOKIE-1  1500d80327733252cc42ba469138a259
    
      > xauth add test/unix:2 MIT-MAGIC-COOKIE-1 aabbccddeeff00112233445566778899
      > xauth list
      test/unix:2  MIT-MAGIC-COOKIE-1  aabbccddeeff00112233445566778899
    
    This is because merge_entries compares entries using `match_auth`, which
    follows the same rules as XauGetBestAuthByAddr. Following these rules is good
    when filtering the output of `xauth list`, but for merging we should compare
    for equality. It used to be done that way before commit 1555fff4. That commit
    changed it to improve the `xauth list` behavior, but did not seem consider the
    impact on merge.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>