RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 04-Mar-2010 21:58:10 Branch: HEAD Handle: 2010030420581000 Modified files: rpm CHANGES rpm/rpmio rpmku.c rpmlog.h Log: - _RequestPass: convert assert to returning "" if no password. Summary: Revision Changes Path 1.3283 +1 -0 rpm/CHANGES 2.5 +2 -1 rpm/rpmio/rpmku.c 2.24 +1 -0 rpm/rpmio/rpmlog.h ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3282 -r1.3283 CHANGES --- rpm/CHANGES 4 Mar 2010 20:55:31 -0000 1.3282 +++ rpm/CHANGES 4 Mar 2010 20:58:10 -0000 1.3283 @@ -1,5 +1,6 @@ 5.2b1 -> 5.3a1 + - jbj: _RequestPass: convert assert to returning "" if no password. - jbj: mireRegexec: return -1 error instead of segfault when mis-used. - jbj: argv: use stricter RPMstr_t/RPMint_t types instead of void *. - devzero2000: add an rpm-arg-max-doc.spec toy test spec in tests @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmku.c ============================================================================ $ cvs diff -u -r2.4 -r2.5 rpmku.c --- rpm/rpmio/rpmku.c 30 Mar 2009 14:27:02 -0000 2.4 +++ rpm/rpmio/rpmku.c 4 Mar 2010 20:58:10 -0000 2.5 @@ -134,7 +134,8 @@ /*...@-nullstate@*/ /* XXX *password may be null. */ xx = keyctl_read_alloc(key, (void *)&password); /*...@=nullstate@*/ -assert(password != NULL); + if (password == NULL) + password = ""; #endif /*...@-statictrans@*/ @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmlog.h ============================================================================ $ cvs diff -u -r2.23 -r2.24 rpmlog.h --- rpm/rpmio/rpmlog.h 12 May 2009 21:17:11 -0000 2.23 +++ rpm/rpmio/rpmlog.h 4 Mar 2010 20:58:10 -0000 2.24 @@ -6,6 +6,7 @@ * Yet Another syslog(3) API clone. */ +#include <stdio.h> #include <stdarg.h> /** @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
