r19134: Merge the second set of C++ warning fixes from Samba3. I'll leave r19132 to