Merging mainline, which includes a huge msnp13 merge.

Not 100% sure about the OpenSSL merge, should double check that but I'm
currently offline.

1 files changed, 1 insertions, 1 deletions

diff --git a/unix.c b/unix.c
index 4869e9f9..07f7c5f9 100644
--- a/unix.c
+++ b/unix.c
@@ -180,7 +180,7 @@ int main( int argc, char *argv[] )
 		/* Looks like env should *not* be freed here as putenv
 		   doesn't make a copy. Odd. */
 		
-		chdir( old_cwd );
+		i = chdir( old_cwd );
 		close( global.listen_socket );
 		
 		if( execv( argv[0], argv ) == -1 )