# 
# patch "ChangeLog"
#  from [49aa09817e0067e3849e6807c09e4496d5a8fa2d]
#    to [464922b829dcadac9bb7b5fe425efb77e33647b1]
# 
# patch "commands.cc"
#  from [b24f57f82e4d51507f5aeb99cd9b8a5bda6fb555]
#    to [53c7e0972f1ceaa87973cf276f54ac1f96d7eda3]
# 
# patch "netsync.cc"
#  from [8dd0970ff9d0f74cb97c49e8b239c2256e2bec8e]
#    to [22170953bd69c90b712288d9a3a8bf93e9de7026]
# 
========================================================================
--- ChangeLog	49aa09817e0067e3849e6807c09e4496d5a8fa2d
+++ ChangeLog	464922b829dcadac9bb7b5fe425efb77e33647b1
@@ -1,3 +1,10 @@
+2005-10-17  Timothy Brownawell  <address@hidden>
+
+	* commands.cc (serve): check that the db is valid before beginning
+	service (would previously not know until someone connected)
+	* netsync.cc (serve_connections): don't say "beginning service" until
+	after opening the socket.
+
 2005-10-16  Timothy Brownawell  <address@hidden>
 
 	* app_state.{cc,hh}, key_store.cc: change how the keystore directory
========================================================================
--- commands.cc	b24f57f82e4d51507f5aeb99cd9b8a5bda6fb555
+++ commands.cc	53c7e0972f1ceaa87973cf276f54ac1f96d7eda3
@@ -2118,6 +2118,8 @@
     F("need permission to store persistent passphrase (see hook persist_phrase_ok())"));
   require_password(key, app);
 
+  app.db.ensure_open();
+
   utf8 dummy_addr, include_pattern, exclude_pattern;
   process_netsync_args(name, args, dummy_addr, include_pattern, exclude_pattern, false, true, app);
   run_netsync_protocol(server_voice, source_and_sink_role, app.bind_address,
========================================================================
--- netsync.cc	8dd0970ff9d0f74cb97c49e8b239c2256e2bec8e
+++ netsync.cc	22170953bd69c90b712288d9a3a8bf93e9de7026
@@ -3348,11 +3348,11 @@
   else
       addr.add_all_addresses (default_port);
 
+
+  Netxx::StreamServer server(addr, timeout);
   const char *name = addr.get_name();
   P(F("beginning service on %s : %s\n") 
     % (name != NULL ? name : "all interfaces") % lexical_cast<string>(addr.get_port()));
-
-  Netxx::StreamServer server(addr, timeout);
   
   map<Netxx::socket_type, shared_ptr<session> > sessions;
   set<Netxx::socket_type> armed_sessions;