Merge lp:~logan/ubuntu/raring/nbd/debian-merge into lp:ubuntu/raring/nbd

[Logan Rosen]

[Daniel Holbach (dholbach)]

Good work.

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2012-06-17 07:29:43 +0000
+++ Makefile.am	2012-12-05 21:52:21 +0000
@@ -3,7 +3,7 @@
 sbin_PROGRAMS = @NBD_CLIENT_NAME@
 EXTRA_PROGRAMS = nbd-client make-integrityhuge
 TESTS_ENVIRONMENT=$(srcdir)/simple_test
-TESTS = cmd cfg1 cfgmulti cfgnew cfgsize write flush integrity dirconfig #integrityhuge
+TESTS = cmd cfg1 cfgmulti cfgnew cfgsize write flush integrity dirconfig list #integrityhuge
 check_PROGRAMS = nbd-tester-client
 nbd_client_SOURCES = nbd-client.c cliserv.h
 nbd_server_SOURCES = nbd-server.c cliserv.h lfs.h nbd.h
@@ -28,3 +28,4 @@
 integrity:
 integrityhuge:
 dirconfig:
+list:

=== modified file 'Makefile.in'
--- Makefile.in	2012-06-17 07:29:43 +0000
+++ Makefile.in	2012-12-05 21:52:21 +0000
@@ -58,7 +58,7 @@
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure $(top_srcdir)/doc/Doxyfile.in \
-	config.guess config.sub depcomp install-sh missing
+	ChangeLog config.guess config.sub depcomp install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -278,7 +278,7 @@
 SUBDIRS = man
 sbin_PROGRAMS = @NBD_CLIENT_NAME@
 TESTS_ENVIRONMENT = $(srcdir)/simple_test
-TESTS = cmd cfg1 cfgmulti cfgnew cfgsize write flush integrity dirconfig #integrityhuge
+TESTS = cmd cfg1 cfgmulti cfgnew cfgsize write flush integrity dirconfig list #integrityhuge
 nbd_client_SOURCES = nbd-client.c cliserv.h
 nbd_server_SOURCES = nbd-server.c cliserv.h lfs.h nbd.h
 nbd_tester_client_SOURCES = nbd-tester-client.c cliserv.h netdb-compat.h
@@ -1079,6 +1079,7 @@
 integrity:
 integrityhuge:
 dirconfig:
+list:
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

=== removed file 'README.md'
--- README.md	2012-05-25 10:30:54 +0000
+++ README.md	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-# NBD 3.1.1
-
-There isn't much difference between nbd-3.1 and nbd-3.1.1, except for:
-
-- I forgot to initialize a few variables, which meant that, depending on
-  the platform, nbd-client would sometimes just not work
-- Compatibility was added back for platforms that don't yet support the
-  `NI_NUMERICHOST` variable.

=== modified file 'config.sub'
--- config.sub	2012-05-15 21:58:25 +0000
+++ config.sub	2012-12-05 21:52:21 +0000
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2012-04-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -225,6 +225,12 @@
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -1537,6 +1543,9 @@
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	hexagon-*)
+		os=-elf
+		;;
 	tic54x-*)
 		os=-coff
 		;;

=== modified file 'configure'
--- configure	2012-06-17 07:29:43 +0000
+++ configure	2012-12-05 21:52:21 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for nbd 3.1.1.
+# Generated by GNU Autoconf 2.69 for nbd 3.2.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='nbd'
 PACKAGE_TARNAME='nbd'
-PACKAGE_VERSION='3.1.1'
-PACKAGE_STRING='nbd 3.1.1'
+PACKAGE_VERSION='3.2'
+PACKAGE_STRING='nbd 3.2'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -1291,7 +1291,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures nbd 3.1.1 to adapt to many kinds of systems.
+\`configure' configures nbd 3.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1361,7 +1361,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of nbd 3.1.1:";;
+     short | recursive ) echo "Configuration of nbd 3.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1463,7 +1463,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-nbd configure 3.1.1
+nbd configure 3.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2115,7 +2115,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by nbd $as_me 3.1.1, which was
+It was created by nbd $as_me 3.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2930,7 +2930,7 @@
 
 # Define the identity of the package.
  PACKAGE='nbd'
- VERSION='3.1.1'
+ VERSION='3.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6665,7 +6665,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by nbd $as_me 3.1.1, which was
+This file was extended by nbd $as_me 3.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6731,7 +6731,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-nbd config.status 3.1.1
+nbd config.status 3.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2012-06-17 07:29:43 +0000
+++ configure.ac	2012-12-05 21:52:21 +0000
@@ -1,7 +1,7 @@
 dnl Configure script for NBD system
 dnl (c) 1998 Martin Mares <[e-mail]>, (c) 2000 Pavel Machek <[e-mail]>,
 dnl (c) 2003-2006 Wouter Verhelst <[e-mail]>
-AC_INIT([nbd],[3.1.1],[[e-mail]])
+AC_INIT([nbd],[3.2],[[e-mail]])
 AM_INIT_AUTOMAKE(foreign dist-bzip2)
 AM_MAINTAINER_MODE
 

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-17 07:29:43 +0000
+++ debian/changelog	2012-12-05 21:52:21 +0000
@@ -1,3 +1,28 @@
+nbd (1:3.2-1.1ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Drop /etc/modprobe.d/nbd-client; the kernel default is already
+      appropriate. Ubuntu-specific change.
+      + Modify debian/nbd-client.dirs.
+      + Remove debian/nbd-client.modprobe.
+
+ -- Logan Rosen <[e-mail]>  Wed, 05 Dec 2012 16:47:29 -0500
+
+nbd (1:3.2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix pending l10n issues. Debconf translations:
+  * Czech (Miroslav Kure).  Closes: #681702
+
+ -- Christian Perrier <[e-mail]>  Sun, 05 Aug 2012 09:49:21 +0200
+
+nbd (1:3.2-1) unstable; urgency=low
+
+  * New upstream release. Includes many stability fixes, so hopefully
+    this will get a freeze exception.
+
+ -- Wouter Verhelst <[e-mail]>  Tue, 03 Jul 2012 16:53:20 -0600
+
 nbd (1:3.1.1-1ubuntu1) quantal; urgency=low
 
   * Merge from Debian unstable. (LP: #1014184) Remaining changes:

=== modified file 'debian/po/cs.po'
--- debian/po/cs.po	2011-01-26 15:59:24 +0000
+++ debian/po/cs.po	2012-12-05 21:52:21 +0000
@@ -16,7 +16,7 @@
 "Project-Id-Version: nbd\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-01-05 18:59+0100\n"
-"PO-Revision-Date: 2010-08-05 22:51+0200\n"
+"PO-Revision-Date: 2012-07-15 20:23+0200\n"
 "Last-Translator: Miroslav Kure <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\n"
 "Language: cs\n"
@@ -140,20 +140,18 @@
 #. Type: string
 #. Description
 #: ../nbd-client.templates:6001
-#, fuzzy
-#| msgid "Hostname of the server (number: ${number})?"
 msgid "Port or name for nbd export (number: ${number})?"
-msgstr "Jméno serveru (číslo ${number})?"
+msgstr "Port nebo jméno nbd exportu (číslo ${number})?"
 
 #. Type: string
 #. Description
 #: ../nbd-client.templates:6001
-#, fuzzy
-#| msgid "Please enter the TCP port number to access nbd-server."
 msgid ""
 "Please enter the TCP port number or NBD export name needed to access nbd-"
 "server."
-msgstr "Zadejte číslo TCP portu, které se použije pro přístup k nbd-serveru."
+msgstr ""
+"Zadejte číslo TCP portu nebo název NBD exportu, které se použije pro přístup "
+"k nbd-serveru."
 
 #. Type: string
 #. Description
@@ -164,6 +162,9 @@
 "enter the TCP port number here, and should make sure not to enter any non-"
 "numeric characters in the field."
 msgstr ""
+"nbd-servery verze 2.9.16 a nižší nepodporovaly přístup přes jméno NBD "
+"exportu. Jestliže je váš NBD server starší verze, měli byste zde zadat pouze "
+"číslo TCP portu."
 
 #. Type: string
 #. Description
@@ -174,6 +175,9 @@
 "this configuration system will accept that as a name and provide it to nbd-"
 "client as a name-based export rather than a port-based one."
 msgstr ""
+"Novější verze nbd-serveru podporují kromě čísla TCP portu i jméno exportu. "
+"Pokud so pole zadáte i jiný znak než číslici, bude to konfigurační systém "
+"považovat za název exportu a takto to i předá NBD klientovi."
 
 #. Type: string
 #. Description
@@ -251,7 +255,7 @@
 "If you wish to add any extra parameters to nbd-client, then please enter "
 "them here."
 msgstr ""
-"Chcete-li si zadatf nbd-klientu dodatečné parametry, zadejte je prosím zde."
+"Chcete-li zadat nbd-klientu dodatečné parametry, zadejte je prosím zde."
 
 #. Type: string
 #. Description
@@ -290,32 +294,24 @@
 #. Type: string
 #. Description
 #: ../nbd-server.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please specify the TCP port this instance of nbd server will use for "
-#| "listening. As NBD is likely to use more than one port, no dedicated port "
-#| "has been assigned in IANA lists."
 msgid ""
 "Please specify the TCP port this instance of nbd server will use for "
 "backwards compatibility with older clients."
 msgstr ""
-"Zadejte TCP port, na kterém bude tato instance nbd-serveru naslouchat "
-"příchozím požadavkům. Protože je pravděpodobné, že bude NBD používat více "
-"než jeden port, nebyl mu v IANA registrech přiřazen specifický port."
+"Zadejte TCP port, který bude tato instance nbd-serveru používat pro zpětnou "
+"kompatibilitu se staršími klienty."
 
 #. Type: string
 #. Description
 #: ../nbd-server.templates:4001
-#, fuzzy
-#| msgid "File to export (server number ${number}):"
 msgid "Name of export ${number}:"
-msgstr "Soubor, který se má exportovat (server číslo ${number}):"
+msgstr "Název exportu ${number}:"
 
 #. Type: string
 #. Description
 #: ../nbd-server.templates:4001
 msgid "Please specify a name for this export."
-msgstr ""
+msgstr "Zadejte jméno tohoto exportu."
 
 #. Type: string
 #. Description
@@ -409,8 +405,8 @@
 "current nbd-server package no longer supports this file and will not work if "
 "it is kept as is."
 msgstr ""
-"V systému byl nalezen konfigurační soubor nbd-serveru < 2...9. Současný "
-"balík nbd-server již tento soubor nepodporuje a pokud soubor nepřevedete na "
+"V systému byl nalezen konfigurační soubor nbd-serveru < 2.9. Současný balík "
+"nbd-server již tento soubor nepodporuje a pokud soubor nepřevedete na "
 "novější formát, nebude nbd-server fungovat."
 
 #. Type: boolean
@@ -434,14 +430,14 @@
 "If a new-style configuration file already exists and you choose this option, "
 "you will shortly see a \"modified configuration file\" prompt, as usual."
 msgstr ""
-"Pokud již nový konfigurační soubor existuje a na tuto otázku povolíte "
+"Pokud již nový konfigurační soubor existuje a na tuto otázku odpovíte "
 "kladně, zobrazí se klasická výzva „změněný konfigurační soubor“."
 
 #. Type: boolean
 #. Description
 #: ../nbd-server.templates:8001
 msgid "Support port-based exports?"
-msgstr ""
+msgstr "Podporovat exporty založené na portech?"
 
 #. Type: boolean
 #. Description
@@ -453,6 +449,11 @@
 "a lot of trouble to update your older configurations in order to migrate to "
 "name-based exports. In either of those cases, you should accept this option."
 msgstr ""
+"Od verze 2.9.18 podporuje nbd-server exporty založené na jménech, které jsou "
+"preferovány před staršími exporty založenými na portech. Je však možné, že "
+"musíte podporovat nějaké starší nbd-klienty, nebo zrovna teď nechcete "
+"migrovat na exporty založené na jménech a aktualizovat své starší "
+"konfigurace. V obou případech byste měli tuto možnost přijmout."
 
 #. Type: boolean
 #. Description
@@ -461,6 +462,8 @@
 "Everyone else should leave the option at the default setting, which will "
 "cause nbd-server to only support name-based exports."
 msgstr ""
+"Všichni ostatní by měli ponechat výchozí možnost a nechat nbd-server "
+"podporovat pouze exporty založené na jménech."
 
 #~ msgid "Port on which the nbd-server is running (number: ${number})?"
 #~ msgstr "Port, na kterém běží nbd-server (číslo ${number})?"

=== modified file 'man/nbd-client.8.in.sgml'
--- man/nbd-client.8.in.sgml	2012-05-15 21:58:25 +0000
+++ man/nbd-client.8.in.sgml	2012-12-05 21:52:21 +0000
@@ -201,7 +201,7 @@
 	<term><option>-S</option></term>
 	<listitem>
 	  <para>Connect to the server using the Socket Direct Protocol
-	    (SDP), rather than IP. See nbd-server(1) for details.
+	    (SDP), rather than IP. See nbd-server(5) for details.
 	  </para>
 	</listitem>
       </varlistentry>
@@ -211,8 +211,9 @@
 	<listitem>
 	  <para>Specifies that this NBD device will be used as
 	  swapspace. This option attempts to prevent deadlocks by
-	  performing mlockall() at an appropriate time. It does not
-	  however guarantee that such deadlocks can be avoided.</para>
+	  performing mlockall() and adjusting the oom-killer score
+	  at an appropriate time. It does not however guarantee
+	  that such deadlocks can be avoided.</para>
 	</listitem>
       </varlistentry>
       <varlistentry>

=== modified file 'man/nbd-client.8.sh.in'
--- man/nbd-client.8.sh.in	2012-06-17 07:29:43 +0000
+++ man/nbd-client.8.sh.in	2012-12-05 21:52:21 +0000
@@ -125,15 +125,16 @@
 .TP
 \fB-S\fR
 Connect to the server using the Socket Direct Protocol
-(SDP), rather than IP. See nbd-server(1) for details.
+(SDP), rather than IP. See nbd-server(5) for details.
 .TP
 \fB-swap\fR
 .TP
 \fB-s\fR
 Specifies that this NBD device will be used as
 swapspace. This option attempts to prevent deadlocks by
-performing mlockall() at an appropriate time. It does not
-however guarantee that such deadlocks can be avoided.
+performing mlockall() and adjusting the oom-killer score
+at an appropriate time. It does not however guarantee
+that such deadlocks can be avoided.
 .TP
 \fB-nofork\fR
 .TP

=== modified file 'nbd-client.c'
--- nbd-client.c	2012-06-17 07:29:43 +0000
+++ nbd-client.c	2012-12-05 21:52:21 +0000
@@ -35,6 +35,7 @@
 #include <stdlib.h>
 #include <sys/mount.h>
 #include <sys/mman.h>
+#include <signal.h>
 #include <errno.h>
 #include <getopt.h>
 #include <stdarg.h>
@@ -94,7 +95,7 @@
 	if(e != 0) {
 		fprintf(stderr, "getaddrinfo failed: %s\n", gai_strerror(e));
 		freeaddrinfo(ai);
-		exit(EXIT_FAILURE);
+		return -1;
 	}
 
 	if(sdp) {
@@ -118,8 +119,10 @@
 			break;		/* success */
 	}
 
-	if (rp == NULL)
-		err("Socket failed: %m");
+	if (rp == NULL) {
+		err_nonfatal("Socket failed: %m");
+		return -1;
+	}
 
 	setmysockopt(sock);
 
@@ -371,6 +374,21 @@
 		mlockall(MCL_CURRENT | MCL_FUTURE);
 }
 
+static int
+oom_adjust(const char *file, const char *value)
+{
+	int fd, rc;
+	size_t len;
+
+	fd = open(file, O_WRONLY);
+	if (fd < 0)
+		return -1;
+	len = strlen(value);
+	rc = write(fd, value, len) != (ssize_t) len;
+	close(fd);
+	return rc ? -1 : 0;
+}
+
 void usage(char* errmsg, ...) {
 	if(errmsg) {
 		char tmp[256];
@@ -550,6 +568,8 @@
 	}
 
 	sock = opennet(hostname, port, sdp);
+	if (sock < 0)
+		exit(EXIT_FAILURE);
 
 	negotiate(sock, &size64, &flags, name, needed_flags, cflags, opts);
 
@@ -560,6 +580,13 @@
 	setsizes(nbd, size64, blocksize, flags);
 	set_timeout(nbd, timeout);
 	finish_sock(sock, nbd, swap);
+	if (swap) {
+		/* try linux >= 2.6.36 interface first */
+		if (oom_adjust("/proc/self/oom_score_adj", "-1000")) {
+			/* fall back to linux <= 2.6.35 interface */
+			oom_adjust("/proc/self/oom_adj", "-17");
+		}
+	}
 
 	/* Go daemon */
 	
@@ -571,6 +598,16 @@
 #endif
 	do {
 #ifndef NOFORK
+#ifdef SA_NOCLDWAIT
+		struct sigaction sa;
+
+		sa.sa_handler = SIG_DFL;
+		sigemptyset(&sa.sa_mask);
+		sa.sa_flags = SA_NOCLDWAIT;
+		if (sigaction(SIGCHLD, &sa, NULL) < 0)
+			err("sigaction: %m");
+#endif
+
 		if (!fork()) {
 			/* Due to a race, the kernel NBD driver cannot
 			 * call for a reread of the partition table
@@ -603,10 +640,17 @@
 					u64 new_size;
 					u32 new_flags;
 
-					fprintf(stderr, " Reconnecting\n");
 					close(sock); close(nbd);
-					sock = opennet(hostname, port, sdp);
+					for (;;) {
+						fprintf(stderr, " Reconnecting\n");
+						sock = opennet(hostname, port, sdp);
+						if (sock >= 0)
+							break;
+						sleep (1);
+					}
 					nbd = open(nbddev, O_RDWR);
+					if (nbd < 0)
+						err("Cannot open NBD: %m");
 					negotiate(sock, &new_size, &new_flags, name, needed_flags, cflags, opts);
 					if (size64 != new_size) {
 						err("Size of the device changed. Bye");

=== modified file 'nbd-server.c'
--- nbd-server.c	2012-06-17 07:29:43 +0000
+++ nbd-server.c	2012-12-05 21:52:21 +0000
@@ -185,7 +185,7 @@
 #define NEG_OLD		(1 << 1)
 #define NEG_MODERN	(1 << 2)
 
-int modernsock=0;	  /**< Socket for the modern handler. Not used
+int modernsock=-1;	  /**< Socket for the modern handler. Not used
 			       if a client was only specified on the
 			       command line; only port used if
 			       oldstyle is set to false (and then the
@@ -803,7 +803,7 @@
 			case DT_REG:
 				/* Skip unless the name ends with '.conf' */
 				if(strcmp((de->d_name + strlen(de->d_name) - 5), ".conf")) {
-					continue;
+					goto next;
 				}
 				tmp = parse_cfile(fname, FALSE, e);
 				errno=saved_errno;
@@ -1087,10 +1087,8 @@
  **/
 void killchild(gpointer key, gpointer value, gpointer user_data) {
 	pid_t *pid=value;
-	int *parent=user_data;
 
 	kill(*pid, SIGTERM);
-	*parent=1;
 }
 
 /**
@@ -1099,13 +1097,8 @@
  * is severely wrong).
  **/
 void sigterm_handler(int s) {
-	int parent=0;
-
-	g_hash_table_foreach(children, killchild, &parent);
-
-	if(parent) {
-		unlink(pidfname);
-	}
+	g_hash_table_foreach(children, killchild, NULL);
+	unlink(pidfname);
 
 	exit(EXIT_SUCCESS);
 }
@@ -2062,8 +2055,9 @@
  * @param client information about the client. The IP address in human-readable
  * format will be written to a new char* buffer, the address of which will be
  * stored in client->clientname.
+ * @return: 0 - OK, -1 - failed.
  **/
-void set_peername(int net, CLIENT *client) {
+int set_peername(int net, CLIENT *client) {
 	struct sockaddr_storage addrin;
 	struct sockaddr_storage netaddr;
 	struct sockaddr_in  *netaddr4 = NULL;
@@ -2078,13 +2072,15 @@
 	int e;
 	int shift;
 
-	if (getpeername(net, (struct sockaddr *) &addrin, &addrinlen) < 0)
-		err("getpeername failed: %m");
+	if (getpeername(net, (struct sockaddr *) &addrin, &addrinlen) < 0) {
+		msg2(LOG_INFO, "getpeername failed: %m");
+		return -1;
+	}
 
 	if((e = getnameinfo((struct sockaddr *)&addrin, addrinlen,
 			peername, sizeof (peername), NULL, 0, NI_NUMERICHOST))) {
 		msg3(LOG_INFO, "getnameinfo failed: %s", gai_strerror(e));
-		freeaddrinfo(ai);
+		return -1;
 	}
 
 	memset(&hints, '\0', sizeof (hints));
@@ -2094,23 +2090,27 @@
 	if(e != 0) {
 		msg3(LOG_INFO, "getaddrinfo failed: %s", gai_strerror(e));
 		freeaddrinfo(ai);
-		return;
+		return -1;
 	}
 
 	switch(client->server->virtstyle) {
 		case VIRT_NONE:
+			msg2(LOG_DEBUG, "virtualization is off");
 			client->exportname=g_strdup(client->server->exportname);
 			break;
 		case VIRT_IPHASH:
+			msg2(LOG_DEBUG, "virtstyle iphash");
 			for(i=0;i<strlen(peername);i++) {
 				if(peername[i]=='.') {
 					peername[i]='/';
 				}
 			}
 		case VIRT_IPLIT:
+			msg2(LOG_DEBUG, "virststyle ipliteral");
 			client->exportname=g_strdup_printf(client->server->exportname, peername);
 			break;
 		case VIRT_CIDR:
+			msg3(LOG_DEBUG, "virtstyle cidr %d", client->server->cidrlen);
 			memcpy(&netaddr, &addrin, addrinlen);
 			if(ai->ai_family == AF_INET) {
 				netaddr4 = (struct sockaddr_in *)&netaddr;
@@ -2148,6 +2148,7 @@
 	msg4(LOG_INFO, "connect from %s, assigned file is %s", 
 	     peername, client->exportname);
 	client->clientname=g_strdup(peername);
+	return 0;
 }
 
 /**
@@ -2158,6 +2159,95 @@
 	g_free(data);
 }
 
+static void
+handle_connection(GArray *servers, int net, SERVER *serve, CLIENT *client)
+{
+	int sock_flags_old;
+	int sock_flags_new;
+
+	if(serve->max_connections > 0 &&
+	   g_hash_table_size(children) >= serve->max_connections) {
+		msg2(LOG_INFO, "Max connections reached");
+		goto handle_connection_out;
+	}
+	if((sock_flags_old = fcntl(net, F_GETFL, 0)) == -1) {
+		err("fcntl F_GETFL");
+	}
+	sock_flags_new = sock_flags_old & ~O_NONBLOCK;
+	if (sock_flags_new != sock_flags_old &&
+	    fcntl(net, F_SETFL, sock_flags_new) == -1) {
+		err("fcntl F_SETFL ~O_NONBLOCK");
+	}
+	if(!client) {
+		client = g_new0(CLIENT, 1);
+		client->server=serve;
+		client->exportsize=OFFT_MAX;
+		client->net=net;
+		client->transactionlogfd = -1;
+	}
+	if (set_peername(net, client)) {
+		goto handle_connection_out;
+	}
+	if (!authorized_client(client)) {
+		msg2(LOG_INFO,"Unauthorized client") ;
+		goto handle_connection_out;
+	}
+	msg2(LOG_INFO,"Authorized client") ;
+
+	if (!dontfork) {
+		pid_t pid;
+		int i;
+		sigset_t newset;
+		sigset_t oldset;
+
+		sigemptyset(&newset);
+		sigaddset(&newset, SIGCHLD);
+		sigaddset(&newset, SIGTERM);
+		sigprocmask(SIG_BLOCK, &newset, &oldset);
+		if ((pid = fork()) < 0) {
+			msg3(LOG_INFO,"Could not fork (%s)",strerror(errno)) ;
+			sigprocmask(SIG_SETMASK, &oldset, NULL);
+			goto handle_connection_out;
+		}
+		if (pid > 0) { /* parent */
+			pid_t *pidp;
+
+			pidp = g_malloc(sizeof(pid_t));
+			*pidp = pid;
+			g_hash_table_insert(children, pidp, pidp);
+			sigprocmask(SIG_SETMASK, &oldset, NULL);
+			goto handle_connection_out;
+		}
+		/* child */
+		signal(SIGCHLD, SIG_DFL);
+		signal(SIGTERM, SIG_DFL);
+		sigprocmask(SIG_SETMASK, &oldset, NULL);
+
+		g_hash_table_destroy(children);
+		children = NULL;
+		for(i=0;i<servers->len;i++) {
+			serve=&g_array_index(servers, SERVER, i);
+			close(serve->socket);
+		}
+		/* FALSE does not free the
+		   actual data. This is required,
+		   because the client has a
+		   direct reference into that
+		   data, and otherwise we get a
+		   segfault... */
+		g_array_free(servers, FALSE);
+		close(modernsock);
+	}
+
+	msg2(LOG_INFO,"Starting to serve");
+	serveconnection(client);
+	exit(EXIT_SUCCESS);
+
+handle_connection_out:
+	g_free(client);
+	close(net);
+}
+
 /**
  * Loop through the available servers, and serve them. Never returns.
  **/
@@ -2185,99 +2275,42 @@
 			max=sock>max?sock:max;
 		}
 	}
-	if(modernsock) {
+	if(modernsock >= 0) {
 		FD_SET(modernsock, &mset);
 		max=modernsock>max?modernsock:max;
 	}
 	for(;;) {
-		CLIENT *client = NULL;
-		pid_t *pid;
-
 		memcpy(&rset, &mset, sizeof(fd_set));
 		if(select(max+1, &rset, NULL, NULL, NULL)>0) {
-			int net = 0;
-			SERVER* serve=NULL;
+			int net;
 
 			DEBUG("accept, ");
-			if(FD_ISSET(modernsock, &rset)) {
-				if((net=accept(modernsock, (struct sockaddr *) &addrin, &addrinlen)) < 0)
-					err("accept: %m");
+			if(modernsock >= 0 && FD_ISSET(modernsock, &rset)) {
+				CLIENT *client;
+
+				if((net=accept(modernsock, (struct sockaddr *) &addrin, &addrinlen)) < 0) {
+					err_nonfatal("accept: %m");
+					continue;
+				}
 				client = negotiate(net, NULL, servers, NEG_INIT | NEG_MODERN);
 				if(!client) {
 					err_nonfatal("negotiation failed");
 					close(net);
-					net=0;
 					continue;
 				}
-				serve = client->server;
+				handle_connection(servers, net, client->server, client);
 			}
-			for(i=0;i<servers->len && !net;i++) {
+			for(i=0; i < servers->len; i++) {
+				SERVER *serve;
+
 				serve=&(g_array_index(servers, SERVER, i));
 				if(FD_ISSET(serve->socket, &rset)) {
-					if ((net=accept(serve->socket, (struct sockaddr *) &addrin, &addrinlen)) < 0)
-						err("accept: %m");
-				}
-			}
-			if(net) {
-				int sock_flags;
-
-				if(serve->max_connections > 0 &&
-				   g_hash_table_size(children) >= serve->max_connections) {
-					msg2(LOG_INFO, "Max connections reached");
-					close(net);
-					continue;
-				}
-				if((sock_flags = fcntl(net, F_GETFL, 0))==-1) {
-					err("fcntl F_GETFL");
-				}
-				if(fcntl(net, F_SETFL, sock_flags &~O_NONBLOCK)==-1) {
-					err("fcntl F_SETFL ~O_NONBLOCK");
-				}
-				if(!client) {
-					client = g_new0(CLIENT, 1);
-					client->server=serve;
-					client->exportsize=OFFT_MAX;
-					client->net=net;
-					client->transactionlogfd = -1;
-				}
-				set_peername(net, client);
-				if (!authorized_client(client)) {
-					msg2(LOG_INFO,"Unauthorized client") ;
-					close(net);
-					continue;
-				}
-				msg2(LOG_INFO,"Authorized client") ;
-				pid=g_malloc(sizeof(pid_t));
-
-				if (!dontfork) {
-					if ((*pid=fork())<0) {
-						msg3(LOG_INFO,"Could not fork (%s)",strerror(errno)) ;
-						close(net);
-						continue;
-					}
-					if (*pid>0) { /* parent */
-						close(net);
-						g_hash_table_insert(children, pid, pid);
-						continue;
-					}
-					/* child */
-					g_hash_table_destroy(children);
-					for(i=0;i<servers->len;i++) {
-						serve=&g_array_index(servers, SERVER, i);
-						close(serve->socket);
-					}
-					/* FALSE does not free the
-					   actual data. This is required,
-					   because the client has a
-					   direct reference into that
-					   data, and otherwise we get a
-					   segfault... */
-					g_array_free(servers, FALSE);
-				}
-
-				msg2(LOG_INFO,"Starting to serve");
-				serveconnection(client);
-				exit(EXIT_SUCCESS);
+					if ((net=accept(serve->socket, (struct sockaddr *) &addrin, &addrinlen)) < 0) {
+						err_nonfatal("accept: %m");
+						continue;
+					}
+					handle_connection(servers, net, serve, NULL);
+				}
 			}
 		}
 	}
@@ -2432,11 +2465,14 @@
 
 	sa.sa_handler = sigchld_handler;
 	sigemptyset(&sa.sa_mask);
+	sigaddset(&sa.sa_mask, SIGTERM);
 	sa.sa_flags = SA_RESTART;
 	if(sigaction(SIGCHLD, &sa, NULL) == -1)
 		err("sigaction: %m");
+
 	sa.sa_handler = sigterm_handler;
 	sigemptyset(&sa.sa_mask);
+	sigaddset(&sa.sa_mask, SIGCHLD);
 	sa.sa_flags = SA_RESTART;
 	if(sigaction(SIGTERM, &sa, NULL) == -1)
 		err("sigaction: %m");
@@ -2594,9 +2630,10 @@
 #endif
 			client=g_malloc(sizeof(CLIENT));
 			client->server=serve;
-			client->net=0;
+			client->net=-1;
 			client->exportsize=OFFT_MAX;
-			set_peername(0,client);
+			if (set_peername(0, client))
+				exit(EXIT_FAILURE);
 			serveconnection(client);
 			return 0;
 		}

=== modified file 'simple_test'
--- simple_test	2011-10-20 10:27:44 +0000
+++ simple_test	2012-12-05 21:52:21 +0000
@@ -7,6 +7,8 @@
 tmpnam=${tmpdir}/nbd.dd
 mydir=$(dirname "`readlink -f $0`")
 
+set -e
+
 ulimit -c unlimited
 
 # Create a one-meg device
@@ -184,6 +186,30 @@
 		./nbd-tester-client localhost -N export1 -i -t ${mydir}/integrityhuge-test.tr
 		retval=$?
 	;;
+	*/list)
+		# List exports
+		# This only works if we built nbd-client, which only exists on
+		# Linux. But hey, testing nbd-client itself isn't a bad idea,
+		# so here goes.
+		if [ `uname -s` != "Linux" ]
+		then
+			retval=77
+		else
+			cat >${conffile} <<EOF
+[generic]
+	listenaddr = 127.0.0.1
+	allowlist = true
+[export1]
+	exportname = $tmpnam
+	readonly = true
+EOF
+			./nbd-server -C ${conffile} -p ${pidfile} &
+			PID=$!
+			sleep 1
+			./nbd-client -l localhost
+			retval=$?
+		fi
+		;;
 	*)
 		echo "E: unknown test $1"
 		exit 1
@@ -193,7 +219,10 @@
 then
 	kill `cat ${pidfile}`
 else
-	kill $PID
+	if [ ! -z "$PID" ]
+	then
+		kill $PID
+	fi
 fi
 if [ -z "$2" ]
 then