Sounds like the CSD was quite appropriate. He didn't know the OP was right there. He expressed his annoyance in front of the employees, but kept a professional front before the passenger (or so at least he thought).