[shadow-utils] ignore getgrgid() errors for now
Tomáš Mráz
tmraz at fedoraproject.org
Wed Jul 2 11:30:29 UTC 2014
commit efff9fe79f2cd8ca2d6336c29b71a7f7432079b2
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date: Wed Jul 2 13:30:31 2014 +0200
ignore getgrgid() errors for now
shadow-4.1.5.1-group-alloc.patch | 6 +++---
shadow-utils.spec | 5 ++++-
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/shadow-4.1.5.1-group-alloc.patch b/shadow-4.1.5.1-group-alloc.patch
index 892ae7d..0ac336b 100644
--- a/shadow-4.1.5.1-group-alloc.patch
+++ b/shadow-4.1.5.1-group-alloc.patch
@@ -158,9 +158,9 @@ index 05f5622edb79069d9a43d3f9c69a463b6b71141a..25900dd12874e46e5efdfcf7c895f6b8
+ /* getgrgid() was NULL, check whether this was
+ * due to an error, so we can report it.
+ */
-+ if (errno != 0) {
++ /* ignore errors for now * if (errno != 0) {
+ return errno;
-+ }
++ } */
+ }
+
+ /* 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
+ */
-+ if (gr_locate_gid (preferred_gid) == NULL) {
++ if (gr_locate_gid (*preferred_gid) == NULL) {
+ *gid = *preferred_gid;
+ return 0;
+ }
diff --git a/shadow-utils.spec b/shadow-utils.spec
index 138872f..0d186a4 100644
--- a/shadow-utils.spec
+++ b/shadow-utils.spec
@@ -1,7 +1,7 @@
Summary: Utilities for managing accounts and shadow password files
Name: shadow-utils
Version: 4.1.5.1
-Release: 12%{?dist}
+Release: 13%{?dist}
Epoch: 2
URL: http://pkg-shadow.alioth.debian.org/
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*
%changelog
+* Mon Jun 30 2014 Tomas Mraz <tmraz at redhat.com> - 2:4.1.5.1-13
+- ignore getgrgid() errors for now
+
* Mon Jun 30 2014 Tomas Mraz <tmraz at redhat.com> - 2:4.1.5.1-12
- improve group allocation algorithm - patch by Stephen Gallager (#1089738)
More information about the scm-commits
mailing list