ignore getgrgid() errors for now

This commit is contained in:
Tomas Mraz 2014-07-02 13:30:31 +02:00
parent dad42cc2f5
commit efff9fe79f
2 changed files with 7 additions and 4 deletions

View file

@ -158,9 +158,9 @@ index 05f5622edb79069d9a43d3f9c69a463b6b71141a..25900dd12874e46e5efdfcf7c895f6b8
+ /* getgrgid() was NULL, check whether this was + /* getgrgid() was NULL, check whether this was
+ * due to an error, so we can report it. + * due to an error, so we can report it.
+ */ + */
+ if (errno != 0) { + /* ignore errors for now * if (errno != 0) {
+ return errno; + return errno;
+ } + } */
+ } + }
+ +
+ /* If we've made it here, the GID must be available */ + /* If we've made it here, the GID must be available */
@ -228,7 +228,7 @@ index 05f5622edb79069d9a43d3f9c69a463b6b71141a..25900dd12874e46e5efdfcf7c895f6b8
+ /* + /*
+ * Make sure the GID isn't queued for use already + * Make sure the GID isn't queued for use already
+ */ + */
+ if (gr_locate_gid (preferred_gid) == NULL) { + if (gr_locate_gid (*preferred_gid) == NULL) {
+ *gid = *preferred_gid; + *gid = *preferred_gid;
+ return 0; + return 0;
+ } + }

View file

@ -1,7 +1,7 @@
Summary: Utilities for managing accounts and shadow password files Summary: Utilities for managing accounts and shadow password files
Name: shadow-utils Name: shadow-utils
Version: 4.1.5.1 Version: 4.1.5.1
Release: 12%{?dist} Release: 13%{?dist}
Epoch: 2 Epoch: 2
URL: http://pkg-shadow.alioth.debian.org/ URL: http://pkg-shadow.alioth.debian.org/
Source0: http://pkg-shadow.alioth.debian.org/releases/shadow-%{version}.tar.bz2 Source0: http://pkg-shadow.alioth.debian.org/releases/shadow-%{version}.tar.bz2
@ -224,6 +224,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/vigr.8* %{_mandir}/man8/vigr.8*
%changelog %changelog
* Mon Jun 30 2014 Tomas Mraz <tmraz@redhat.com> - 2:4.1.5.1-13
- ignore getgrgid() errors for now
* Mon Jun 30 2014 Tomas Mraz <tmraz@redhat.com> - 2:4.1.5.1-12 * Mon Jun 30 2014 Tomas Mraz <tmraz@redhat.com> - 2:4.1.5.1-12
- improve group allocation algorithm - patch by Stephen Gallager (#1089738) - improve group allocation algorithm - patch by Stephen Gallager (#1089738)