I haven't lived there in almost 15 years. I stand corrected. In fact I'm closer in time to having lived in Spain than in Portugal, that must be the origin of my confusion.

In any case, I hope you agree my description of the GNR was accurate in substance.

Yes you are correct. They also patrol some highways (although I believe some are the jurisdiction of PSP)