diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2018-10-22 22:34:13 +0200 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2020-08-05 22:54:35 +0300 |
commit | 53c24c85125de3084a1581e49516b7fbcceb0158 (patch) | |
tree | bf7cc0c95deb5395cfd6d6f5d651b3306d2ed935 | |
parent | Revert " * sysdeps/posix/getaddrinfo.c (gaih_inet): Only use gethostbyname4_r" (diff) | |
download | glibc-53c24c85125de3084a1581e49516b7fbcceb0158.tar.gz glibc-53c24c85125de3084a1581e49516b7fbcceb0158.tar.bz2 glibc-53c24c85125de3084a1581e49516b7fbcceb0158.zip |
Adapt to Gentoo-specific /etc/mail/aliases
Patch by pacho2
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
(cherry picked from commit 4e616cda056f471b799beba2b1cedc787ad4ecc0)
-rw-r--r-- | nss/nss_files/files-alias.c | 2 | ||||
-rw-r--r-- | nss/tst-nss-files-alias-leak.c | 18 | ||||
-rw-r--r-- | support/support_chroot.c | 8 |
3 files changed, 17 insertions, 11 deletions
diff --git a/nss/nss_files/files-alias.c b/nss/nss_files/files-alias.c index 43fb2c49a5..26b2cc86ad 100644 --- a/nss/nss_files/files-alias.c +++ b/nss/nss_files/files-alias.c @@ -50,7 +50,7 @@ internal_setent (FILE **stream) if (*stream == NULL) { - *stream = __nss_files_fopen ("/etc/aliases"); + *stream = __nss_files_fopen ("/etc/mail/aliases"); if (*stream == NULL) status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL; diff --git a/nss/tst-nss-files-alias-leak.c b/nss/tst-nss-files-alias-leak.c index daebbf4ed4..095bb753a6 100644 --- a/nss/tst-nss-files-alias-leak.c +++ b/nss/tst-nss-files-alias-leak.c @@ -45,27 +45,27 @@ prepare (int argc, char **argv) chroot_env = support_chroot_create ((struct support_chroot_configuration) { } ); - char *path = xasprintf ("%s/etc/aliases", chroot_env->path_chroot); + char *path = xasprintf ("%s/etc/mail/aliases", chroot_env->path_chroot); add_temp_file (path); support_write_file_string (path, - "user1: :include:/etc/aliases.user1\n" - "user2: :include:/etc/aliases.user2\n" - "comment: comment1, :include:/etc/aliases.comment\n" - "many: :include:/etc/aliases.many\n"); + "user1: :include:/etc/mail/aliases.user1\n" + "user2: :include:/etc/mail/aliases.user2\n" + "comment: comment1, :include:/etc/mail/aliases.comment\n" + "many: :include:/etc/mail/aliases.many\n"); free (path); - path = xasprintf ("%s/etc/aliases.user1", chroot_env->path_chroot); + path = xasprintf ("%s/etc/mail/aliases.user1", chroot_env->path_chroot); add_temp_file (path); support_write_file_string (path, "alias1\n"); free (path); - path = xasprintf ("%s/etc/aliases.user2", chroot_env->path_chroot); + path = xasprintf ("%s/etc/mail/aliases.user2", chroot_env->path_chroot); add_temp_file (path); support_write_file_string (path, "alias1a, alias2\n"); free (path); - path = xasprintf ("%s/etc/aliases.comment", chroot_env->path_chroot); + path = xasprintf ("%s/etc/mail/aliases.comment", chroot_env->path_chroot); add_temp_file (path); support_write_file_string (path, @@ -75,7 +75,7 @@ prepare (int argc, char **argv) "comment2\n"); free (path); - path = xasprintf ("%s/etc/aliases.many", chroot_env->path_chroot); + path = xasprintf ("%s/etc/mail/aliases.many", chroot_env->path_chroot); add_temp_file (path); FILE *fp = xfopen (path, "w"); for (int i = 0; i < many_aliases; ++i) diff --git a/support/support_chroot.c b/support/support_chroot.c index 4f435c1ac1..e7ca2c714b 100644 --- a/support/support_chroot.c +++ b/support/support_chroot.c @@ -52,13 +52,19 @@ support_chroot_create (struct support_chroot_configuration conf) xmkdir (path_etc, 0777); add_temp_file (path_etc); + /* Create the /etc/mail directory in the chroot environment. */ + char *path_etc_mail = xasprintf ("%s/etc/mail", chroot->path_chroot); + xmkdir (path_etc_mail, 0777); + add_temp_file (path_etc_mail); + write_file (path_etc, "resolv.conf", conf.resolv_conf, &chroot->path_resolv_conf); write_file (path_etc, "hosts", conf.hosts, &chroot->path_hosts); write_file (path_etc, "host.conf", conf.host_conf, &chroot->path_host_conf); - write_file (path_etc, "aliases", conf.aliases, &chroot->path_aliases); + write_file (path_etc_mail, "aliases", conf.aliases, &chroot->path_aliases); free (path_etc); + free (path_etc_mail); /* valgrind needs a temporary directory in the chroot. */ { |