Serverd fixes

This is the portion of my huge clean-ups branch that touches cf-serverd/, FAO @jimis.
Compiler warns me where I assign `enterprise_field = 'c'` below - fixing; should of course be `*enterprise_field = 'c'`