| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 1 | From fcb8ecd530b2d151e373974741601483326f7528 Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Thu, 27 Jun 2019 11:09:47 +0800 |
| 4 | Subject: [PATCH] samba: fix musl lib without innetgr |
| 5 | |
| 6 | Upstream-Status: Pending |
| 7 | |
| 8 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 9 | --- |
| 10 | lib/util/access.c | 2 +- |
| 11 | source3/auth/user_util.c | 2 +- |
| 12 | 2 file changed, 2 insertion(+), 2 deletion(-) |
| 13 | |
| 14 | diff --git a/lib/util/access.c b/lib/util/access.c |
| 15 | index 7da0573..b94949e 100644 |
| 16 | --- a/lib/util/access.c |
| 17 | +++ b/lib/util/access.c |
| 18 | @@ -112,7 +112,7 @@ static bool string_match(const char *tok,const char *s) |
| 19 | return true; |
| 20 | } |
| 21 | } else if (tok[0] == '@') { /* netgroup: look it up */ |
| 22 | -#ifdef HAVE_NETGROUP |
| 23 | +#if defined(HAVE_NETGROUP) && defined(HAVE_INNETGR) |
| 24 | DATA_BLOB tmp; |
| 25 | char *mydomain = NULL; |
| 26 | char *hostname = NULL; |
| 27 | diff --git a/source3/auth/user_util.c b/source3/auth/user_util.c |
| 28 | index a76b5d4..30f523d 100644 |
| 29 | --- a/source3/auth/user_util.c |
| 30 | +++ b/source3/auth/user_util.c |
| 31 | @@ -148,7 +148,7 @@ static void store_map_in_gencache(TALLOC_CTX *ctx, const char *from, const char |
| 32 | |
| 33 | bool user_in_netgroup(TALLOC_CTX *ctx, const char *user, const char *ngname) |
| 34 | { |
| 35 | -#ifdef HAVE_NETGROUP |
| 36 | +#if defined(HAVE_NETGROUP) && defined(HAVE_INNETGR) |
| 37 | static char *my_yp_domain = NULL; |
| 38 | char *lowercase_user = NULL; |
| 39 | |
| 40 | -- |
| 41 | 2.7.4 |
| 42 | |