From 8e05d64543b95ecbeb4ce87e706b22d380db9656 Mon Sep 17 00:00:00 2001
From: Wouter Verhelst <w@uter.be>
Date: Thu, 5 Aug 2010 19:47:19 -0400
Subject: [PATCH] Fix command-line oldstyle export

---
 nbd-server.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nbd-server.c b/nbd-server.c
index 11fa5d7..7e97e45 100644
--- a/nbd-server.c
+++ b/nbd-server.c
@@ -515,6 +515,8 @@ SERVER* cmdline(int argc, char *argv[]) {
 	if(nonspecial<2) {
 		g_free(serve);
 		serve=NULL;
+	} else {
+		do_oldstyle = TRUE;
 	}
 	if(do_output) {
 		if(!serve) {
@@ -1231,7 +1233,11 @@ CLIENT* negotiate(int net, CLIENT *client, GArray* servers) {
 			if(client)
 				exit(EXIT_FAILURE);
 		}
-		magic = htonll(opts_magic);
+		if(client && client->modern) {
+			magic = htonll(opts_magic);
+		} else {
+			magic = htonll(cliserv_magic);
+		}
 		if (write(net, &magic, sizeof(magic)) < 0) {
 			err_nonfatal("Negotiation failed: %m");
 			if(client)
-- 
1.7.10.4