Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2015-09-24 14:01:10 +01:00
commit b0372840e7
2 changed files with 8 additions and 1 deletions

View file

@ -153,15 +153,19 @@ retry:
}
fd = server_start(base, lockfd, lockfile);
}
if (locked) {
free(lockfile);
close(lockfd);
}
setblocking(fd, 0);
return (fd);
failed:
if (locked) {
free(lockfile);
close(lockfd);
}
close(fd);
return (-1);
}