Welcome to the wonderful
World of "post 911" border crossing nightmares.
You will get several answers to your question and all "may" be correct. However, what it comes down to is the "rules"'are open to the interpretation of the Coast guard or Border Patrol agent you're dealing with.
Always have your passport with you as well as another form of ID and be prepared for anything!