RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 07-Sep-2008 00:29:26
Branch: HEAD Handle: 2008090622292500
Modified files:
rpm CHANGES
rpm/lib manifest.c
Log:
- jbj: display error msg for lusers attempting "rpm -qp /bin"
(#461362).
Summary:
Revision Changes Path
1.2543 +1 -0 rpm/CHANGES
2.25 +6 -1 rpm/lib/manifest.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2542 -r1.2543 CHANGES
--- rpm/CHANGES 6 Sep 2008 19:00:16 -0000 1.2542
+++ rpm/CHANGES 6 Sep 2008 22:29:25 -0000 1.2543
@@ -1,5 +1,6 @@
5.1.0 -> 5.2a0:
+ - jbj: display error msg for lusers attempting "rpm -qp /bin" (#461362).
- jbj: WR: remove version from config paths.
- jbj: lua: fix: don't close dup'd stdout running lua scripts.
- jbj: macosx: avoid multiple definitions of _program_name.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/manifest.c
============================================================================
$ cvs diff -u -r2.24 -r2.25 manifest.c
--- rpm/lib/manifest.c 3 Aug 2008 14:00:59 -0000 2.24
+++ rpm/lib/manifest.c 6 Sep 2008 22:29:25 -0000 2.25
@@ -92,7 +92,9 @@
/* Read next line. */
s = fgets(line, sizeof(line) - 1, f);
if (s == NULL) {
- /* XXX Ferror check needed */
+ if (Ferror(xfd))
+ rpmlog(RPMLOG_ERR, _("reading %s manifest failed: %s\n"),
+ fdGetOPath(xfd), Fstrerror(xfd));
break;
}
@@ -116,6 +118,9 @@
/* Insure that file contains only ASCII */
if (*s < 32) {
+ rpmlog(RPMLOG_ERR, _("reading %s manifest, non-printable characters found\n"),
+ fdGetOPath(xfd), Fstrerror(xfd));
+
rpmrc = RPMRC_FAIL; /* XXX reject non-printable manifests. */
goto exit;
}
@@ .
Received on Sun Sep 7 00:29:26 2008