* plugins.d/password-request.c (init_gnutls_global): Renamed "pubkeyfile" to "pubkeyfilename" and "seckeyfile" to "seckeyfilename". (combinepath): Changed to use asprintf instead of malloc and memcpy.
(main): Renamed "pubkeyfile" to "pubkeyname", renamed "seckeyfile" to "seckeyname" and created new non-const variables "pubkeyfilename" and "seckeyfilename".
* mandos (AvahiService.__init__): Bug fix: initialize "self.max_renames". (AvahiService.rename): Bug fix: use "self.name" instead of "name".