| commit | 5f177b340501d99d1c05d2faad87cd74d9e12bfd | |
| author | Roland C. Dowdeswell <elric@imrryr.org> | |
| Thu, 5 Jan 2012 14:53:29 +0000 (5 09:53 -0500) | ||
| committer | Roland C. Dowdeswell <elric@imrryr.org> | |
| Thu, 5 Jan 2012 14:53:29 +0000 (5 09:53 -0500) | ||
| tree | a9ff0565ae9f41bc1cba2e538da194d415007a23 | treesnapshot (tar.gz zip) |
| parent | 32b0e7ce7b9107d7fa180dcef75f4b727de26614 | commitdiff |
| parent | 7d7624f7f746fe19bb96306a3bf4153f8126d56a | commitdiff |
Merge github.com:heimdal/heimdal
Conflicts:
lib/krb5/aname_to_localname.c
lib/krb5/principal.c
We backed out the internally deployed cdb an2ln lookups in preparation
for putting it back in as a plugin.
Conflicts:
lib/krb5/aname_to_localname.c
lib/krb5/principal.c
We backed out the internally deployed cdb an2ln lookups in preparation
for putting it back in as a plugin.
| lib/krb5/Makefile.am | diff1 | diff2 | blobhistory |