# 
# 
# patch "ChangeLog"
#  from [951b0bddebb411e8b4bcbec34d86eef3e6e756d1]
#    to [44a65bed8dbfbbbdba286cf4d5327c58e10bf2e4]
# 
# patch "packet.cc"
#  from [a0e13964d4ea07972b0b77e27aaa42ce5ae44852]
#    to [92ba5e816320b1e23775f9c54875c3dd9642fab8]
# 
# patch "packet.hh"
#  from [929d4d33d22c72aad18767a87fb6b191351ed799]
#    to [97e6723f3b4974aa36826b5391b2018870ad4eb3]
# 
============================================================
--- ChangeLog	951b0bddebb411e8b4bcbec34d86eef3e6e756d1
+++ ChangeLog	44a65bed8dbfbbbdba286cf4d5327c58e10bf2e4
@@ -1,5 +1,11 @@
 2006-01-10  Nathaniel Smith  <address@hidden>
 
+	* packet.{hh,cc} (struct packet_db_writer): Remove old guard
+	against accidentally ingesting public keys -- this has not been
+	useful for some years.
+
+2006-01-10  Nathaniel Smith  <address@hidden>
+
 	* diff_patch.hh (struct content_merger): Oops, forgot to remove
 	the merge2 prototype.
 
============================================================
--- packet.cc	a0e13964d4ea07972b0b77e27aaa42ce5ae44852
+++ packet.cc	92ba5e816320b1e23775f9c54875c3dd9642fab8
@@ -54,8 +54,8 @@
 }
 
 
-packet_db_writer::packet_db_writer(app_state & app, bool take_keys) 
-  : app(app), take_keys(take_keys)
+packet_db_writer::packet_db_writer(app_state & app) 
+  : app(app)
 {}
 
 packet_db_writer::~packet_db_writer() 
@@ -217,12 +217,6 @@
 {
   transaction_guard guard(app.db);
 
-  if (! take_keys) 
-    {
-      W(F("skipping prohibited public key %s\n") % ident);
-      return;
-    }
-
   if (app.db.public_key_exists(ident))
     {
       base64<rsa_pub_key> tmp;
@@ -246,11 +240,6 @@
                                    keypair const & kp)
 {
   transaction_guard guard(app.db);
-  if (! take_keys) 
-    {
-      W(F("skipping prohibited key pair %s\n") % ident);
-      return;
-    }
 
   if (app.keys.key_pair_exists(ident))
     {
============================================================
--- packet.hh	929d4d33d22c72aad18767a87fb6b191351ed799
+++ packet.hh	97e6723f3b4974aa36826b5391b2018870ad4eb3
@@ -98,10 +98,8 @@
 struct packet_db_writer : public packet_consumer
 {
   app_state & app;
-  bool take_keys;
 public:
-  packet_db_writer(app_state & app, 
-                   bool take_keys = false);
+  packet_db_writer(app_state & app);
   virtual ~packet_db_writer();
   virtual void consume_file_data(file_id const & ident, 
                                  file_data const & dat);