diff options
| author |   claudio <claudio@openbsd.org> | 2014-02-17 18:59:50 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2014-02-17 18:59:50 +0000 |
| commit | 442b4c8414d65c9733ce4f2dea014f90cc9d05e0 (patch) | |
| tree | d8b6c2e78906ffbbe111b96da980f5e0c934104e /usr.sbin/iscsid | |
| parent | Don't crash when given a invalid colour, reported by Felix Rosencrantz, (diff) | |
| download | wireguard-openbsd-442b4c8414d65c9733ce4f2dea014f90cc9d05e0.tar.xz wireguard-openbsd-442b4c8414d65c9733ce4f2dea014f90cc9d05e0.zip | |
Call control_init() before daemon() so that iscsid && iscsictl reload works
Diffstat (limited to 'usr.sbin/iscsid')
| -rw-r--r-- | usr.sbin/iscsid/iscsid.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/iscsid/iscsid.c b/usr.sbin/iscsid/iscsid.c index 3a0112c3a50..446b37a8bcd 100644 --- a/usr.sbin/iscsid/iscsid.c +++ b/usr.sbin/iscsid/iscsid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iscsid.c,v 1.8 2011/08/20 19:03:39 sthen Exp $ */ +/* $OpenBSD: iscsid.c,v 1.9 2014/02/17 18:59:50 claudio Exp $ */ /* * Copyright (c) 2009 Claudio Jeker <claudio@openbsd.org> @@ -106,14 +106,15 @@ main(int argc, char *argv[]) log_init(debug); log_verbose(verbose); + if (control_init(ctrlsock) == -1) + fatalx("control socket setup failed"); + if (!debug) daemon(1, 0); log_info("startup"); event_init(); vscsi_open(vscsidev); - if (control_init(ctrlsock) == -1) - fatalx("control socket setup failed"); /* chroot and drop to iscsid user */ if ((pw = getpwnam(ISCSID_USER)) == NULL) |