# HG changeset patch
# User Ivo Smits <Ivo@UCIS.nl>
# Date 1287601683 -7200
# Node ID 640f620a55cf4fa5d5a9b9cbbee3d8c38939cfcc
# Parent  6d86596d8884c063022b0f2838c466ba991da478
Bugfixes for floating remote and debian upgrade

diff -r 6d86596d8884 -r 640f620a55cf debian/static/DEBIAN/postinst
--- a/debian/static/DEBIAN/postinst	Thu Oct 14 02:15:55 2010 +0200
+++ b/debian/static/DEBIAN/postinst	Wed Oct 20 21:08:03 2010 +0200
@@ -1,4 +1,6 @@
 #!/bin/sh
 if [ "$1" = "configure" ]; then
-	/usr/sbin/useradd -d /nonexistent -N -r -s /bin/false quicktun
+	if ! getent passwd quicktun >/dev/null; then
+		/usr/sbin/useradd -d /nonexistent -N -r -s /bin/false -g nogroup quicktun
+	fi
 fi
diff -r 6d86596d8884 -r 640f620a55cf debian/static/DEBIAN/prerm
--- a/debian/static/DEBIAN/prerm	Thu Oct 14 02:15:55 2010 +0200
+++ b/debian/static/DEBIAN/prerm	Wed Oct 20 21:08:03 2010 +0200
@@ -1,4 +1,4 @@
 #!/bin/sh
-if [ "$1" = "upgrade" -o "$1" = "remove" ]; then
+if [ "$1" = "remove" ]; then
 	/usr/sbin/userdel quicktun
 fi
diff -r 6d86596d8884 -r 640f620a55cf src/common.c
--- a/src/common.c	Thu Oct 14 02:15:55 2010 +0200
+++ b/src/common.c	Wed Oct 20 21:08:03 2010 +0200
@@ -206,8 +206,8 @@
 		else if (fds[0].revents & (POLLERR | POLLHUP | POLLNVAL)) return errorexit("poll error on tap device");
 		else if (fds[1].revents & (POLLHUP | POLLNVAL)) return errorexit("poll error on udp socket");
 		if (fds[0].revents & POLLIN) {
+			len = read(ttfd, buffer_raw + p->offset_raw, p->buffersize_raw);
 			if (session.remote_float == 0 || session.remote_float == 2) {
-				len = read(ttfd, buffer_raw + p->offset_raw, p->buffersize_raw);
 				len = p->encode(&session, buffer_raw, buffer_enc, len);
 				if (len < 0) return len;
 				if (session.remote_float == 0) {
diff -r 6d86596d8884 -r 640f620a55cf version
--- a/version	Thu Oct 14 02:15:55 2010 +0200
+++ b/version	Wed Oct 20 21:08:03 2010 +0200
@@ -1,1 +1,1 @@
-2.1.2
+2.1.3