sync with CUPS changes in SAMBA_3_0