diff options
| author | Khem Raj <raj.khem@gmail.com> | 2020-07-22 22:42:09 -0700 |
|---|---|---|
| committer | Noel Power <npower@samba.org> | 2020-07-28 10:52:00 +0000 |
| commit | 6e496aa3635557b59792e469f7c7f8eccd822322 (patch) | |
| tree | 2162da5bb5b96c8afcc94906d0848c4eba19a262 | |
| parent | 642dc6ded6426ba2fbf3ac1e5cd71aae11ca245b (diff) | |
| download | samba-6e496aa3635557b59792e469f7c7f8eccd822322.tar.gz | |
nsswitch/nsstest.c: Avoid nss function conflicts with glibc nss.h
glibc 2.32 will define these varibles [1] which results in conflicts
with these static function names, therefore prefix these function names
with samba_ to avoid it
[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=499a92df8b9fc64a054cf3b7f728f8967fc1da7d
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Noel Power <npower@samba.org>
Autobuild-User(master): Noel Power <npower@samba.org>
Autobuild-Date(master): Tue Jul 28 10:52:00 UTC 2020 on sn-devel-184
| -rw-r--r-- | nsswitch/nsstest.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nsswitch/nsstest.c b/nsswitch/nsstest.c index e8c4306441d..e2ee9fbf3af 100644 --- a/nsswitch/nsstest.c +++ b/nsswitch/nsstest.c @@ -137,7 +137,7 @@ static struct passwd *nss_getpwuid(uid_t uid) return &pwd; } -static void nss_setpwent(void) +static void samba_nss_setpwent(void) { NSS_STATUS (*_nss_setpwent)(void) = (NSS_STATUS(*)(void))find_fn("setpwent"); @@ -152,7 +152,7 @@ static void nss_setpwent(void) } } -static void nss_endpwent(void) +static void samba_nss_endpwent(void) { NSS_STATUS (*_nss_endpwent)(void) = (NSS_STATUS (*)(void))find_fn("endpwent"); @@ -290,7 +290,7 @@ again: return &grp; } -static void nss_setgrent(void) +static void samba_nss_setgrent(void) { NSS_STATUS (*_nss_setgrent)(void) = (NSS_STATUS (*)(void))find_fn("setgrent"); @@ -305,7 +305,7 @@ static void nss_setgrent(void) } } -static void nss_endgrent(void) +static void samba_nss_endgrent(void) { NSS_STATUS (*_nss_endgrent)(void) = (NSS_STATUS (*)(void))find_fn("endgrent"); @@ -402,7 +402,7 @@ static void nss_test_users(void) { struct passwd *pwd; - nss_setpwent(); + samba_nss_setpwent(); /* loop over all users */ while ((pwd = nss_getpwent())) { printf("Testing user %s\n", pwd->pw_name); @@ -424,14 +424,14 @@ static void nss_test_users(void) printf("initgroups: "); nss_test_initgroups(pwd->pw_name, pwd->pw_gid); printf("\n"); } - nss_endpwent(); + samba_nss_endpwent(); } static void nss_test_groups(void) { struct group *grp; - nss_setgrent(); + samba_nss_setgrent(); /* loop over all groups */ while ((grp = nss_getgrent())) { printf("Testing group %s\n", grp->gr_name); @@ -452,7 +452,7 @@ static void nss_test_groups(void) printf("getgrgid: "); print_group(grp); printf("\n"); } - nss_endgrent(); + samba_nss_endgrent(); } static void nss_test_errors(void) |