rpms/quota/devel quota-3.13-junk-err-fix.patch, NONE, 1.1 quota.spec, 1.29, 1.30

[fedora-cvs-commits at redhat.com]

Author: steved

Update of /cvs/dist/rpms/quota/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15567

Modified Files:
	quota.spec 
Added Files:
	quota-3.13-junk-err-fix.patch 
Log Message:
Error message prints garbage characters (bz 201226)


quota-3.13-junk-err-fix.patch:
 quotaops.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE quota-3.13-junk-err-fix.patch ---
--- quota-tools/quotaops.c.orig	2004-05-24 15:39:15.000000000 -0400
+++ quota-tools/quotaops.c	2006-11-01 15:26:57.577629000 -0500
@@ -118,7 +118,7 @@ struct dquot *getprivs(qid_t id, struct 
 				if (ngroups > NGROUPS) {
 					gidsetp = malloc(ngroups * sizeof(gid_t));
 					if (!gidsetp) {
-						errstr(_("%s: gid set allocation (%d): %s\n"), name, ngroups, strerror(errno));
+						errstr(_("Gid set allocation (%d): %s\n"), ngroups, strerror(errno));
 						return (struct dquot *)NULL;
 					}
 				}
@@ -128,7 +128,7 @@ struct dquot *getprivs(qid_t id, struct 
 				if (ngroups < 0) {
 					if (gidsetp != gidset)
 						free(gidsetp);
-					errstr(_("%s: error while trying getgroups(): %s\n"), name, strerror(errno));
+					errstr(_("Error while trying getgroups(): %s\n"), strerror(errno));
 					return (struct dquot *)NULL;
 				}
 
@@ -152,8 +152,8 @@ struct dquot *getprivs(qid_t id, struct 
 		if (!(q = handles[i]->qh_ops->read_dquot(handles[i], id))) {
 			/* If rpc.rquotad is not running filesystem might be just without quotas... */
 			if (errno != ENOENT && (errno != ECONNREFUSED || !quiet))
-				errstr(_("%s: error while getting quota from %s for %u: %s\n"),
-					name, handles[i]->qh_quotadev, id, strerror(errno));
+				errstr(_("Error while getting quota from %s for %u: %s\n"),
+					handles[i]->qh_quotadev, id, strerror(errno));
 			continue;
 		}
 		if (qhead == NULL)


Index: quota.spec
===================================================================
RCS file: /cvs/dist/rpms/quota/devel/quota.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- quota.spec	1 Nov 2006 20:28:46 -0000	1.29
+++ quota.spec	1 Nov 2006 20:39:14 -0000	1.30
@@ -16,6 +16,7 @@
 Patch2: quota-3.06-man-page.patch
 Patch3: quota-3.06-pie.patch
 Patch4: quota-3.13-wrong-ports.patch
+Patch5: quota-3.13-junk-err-fix.patch
 
 
 %description
@@ -32,6 +33,7 @@
 %patch3 -p1
 %endif
 %patch4 -p1
+%patch5 -p1
 
 
 %build
@@ -82,6 +84,7 @@
 %changelog
 * Wed Nov  1 2006 Steve Dickson <SteveD at RedHat.com> 1:3.13-1.2.3.2
 - Added range checking on -p flag (bz 205145)
+- Error message prints garbage characters (bz 201226)
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:3.13-1.2.3.1
 - rebuild