comparison svr-main.c @ 773:a9f2a6ae4eb5

merge
author Matt Johnston <matt@ucc.asn.au>
date Sun, 14 Apr 2013 22:49:19 +0800
parents 0fd32a552ea5
children 7f604f9b3756
comparison
equal deleted inserted replaced
772:7fc0aeada79c 773:a9f2a6ae4eb5
269 if (fork_ret < 0) { 269 if (fork_ret < 0) {
270 dropbear_log(LOG_WARNING, "Error forking: %s", strerror(errno)); 270 dropbear_log(LOG_WARNING, "Error forking: %s", strerror(errno));
271 goto out; 271 goto out;
272 } 272 }
273 273
274 addrandom(&fork_ret, sizeof(fork_ret)); 274 addrandom((void*)&fork_ret, sizeof(fork_ret));
275 275
276 if (fork_ret > 0) { 276 if (fork_ret > 0) {
277 277
278 /* parent */ 278 /* parent */
279 childpipes[conn_idx] = childpipe[0]; 279 childpipes[conn_idx] = childpipe[0];