From: Andre Noll <maan@systemlinux.org>
Date: Thu, 5 Nov 2009 23:27:40 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.0~4
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=d1f203ea37e3b3ca0ac6db268331961caa47d705

Merge branch 'maint'

Conflicts:
	server.c
---

d1f203ea37e3b3ca0ac6db268331961caa47d705
diff --cc server.c
index be97516f,95ff25cf..f7aad898
--- a/server.c
+++ b/server.c
@@@ -443,12 -475,11 +444,12 @@@ static int init_afs(void
  	ret = socketpair(PF_UNIX, SOCK_DGRAM, 0, afs_server_socket);
  	if (ret < 0)
  		exit(EXIT_FAILURE);
 -	afs_socket_cookie = para_random((uint32_t)-1);
 +	get_random_bytes_or_die((unsigned char *)&afs_socket_cookie,
 +		sizeof(afs_socket_cookie));
- 	mmd->afs_pid = fork();
- 	if (mmd->afs_pid < 0)
+ 	afs_pid = fork();
+ 	if (afs_pid < 0)
  		exit(EXIT_FAILURE);
- 	if (!mmd->afs_pid) { /* child (afs) */
+ 	if (afs_pid == 0) { /* child (afs) */
  		close(afs_server_socket[0]);
  		afs_init(afs_socket_cookie, afs_server_socket[1]);
  	}