Merge branch 'maint'

Conflicts:
	server.c

diff --cc server.c
index be97516f1e66272cf53abde69122d80906d53159,95ff25cf77afb9f772a4336626e2bf340a2da868..f7aad89841306a3e4e431b039584f86822d82474
--- 1/server.c
--- 2/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]);
        }