The House of Representatives just passed a FISA measure that does not include immunity for telecommunications companies involved in warrantless surveillance. It does allow these companies to produce, in court, documents which would allow for a legal determination of the legitimacy of the claims filed against them.
