# 
# 
# patch "ChangeLog"
#  from [753e4315d9448f5e92074a053205dedbeed79cc5]
#    to [5f77d4a3257769df42ff1339c6fde974eae7e06b]
# 
# patch "cmd_netsync.cc"
#  from [a8117edff38b7ecc81c3fecd5b1eb571ef5b86d0]
#    to [b0a66619fef0808049691adc7e91236124aa339a]
# 
============================================================
--- ChangeLog	753e4315d9448f5e92074a053205dedbeed79cc5
+++ ChangeLog	5f77d4a3257769df42ff1339c6fde974eae7e06b
@@ -1,5 +1,9 @@
 2006-05-22  Graydon Hoare  <address@hidden>
 
+	* cmd_netsync.cc (serve): Make --no-transport-auth require --stdio.
+
+2006-05-22  Graydon Hoare  <address@hidden>
+
 	* Makefile.am: Add uri.{cc,hh}.
 	* app_state.{cc,hh} (use_transport_auth): New state variable.
 	* cmd_netsync.cc (serve): Support use_transport_auth.
============================================================
--- cmd_netsync.cc	a8117edff38b7ecc81c3fecd5b1eb571ef5b86d0
+++ cmd_netsync.cc	b0a66619fef0808049691adc7e91236124aa339a
@@ -185,6 +185,11 @@
 	F("need permission to store persistent passphrase (see hook persist_phrase_ok())"));
       require_password(key, app);
     }
+  else
+    {
+      E(app.bind_stdio,
+	F("The --no-transport-auth option is only permitted in combination with --stdio"));
+    }
 
   app.db.ensure_open();