From: Wouter Verhelst <w@uter.be>
Date: Fri, 6 Aug 2010 00:51:06 +0000 (-0400)
Subject: Document differences with old style exports
X-Git-Url: http://git.alex.org.uk

Document differences with old style exports
---

diff --git a/nbd-server.5.sgml b/nbd-server.5.sgml
index babf619..cfa07f3 100644
--- a/nbd-server.5.sgml
+++ b/nbd-server.5.sgml
@@ -161,6 +161,16 @@ manpage.1: manpage.sgml
 	    specified). The server will only export devices on the
 	    standard port.
 	  </para>
+	  <para>
+	    For upgrades from pre-2.9.17 versions of nbd, it may be
+	    appropriate to enable the oldstyle parameter until all
+	    clients have been converted to using name-based exports.
+	  </para>
+	  <para>
+	    Note that exports specified on the command line will
+	    always use the old handshake protocol and will not allow
+	    name-based exports.
+	  </para>
 	</listitem>
       </varlistentry>
       <varlistentry>
diff --git a/nbd-server.c b/nbd-server.c
index 7e97e45..ea446db 100644
--- a/nbd-server.c
+++ b/nbd-server.c
@@ -834,6 +834,10 @@ GArray* parse_cfile(gchar* f, GError** e) {
 				g_key_file_free(cfile);
 				return NULL;
 			}
+			if(s.port && !do_oldstyle) {
+				g_warning("A port was specified, but oldstyle exports were not requested. This may not do what you expect.");
+				g_warning("Please read 'man 5 nbd-server' and search for oldstyle for more info");
+			}
 		} else {
 			s.virtstyle=VIRT_IPLIT;
 		}