OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Nov-2006 13:10:34
Branch: HEAD Handle: 2006110112103400
Modified files:
openpkg-src/pks pks.patch
Log:
another bunch of bugfixes from upstream CVS (backported)
Summary:
Revision Changes Path
1.3 +119 -2 openpkg-src/pks/pks.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pks/pks.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 pks.patch
--- openpkg-src/pks/pks.patch 1 Nov 2006 11:50:39 -0000 1.2
+++ openpkg-src/pks/pks.patch 1 Nov 2006 12:10:34 -0000 1.3
@@ -1,6 +1,74 @@
+Index: kd_delete.c
+--- kd_delete.c.orig 2002-11-12 06:03:36 +0100
++++ kd_delete.c 2006-11-01 13:08:50 +0100
+@@ -207,7 +207,7 @@
+ /* fatal errors */
+
+ if (err.fatal) {
+- log_fatal("ks_delete", err.str);
++ log_fatal("kd_delete", err.str);
+ /* never returns */
+ }
+
+Index: kd_generic.c
+--- kd_generic.c.orig 2002-09-08 22:54:24 +0200
++++ kd_generic.c 2006-11-01 13:09:04 +0100
+@@ -41,7 +41,7 @@
+ DB *worddb = NULL;
+ DB *timedb = NULL;
+
+-DB *keydb(DBT *key)
++int get_keydb_num(DBT *key)
+ {
+ /* keyid's are 8 bytes, msb first. so start from the end. use 16
+ bits, since that's enough to divide by any small number of db
+@@ -51,7 +51,12 @@
+
+ keyidnum =
(keydata[KEYDB_KEYID_BYTES-2]<<8)|keydata[KEYDB_KEYID_BYTES-1];
+
+- return(keydb_files[keyidnum % num_keydb]);
++ return (keyidnum % num_keydb);
++}
++
++DB *keydb(DBT *key)
++{
++ return (keydb_files[get_keydb_num (key)]);
+ }
+
+ int kd_add_userid_to_wordlist(llist *wl,
+@@ -179,7 +184,7 @@
+ if ((*(keydb(&key)->put))(keydb(&key), tid, &key, &newdata, 0) < 0) {
+ xbuffer_free(&newxb);
+ err->fatal = 1;
+- sprintf(err->buf, "error %s keydb, errno = %d", "writing to", errno);
++ sprintf(err->buf, "error writing to keydb[%d], errno = %d",
get_keydb_num(&key), errno);
+ fail();
+ }
+
+@@ -356,7 +361,7 @@
+ goto do_create;
+
+ for (i=0; i<num_keydb; i++) {
+- sprintf(line, "keydb%03d", i);
++ sprintf(line, "%s/keydb%03d", dbdir, i);
+ unlink(line);
+ }
+
+Index: kd_get.c
+--- kd_get.c.orig 2002-10-08 06:04:42 +0200
++++ kd_get.c 2006-11-01 13:08:50 +0100
+@@ -163,7 +163,7 @@
+ /* fatal errors */
+
+ if (err.fatal)
+- log_fatal("ks_get", err.str);
++ log_fatal("kd_get", err.str);
+
+ /* keep the compiler quiet */
+
Index: kd_index.c
--- kd_index.c.orig 2003-01-26 20:54:45 +0100
-+++ kd_index.c 2006-11-01 12:48:44 +0100
++++ kd_index.c 2006-11-01 13:08:50 +0100
@@ -107,7 +107,7 @@
char buf[512];
@@ -19,9 +87,21 @@
ke->primary->uidprint);
if (!xbuffer_append_str(s->xb, buf))
+Index: kd_since.c
+--- kd_since.c.orig 2002-09-04 23:00:23 +0200
++++ kd_since.c 2006-11-01 13:08:50 +0100
+@@ -220,7 +220,7 @@
+ /* fatal errors */
+
+ if (err.fatal)
+- log_fatal("ks_get", err.str);
++ log_fatal("kd_since", err.str);
+
+ /* keep the compiler quiet */
+
Index: pgputil.c
--- pgputil.c.orig 2003-01-26 17:08:58 +0100
-+++ pgputil.c 2006-11-01 12:46:39 +0100
++++ pgputil.c 2006-11-01 13:08:50 +0100
@@ -121,6 +121,11 @@
if (!decode_num(data, 2, &(mpi->nbits)))
return(0);
@@ -34,3 +114,40 @@
return(decode_bytestr(data, (mpi->nbits+7)/8, &(mpi->number)));
}
+Index: pkscheck.c
+--- pkscheck.c.orig 2003-02-07 02:01:21 +0100
++++ pkscheck.c 2006-11-01 13:08:50 +0100
+@@ -83,6 +83,12 @@
+ log_error("main", buf);
+ }
+
++ memset (&ikey, 0, sizeof (ikey));
++ memset (&idata, 0, sizeof (idata));
++
++ memset (&kkey, 0, sizeof (kkey));
++ memset (&kdata, 0, sizeof (kdata));
++
+ for (ret = (*(cursor->c_get))(cursor, &ikey, &idata, DB_FIRST);
+ ret == 0;
+ ret = (*(cursor->c_get))(cursor, &ikey, &idata, DB_NEXT)) {
+@@ -97,7 +103,8 @@
+ kkey.size = 4;
+ kkey.data = ((unsigned char *) idata.data)+i+8;
+
+- if ((*(keydb(&kkey)->get))(keydb(&kkey), NULL, &kkey, &kdata, 0)) {
++ if ((((unsigned long *) kkey.data)[0] > 0) &&
++ (*(keydb(&kkey)->get))(keydb(&kkey), NULL, &kkey, &kdata, 0)) {
+ sprintf(buf, "keyid %02X%02X%02X%02X in timedb but not keydb\n",
+ ((unsigned char *) kkey.data)[0],
+ ((unsigned char *) kkey.data)[1],
+Index: www.c
+--- www.c.orig 2003-02-07 02:01:21 +0100
++++ www.c 2006-11-01 13:08:50 +0100
+@@ -33,7 +33,6 @@
+ #define TCPDSERVICE "pksd"
+ int allow_severity=LOG_WARNING ;
+ int deny_severity=LOG_WARNING ;
+- char *yp_get_default_domain="" ;
+ extern int hosts_ctl(char *daemon,
+ char *client_name, char *client_addr,char *client_user) ;
+
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
