r21622: Fix bad merge caught by James.
commit9b568ecdc42226e148089c35899f7b0c5dc834f0
authorGerald Carter <jerry@samba.org>
Thu, 1 Mar 2007 04:58:52 +0000 (1 04:58 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 17:18:18 +0000 (10 12:18 -0500)
tree4c653e49f907bffe6b39a299b8cb1dedd382ee79
parentb1f4259cd5ecebfe7e4c4eb73aa32e1ed9b366b8
r21622: Fix bad merge caught by James.
(This used to be commit 05886edb3559355e8cd3e3eb8999f24b64ddb3eb)
source3/nsswitch/winbindd_cred_cache.c