Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | From ef9580ea1e2f1e57af3c7dcb0ec392ba8dbb5c8d Mon Sep 17 00:00:00 2001 |
| 2 | From: Alex Kiernan <alex.kiernan@gmail.com> |
| 3 | Date: Tue, 10 Mar 2020 11:05:20 +0000 |
| 4 | Subject: [PATCH] Handle missing gshadow |
| 5 | |
| 6 | gshadow usage is now present in the userdb code. Mask all uses of it to |
| 7 | allow compilation on musl |
| 8 | |
| 9 | Upstream-Status: Inappropriate [musl specific] |
| 10 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> |
| 11 | --- |
| 12 | src/shared/group-record-nss.c | 20 ++++++++++++++++++++ |
| 13 | src/shared/group-record-nss.h | 4 ++++ |
| 14 | src/shared/userdb.c | 6 ++++++ |
| 15 | 3 files changed, 30 insertions(+) |
| 16 | |
Andrew Geissler | c3d88e4 | 2020-10-02 09:45:00 -0500 | [diff] [blame] | 17 | --- a/src/shared/group-record-nss.c |
| 18 | +++ b/src/shared/group-record-nss.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 19 | @@ -19,8 +19,10 @@ int nss_group_to_group_record( |
| 20 | if (isempty(grp->gr_name)) |
| 21 | return -EINVAL; |
| 22 | |
| 23 | +#if ENABLE_GSHADOW |
| 24 | if (sgrp && !streq_ptr(sgrp->sg_namp, grp->gr_name)) |
| 25 | return -EINVAL; |
| 26 | +#endif |
| 27 | |
| 28 | g = group_record_new(); |
| 29 | if (!g) |
| 30 | @@ -36,6 +38,7 @@ int nss_group_to_group_record( |
| 31 | |
| 32 | g->gid = grp->gr_gid; |
| 33 | |
| 34 | +#if ENABLE_GSHADOW |
| 35 | if (sgrp) { |
Andrew Geissler | c3d88e4 | 2020-10-02 09:45:00 -0500 | [diff] [blame] | 36 | if (looks_like_hashed_password(sgrp->sg_passwd)) { |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 37 | g->hashed_password = strv_new(sgrp->sg_passwd); |
| 38 | @@ -51,6 +54,7 @@ int nss_group_to_group_record( |
| 39 | if (!g->administrators) |
| 40 | return -ENOMEM; |
| 41 | } |
| 42 | +#endif |
| 43 | |
| 44 | r = json_build(&g->json, JSON_BUILD_OBJECT( |
| 45 | JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(g->group_name)), |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 46 | @@ -76,6 +80,7 @@ int nss_sgrp_for_group(const struct grou |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 47 | assert(ret_sgrp); |
| 48 | assert(ret_buffer); |
| 49 | |
| 50 | +#if ENABLE_GSHADOW |
| 51 | for (;;) { |
| 52 | _cleanup_free_ char *buf = NULL; |
| 53 | struct sgrp sgrp, *result; |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 54 | @@ -104,6 +109,9 @@ int nss_sgrp_for_group(const struct grou |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 55 | buflen *= 2; |
| 56 | buf = mfree(buf); |
| 57 | } |
| 58 | +#else |
| 59 | + return -ESRCH; |
| 60 | +#endif |
| 61 | } |
| 62 | |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 63 | int nss_group_record_by_name( |
| 64 | @@ -115,7 +123,9 @@ int nss_group_record_by_name( |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 65 | struct group grp, *result; |
| 66 | bool incomplete = false; |
| 67 | size_t buflen = 4096; |
| 68 | +#if ENABLE_GSHADOW |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 69 | struct sgrp sgrp, *sresult = NULL; |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 70 | +#endif |
| 71 | int r; |
| 72 | |
| 73 | assert(name); |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 74 | @@ -145,6 +155,7 @@ int nss_group_record_by_name( |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 75 | buf = mfree(buf); |
| 76 | } |
| 77 | |
| 78 | +#if ENABLE_GSHADOW |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 79 | if (with_shadow) { |
| 80 | r = nss_sgrp_for_group(result, &sgrp, &sbuf); |
| 81 | if (r < 0) { |
| 82 | @@ -156,6 +167,9 @@ int nss_group_record_by_name( |
| 83 | incomplete = true; |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 84 | |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 85 | r = nss_group_to_group_record(result, sresult, ret); |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 86 | +#else |
| 87 | + r = nss_group_to_group_record(result, NULL, ret); |
| 88 | +#endif |
| 89 | if (r < 0) |
| 90 | return r; |
| 91 | |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 92 | @@ -172,7 +186,9 @@ int nss_group_record_by_gid( |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 93 | struct group grp, *result; |
| 94 | bool incomplete = false; |
| 95 | size_t buflen = 4096; |
| 96 | +#if ENABLE_GSHADOW |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 97 | struct sgrp sgrp, *sresult = NULL; |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 98 | +#endif |
| 99 | int r; |
| 100 | |
| 101 | assert(ret); |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 102 | @@ -200,6 +216,7 @@ int nss_group_record_by_gid( |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 103 | buf = mfree(buf); |
| 104 | } |
| 105 | |
| 106 | +#if ENABLE_GSHADOW |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 107 | if (with_shadow) { |
| 108 | r = nss_sgrp_for_group(result, &sgrp, &sbuf); |
| 109 | if (r < 0) { |
| 110 | @@ -211,6 +228,9 @@ int nss_group_record_by_gid( |
| 111 | incomplete = true; |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 112 | |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 113 | r = nss_group_to_group_record(result, sresult, ret); |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 114 | +#else |
| 115 | + r = nss_group_to_group_record(result, NULL, ret); |
| 116 | +#endif |
| 117 | if (r < 0) |
| 118 | return r; |
| 119 | |
Andrew Geissler | c3d88e4 | 2020-10-02 09:45:00 -0500 | [diff] [blame] | 120 | --- a/src/shared/group-record-nss.h |
| 121 | +++ b/src/shared/group-record-nss.h |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 122 | @@ -2,7 +2,11 @@ |
| 123 | #pragma once |
| 124 | |
| 125 | #include <grp.h> |
| 126 | +#if ENABLE_GSHADOW |
| 127 | #include <gshadow.h> |
| 128 | +#else |
| 129 | +struct sgrp; |
| 130 | +#endif |
| 131 | |
| 132 | #include "group-record.h" |
| 133 | |
Andrew Geissler | c3d88e4 | 2020-10-02 09:45:00 -0500 | [diff] [blame] | 134 | --- a/src/shared/userdb.c |
| 135 | +++ b/src/shared/userdb.c |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 136 | @@ -930,13 +930,16 @@ int groupdb_iterator_get(UserDBIterator |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 137 | if (gr) { |
| 138 | _cleanup_free_ char *buffer = NULL; |
| 139 | bool incomplete = false; |
| 140 | +#if ENABLE_GSHADOW |
| 141 | struct sgrp sgrp; |
| 142 | +#endif |
| 143 | |
| 144 | if (streq_ptr(gr->gr_name, "root")) |
| 145 | iterator->synthesize_root = false; |
| 146 | if (gr->gr_gid == GID_NOBODY) |
| 147 | iterator->synthesize_nobody = false; |
| 148 | |
| 149 | +#if ENABLE_GSHADOW |
| 150 | r = nss_sgrp_for_group(gr, &sgrp, &buffer); |
| 151 | if (r < 0) { |
| 152 | log_debug_errno(r, "Failed to acquire shadow entry for group %s, ignoring: %m", gr->gr_name); |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 153 | @@ -944,6 +947,9 @@ int groupdb_iterator_get(UserDBIterator |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 154 | } |
| 155 | |
| 156 | r = nss_group_to_group_record(gr, r >= 0 ? &sgrp : NULL, ret); |
| 157 | +#else |
| 158 | + r = nss_group_to_group_record(gr, NULL, ret); |
| 159 | +#endif |
| 160 | if (r < 0) |
| 161 | return r; |
| 162 | |