Wikipedia at least says you're right -- he was a Naval Aviator and test pilot, but must have left the service when he went to NASA.