The leak was from Pakistan.
Discussed here. You can read the original Salon article if you are willing to sit through an advertisement.
The lie that the Bush administration was the original source of the leak made it around the world quite quickly. Don't expect this correction to spread that fast.
As for the comment that we shouldn't be "subcontracting" the search for terrorists in Pakistan, what's the alternative? American divisions running around western Pakistan? Yeah, that'll work.