The National Defense Authorization Act does, in fact, include indefinite detention in there.
And, as we all complained about during the Bush years, the war against terrorism -- "hostilities" -- could ostensibly continue forever because there will always be terrorism and political/religious zealots who want to kill lots of people. Always.
By the way, yes, I horked the above passage from Greenwald's blog -- and he's correct about this section. It's right there in the conference report. As hyperbolic as some of the left-wing reactions have been, there's reason to be upset about this particular aspect of the bill.
The president shouldn't sign this bill into law -- that is unless he adds a signing statement that declares an end to the "war on terrorism."