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 | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 17 | Index: systemd-stable/src/shared/group-record-nss.c |
| 18 | =================================================================== |
| 19 | --- systemd-stable.orig/src/shared/group-record-nss.c |
| 20 | +++ systemd-stable/src/shared/group-record-nss.c |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 21 | @@ -19,8 +19,10 @@ int nss_group_to_group_record( |
| 22 | if (isempty(grp->gr_name)) |
| 23 | return -EINVAL; |
| 24 | |
| 25 | +#if ENABLE_GSHADOW |
| 26 | if (sgrp && !streq_ptr(sgrp->sg_namp, grp->gr_name)) |
| 27 | return -EINVAL; |
| 28 | +#endif |
| 29 | |
| 30 | g = group_record_new(); |
| 31 | if (!g) |
| 32 | @@ -36,6 +38,7 @@ int nss_group_to_group_record( |
| 33 | |
| 34 | g->gid = grp->gr_gid; |
| 35 | |
| 36 | +#if ENABLE_GSHADOW |
| 37 | if (sgrp) { |
| 38 | if (hashed_password_valid(sgrp->sg_passwd)) { |
| 39 | g->hashed_password = strv_new(sgrp->sg_passwd); |
| 40 | @@ -51,6 +54,7 @@ int nss_group_to_group_record( |
| 41 | if (!g->administrators) |
| 42 | return -ENOMEM; |
| 43 | } |
| 44 | +#endif |
| 45 | |
| 46 | r = json_build(&g->json, JSON_BUILD_OBJECT( |
| 47 | JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(g->group_name)), |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 48 | @@ -76,6 +80,7 @@ int nss_sgrp_for_group(const struct grou |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 49 | assert(ret_sgrp); |
| 50 | assert(ret_buffer); |
| 51 | |
| 52 | +#if ENABLE_GSHADOW |
| 53 | for (;;) { |
| 54 | _cleanup_free_ char *buf = NULL; |
| 55 | struct sgrp sgrp, *result; |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 56 | @@ -104,6 +109,9 @@ int nss_sgrp_for_group(const struct grou |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 57 | buflen *= 2; |
| 58 | buf = mfree(buf); |
| 59 | } |
| 60 | +#else |
| 61 | + return -ESRCH; |
| 62 | +#endif |
| 63 | } |
| 64 | |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 65 | int nss_group_record_by_name( |
| 66 | @@ -115,7 +123,9 @@ int nss_group_record_by_name( |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 67 | struct group grp, *result; |
| 68 | bool incomplete = false; |
| 69 | size_t buflen = 4096; |
| 70 | +#if ENABLE_GSHADOW |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 71 | struct sgrp sgrp, *sresult = NULL; |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 72 | +#endif |
| 73 | int r; |
| 74 | |
| 75 | assert(name); |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 76 | @@ -145,6 +155,7 @@ int nss_group_record_by_name( |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 77 | buf = mfree(buf); |
| 78 | } |
| 79 | |
| 80 | +#if ENABLE_GSHADOW |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 81 | if (with_shadow) { |
| 82 | r = nss_sgrp_for_group(result, &sgrp, &sbuf); |
| 83 | if (r < 0) { |
| 84 | @@ -156,6 +167,9 @@ int nss_group_record_by_name( |
| 85 | incomplete = true; |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 86 | |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 87 | r = nss_group_to_group_record(result, sresult, ret); |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 88 | +#else |
| 89 | + r = nss_group_to_group_record(result, NULL, ret); |
| 90 | +#endif |
| 91 | if (r < 0) |
| 92 | return r; |
| 93 | |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 94 | @@ -172,7 +186,9 @@ int nss_group_record_by_gid( |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 95 | struct group grp, *result; |
| 96 | bool incomplete = false; |
| 97 | size_t buflen = 4096; |
| 98 | +#if ENABLE_GSHADOW |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 99 | struct sgrp sgrp, *sresult = NULL; |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 100 | +#endif |
| 101 | int r; |
| 102 | |
| 103 | assert(ret); |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 104 | @@ -200,6 +216,7 @@ int nss_group_record_by_gid( |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 105 | buf = mfree(buf); |
| 106 | } |
| 107 | |
| 108 | +#if ENABLE_GSHADOW |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 109 | if (with_shadow) { |
| 110 | r = nss_sgrp_for_group(result, &sgrp, &sbuf); |
| 111 | if (r < 0) { |
| 112 | @@ -211,6 +228,9 @@ int nss_group_record_by_gid( |
| 113 | incomplete = true; |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 114 | |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 115 | r = nss_group_to_group_record(result, sresult, ret); |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 116 | +#else |
| 117 | + r = nss_group_to_group_record(result, NULL, ret); |
| 118 | +#endif |
| 119 | if (r < 0) |
| 120 | return r; |
| 121 | |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 122 | Index: systemd-stable/src/shared/group-record-nss.h |
| 123 | =================================================================== |
| 124 | --- systemd-stable.orig/src/shared/group-record-nss.h |
| 125 | +++ systemd-stable/src/shared/group-record-nss.h |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 126 | @@ -2,7 +2,11 @@ |
| 127 | #pragma once |
| 128 | |
| 129 | #include <grp.h> |
| 130 | +#if ENABLE_GSHADOW |
| 131 | #include <gshadow.h> |
| 132 | +#else |
| 133 | +struct sgrp; |
| 134 | +#endif |
| 135 | |
| 136 | #include "group-record.h" |
| 137 | |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame^] | 138 | Index: systemd-stable/src/shared/userdb.c |
| 139 | =================================================================== |
| 140 | --- systemd-stable.orig/src/shared/userdb.c |
| 141 | +++ systemd-stable/src/shared/userdb.c |
| 142 | @@ -930,13 +930,16 @@ int groupdb_iterator_get(UserDBIterator |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 143 | if (gr) { |
| 144 | _cleanup_free_ char *buffer = NULL; |
| 145 | bool incomplete = false; |
| 146 | +#if ENABLE_GSHADOW |
| 147 | struct sgrp sgrp; |
| 148 | +#endif |
| 149 | |
| 150 | if (streq_ptr(gr->gr_name, "root")) |
| 151 | iterator->synthesize_root = false; |
| 152 | if (gr->gr_gid == GID_NOBODY) |
| 153 | iterator->synthesize_nobody = false; |
| 154 | |
| 155 | +#if ENABLE_GSHADOW |
| 156 | r = nss_sgrp_for_group(gr, &sgrp, &buffer); |
| 157 | if (r < 0) { |
| 158 | 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^] | 159 | @@ -944,6 +947,9 @@ int groupdb_iterator_get(UserDBIterator |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 160 | } |
| 161 | |
| 162 | r = nss_group_to_group_record(gr, r >= 0 ? &sgrp : NULL, ret); |
| 163 | +#else |
| 164 | + r = nss_group_to_group_record(gr, NULL, ret); |
| 165 | +#endif |
| 166 | if (r < 0) |
| 167 | return r; |
| 168 | |