# # # patch "ChangeLog" # from [44a65bed8dbfbbbdba286cf4d5327c58e10bf2e4] # to [0eaa43a2f5cc6b58e6c80d3a4132b8eb73a781d4] # # patch "commands.cc" # from [5cb99cc9f9c9d2b53b3deab448bbc6cf1443b39c] # to [7c49b073e4ce5f01840bc6db28a128665cd05f62] # # patch "netsync.cc" # from [2ed05687a9c32cae94f398fac7aee0ff915ec667] # to [5184103062fcd8dbdfb741494d49c0d99e8ee988] # ============================================================ --- ChangeLog 44a65bed8dbfbbbdba286cf4d5327c58e10bf2e4 +++ ChangeLog 0eaa43a2f5cc6b58e6c80d3a4132b8eb73a781d4 @@ -1,5 +1,10 @@ 2006-01-10 Nathaniel Smith + * netsync.cc (session): + * commands.cc (read): Adjust to match previous change. + +2006-01-10 Nathaniel Smith + * packet.{hh,cc} (struct packet_db_writer): Remove old guard against accidentally ingesting public keys -- this has not been useful for some years. ============================================================ --- commands.cc 5cb99cc9f9c9d2b53b3deab448bbc6cf1443b39c +++ commands.cc 7c49b073e4ce5f01840bc6db28a128665cd05f62 @@ -1906,7 +1906,7 @@ N_("read packets from files or stdin"), OPT_NONE) { - packet_db_writer dbw(app, true); + packet_db_writer dbw(app); size_t count = 0; if (args.empty()) { ============================================================ --- netsync.cc 2ed05687a9c32cae94f398fac7aee0ff915ec667 +++ netsync.cc 5184103062fcd8dbdfb741494d49c0d99e8ee988 @@ -475,7 +475,7 @@ revision_in_ticker(NULL), revision_out_ticker(NULL), saved_nonce(""), - dbw(app, true), + dbw(app), protocol_state(working_state), encountered_error(false), set_totals(false),