pull up r22056, r22057 from trunk

 ------------------------------------------------------------------------
 r22057 | hartmans | 2009-02-26 15:32:35 -0500 (Thu, 26 Feb 2009) | 3 lines
 Changed paths:
    M /trunk/src/lib/krb5/krb/copy_auth.c

 ticket: 6400

 krb5_merge_authdata  should initialize output on failure.
 ------------------------------------------------------------------------
 r22056 | hartmans | 2009-02-26 15:07:05 -0500 (Thu, 26 Feb 2009) | 11 lines
 Changed paths:
    M /trunk/src/include/krb5/krb5.hin
    M /trunk/src/lib/gssapi/krb5/accept_sec_context.c
    M /trunk/src/lib/krb5/krb/copy_auth.c
    M /trunk/src/lib/krb5/libkrb5.exports

 Subject: Include authenticator and ticket authdata in gss-api
 ticket: 6400
 Target_version: 1.7
 Tags: pullup

 Currently, the GSS-API routines for handling authdata only extract the
 authorization data from the ticket, not that from the authenticator.
 This is incorrect.  Introduce a new function krb5_merge_authadata to
 merge two authdata arrays into a newly allocated result array.  Use
 this function in accept_sec_context.c to include both sets of
 authdata.
 ------------------------------------------------------------------------

https://github.com/krb5/krb5/commit/a76b24648a9771b1d965833e8c262c399db17ef7
Commit By: tlyu
Revision: 22212
Changed Files:
U   branches/krb5-1-7/src/include/krb5/krb5.hin
U   branches/krb5-1-7/src/lib/gssapi/krb5/accept_sec_context.c
U   branches/krb5-1-7/src/lib/krb5/krb/copy_auth.c
U   branches/krb5-1-7/src/lib/krb5/libkrb5.exports