On Thu, 16.10.14 16:59, WaLyong Cho (walyong....@samsung.com) wrote: > - if (smack_label_ip_in_fd(fd, s->smack_ip_in) < 0) > - log_error_unit(UNIT(s)->id, "smack_label_ip_in_fd: > %m"); > + if (mac_smack_ip_in_fd(fd, s->smack_ip_in) < 0) > + log_error_unit(UNIT(s)->id, > - "mac_smack_ip_in_fd: %m");
I think this call should still contern a verb of some kind, do indicate what it does. mac_smack_label_ip_in_fd() or even mac_smack_relabel_ip_in_fd() or so? > --- a/src/resolve/resolved-dns-domain.c > +++ b/src/resolve/resolved-dns-domain.c > @@ -169,7 +169,7 @@ int dns_label_escape(const char *p, size_t l, char **ret) > { > return r; > } > > -int dns_label_apply_idna(const char *encoded, size_t encoded_size, char > *decoded, size_t decoded_max) { > +int dns_mac_selinux_apply_idna(const char *encoded, size_t > encoded_size, char *decoded, size_t decoded_max) { THis looks like a copy/past error. This is not a security label here, but just a part of a DNS domain.... Otherwise looks good! Could you please fix and rebase the series? I promise I will merge this quickly now, sorry reviewing this so slowly! It must have been awful constantly rebasing this without getting this merged! Sorry for that! Lennart -- Lennart Poettering, Red Hat _______________________________________________ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel