diff --git a/79b48745f55cc4947b437f0f1912cbad51eade63.patch b/79b48745f55cc4947b437f0f1912cbad51eade63.patch new file mode 100644 index 0000000..58054b2 --- /dev/null +++ b/79b48745f55cc4947b437f0f1912cbad51eade63.patch @@ -0,0 +1,204 @@ +From 79b48745f55cc4947b437f0f1912cbad51eade63 Mon Sep 17 00:00:00 2001 +From: Samuel Cabrero +Date: Mon, 11 Nov 2019 18:31:17 +0100 +Subject: [PATCH] nwrap: Use size_t for iterations, can't be negative + +Signed-off-by: Samuel Cabrero +Reviewed-by: Andreas Schneider +--- + src/nss_wrapper.c | 46 ++++++++++++++++++++++++++-------------------- + 1 file changed, 26 insertions(+), 20 deletions(-) + +diff --git a/src/nss_wrapper.c b/src/nss_wrapper.c +index 9b3e180..ff41eeb 100644 +--- a/src/nss_wrapper.c ++++ b/src/nss_wrapper.c +@@ -625,7 +625,7 @@ struct nwrap_libc { + }; + + struct nwrap_main { +- int num_backends; ++ size_t num_backends; + struct nwrap_backend *backends; + struct nwrap_libc *libc; + }; +@@ -1559,7 +1559,7 @@ static void *nwrap_load_module(const char *so_path) + static bool nwrap_module_init(const char *name, + struct nwrap_ops *ops, + const char *so_path, +- int *num_backends, ++ size_t *num_backends, + struct nwrap_backend **backends) + { + struct nwrap_backend *b; +@@ -4634,7 +4634,7 @@ again: + + static struct passwd *nwrap_getpwnam(const char *name) + { +- int i; ++ size_t i; + struct passwd *pwd; + + for (i=0; i < nwrap_main_global->num_backends; i++) { +@@ -4664,7 +4664,8 @@ struct passwd *getpwnam(const char *name) + static int nwrap_getpwnam_r(const char *name, struct passwd *pwdst, + char *buf, size_t buflen, struct passwd **pwdstp) + { +- int i,ret; ++ size_t i; ++ int ret; + + for (i=0; i < nwrap_main_global->num_backends; i++) { + struct nwrap_backend *b = &nwrap_main_global->backends[i]; +@@ -4701,7 +4702,7 @@ int getpwnam_r(const char *name, struct passwd *pwdst, + + static struct passwd *nwrap_getpwuid(uid_t uid) + { +- int i; ++ size_t i; + struct passwd *pwd; + + for (i=0; i < nwrap_main_global->num_backends; i++) { +@@ -4731,7 +4732,8 @@ struct passwd *getpwuid(uid_t uid) + static int nwrap_getpwuid_r(uid_t uid, struct passwd *pwdst, + char *buf, size_t buflen, struct passwd **pwdstp) + { +- int i,ret; ++ size_t i; ++ int ret; + + for (i=0; i < nwrap_main_global->num_backends; i++) { + struct nwrap_backend *b = &nwrap_main_global->backends[i]; +@@ -4766,7 +4768,7 @@ int getpwuid_r(uid_t uid, struct passwd *pwdst, + + static void nwrap_setpwent(void) + { +- int i; ++ size_t i; + + for (i=0; i < nwrap_main_global->num_backends; i++) { + struct nwrap_backend *b = &nwrap_main_global->backends[i]; +@@ -4790,7 +4792,7 @@ void setpwent(void) + + static struct passwd *nwrap_getpwent(void) + { +- int i; ++ size_t i; + struct passwd *pwd; + + for (i=0; i < nwrap_main_global->num_backends; i++) { +@@ -4821,7 +4823,8 @@ struct passwd *getpwent(void) + static int nwrap_getpwent_r(struct passwd *pwdst, char *buf, + size_t buflen, struct passwd **pwdstp) + { +- int i,ret; ++ size_t i; ++ int ret; + + for (i=0; i < nwrap_main_global->num_backends; i++) { + struct nwrap_backend *b = &nwrap_main_global->backends[i]; +@@ -4870,7 +4873,7 @@ int getpwent_r(struct passwd *pwdst, char *buf, + + static void nwrap_endpwent(void) + { +- int i; ++ size_t i; + + for (i=0; i < nwrap_main_global->num_backends; i++) { + struct nwrap_backend *b = &nwrap_main_global->backends[i]; +@@ -4894,7 +4897,7 @@ void endpwent(void) + + static int nwrap_initgroups(const char *user, gid_t group) + { +- int i; ++ size_t i; + + for (i=0; i < nwrap_main_global->num_backends; i++) { + struct nwrap_backend *b = &nwrap_main_global->backends[i]; +@@ -4925,7 +4928,7 @@ int initgroups(const char *user, gid_t group) + + static struct group *nwrap_getgrnam(const char *name) + { +- int i; ++ size_t i; + struct group *grp; + + for (i=0; i < nwrap_main_global->num_backends; i++) { +@@ -4955,7 +4958,8 @@ struct group *getgrnam(const char *name) + static int nwrap_getgrnam_r(const char *name, struct group *grdst, + char *buf, size_t buflen, struct group **grdstp) + { +- int i, ret; ++ size_t i; ++ int ret; + + for (i=0; i < nwrap_main_global->num_backends; i++) { + struct nwrap_backend *b = &nwrap_main_global->backends[i]; +@@ -4996,7 +5000,7 @@ int getgrnam_r(const char *name, struct group *grp, + + static struct group *nwrap_getgrgid(gid_t gid) + { +- int i; ++ size_t i; + struct group *grp; + + for (i=0; i < nwrap_main_global->num_backends; i++) { +@@ -5026,7 +5030,8 @@ struct group *getgrgid(gid_t gid) + static int nwrap_getgrgid_r(gid_t gid, struct group *grdst, + char *buf, size_t buflen, struct group **grdstp) + { +- int i,ret; ++ size_t i; ++ int ret; + + for (i=0; i < nwrap_main_global->num_backends; i++) { + struct nwrap_backend *b = &nwrap_main_global->backends[i]; +@@ -5063,7 +5068,7 @@ int getgrgid_r(gid_t gid, struct group *grdst, + + static void nwrap_setgrent(void) + { +- int i; ++ size_t i; + + for (i=0; i < nwrap_main_global->num_backends; i++) { + struct nwrap_backend *b = &nwrap_main_global->backends[i]; +@@ -5098,7 +5103,7 @@ out: + + static struct group *nwrap_getgrent(void) + { +- int i; ++ size_t i; + struct group *grp; + + for (i=0; i < nwrap_main_global->num_backends; i++) { +@@ -5129,7 +5134,8 @@ struct group *getgrent(void) + static int nwrap_getgrent_r(struct group *grdst, char *buf, + size_t buflen, struct group **grdstp) + { +- int i,ret; ++ size_t i; ++ int ret; + + for (i=0; i < nwrap_main_global->num_backends; i++) { + struct nwrap_backend *b = &nwrap_main_global->backends[i]; +@@ -5179,7 +5185,7 @@ int getgrent_r(struct group *src, char *buf, + + static void nwrap_endgrent(void) + { +- int i; ++ size_t i; + + for (i=0; i < nwrap_main_global->num_backends; i++) { + struct nwrap_backend *b = &nwrap_main_global->backends[i]; +@@ -6059,7 +6065,7 @@ void nwrap_constructor(void) + */ + void nwrap_destructor(void) + { +- int i; ++ size_t i; + + NWRAP_LOCK_ALL; + if (nwrap_main_global != NULL) { +-- +2.22.0 + diff --git a/nss_wrapper.spec b/nss_wrapper.spec index 41123bc..cfda4b8 100644 --- a/nss_wrapper.spec +++ b/nss_wrapper.spec @@ -1,6 +1,6 @@ Name: nss_wrapper Version: 1.1.7 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Summary: A wrapper for the user, group and hosts NSS API @@ -10,6 +10,8 @@ Source0: https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz Source1: https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz.asc Source2: nss_wrapper.keyring +Patch0: https://gitlab.com/cwrap/nss_wrapper/commit/79b48745f55cc4947b437f0f1912cbad51eade63.patch + BuildRequires: cmake BuildRequires: gcc BuildRequires: gnupg2 @@ -85,6 +87,9 @@ popd %{_mandir}/man1/nss_wrapper.1* %changelog +* Mon Nov 18 2019 Andreas Schneider - 1.1.7-2 +- resolves: #1772368 - Incorrect path in pkg-config file + * Wed Nov 13 2019 Andreas Schneider - 1.1.7-1 - Update to version 1.1.7