Still not far enough. I believe that unless it's a uniformed officer and they have very obvious probable cause, or it's two officers in uniform with a search warrant, then they can just stay the hell out until a supervisor comes.
Says a lot about the state of our nation when you have to fight for the “right” to resist an unlawful entry into your home or onto your property (or at least what appears to you to be unlawful) by purported “law enforcement officers.” We are further down the road into a police state than most people want to believe.
