r5126: the composite code is no longer client specific or smb specific, so