Managed to survive a code review of my winbind sources from tridge.
It's amazing how he found all the little niggling things that I was slightly worried about them and propose elegant solutions to all of them.
I'm sure I'll get everything compiling again soon...