Deleted Added
full compact
ctld.c (263724) ctld.c (263726)
1/*-
2 * Copyright (c) 2012 The FreeBSD Foundation
3 * All rights reserved.
4 *
5 * This software was developed by Edward Tomasz Napierala under sponsorship
6 * from the FreeBSD Foundation.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 12 unchanged lines hidden (view full) ---

21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
1/*-
2 * Copyright (c) 2012 The FreeBSD Foundation
3 * All rights reserved.
4 *
5 * This software was developed by Edward Tomasz Napierala under sponsorship
6 * from the FreeBSD Foundation.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 12 unchanged lines hidden (view full) ---

21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * $FreeBSD: stable/10/usr.sbin/ctld/ctld.c 263724 2014-03-25 12:12:37Z trasz $
29 * $FreeBSD: stable/10/usr.sbin/ctld/ctld.c 263726 2014-03-25 12:16:52Z trasz $
30 */
31
32#include <sys/types.h>
33#include <sys/time.h>
34#include <sys/socket.h>
35#include <sys/wait.h>
36#include <netinet/in.h>
37#include <assert.h>

--- 1062 unchanged lines hidden (view full) ---

1100 bool found_lun0;
1101 int error;
1102
1103 if (conf->conf_pidfile_path == NULL)
1104 conf->conf_pidfile_path = checked_strdup(DEFAULT_PIDFILE);
1105
1106 TAILQ_FOREACH(targ, &conf->conf_targets, t_next) {
1107 if (targ->t_auth_group == NULL) {
30 */
31
32#include <sys/types.h>
33#include <sys/time.h>
34#include <sys/socket.h>
35#include <sys/wait.h>
36#include <netinet/in.h>
37#include <assert.h>

--- 1062 unchanged lines hidden (view full) ---

1100 bool found_lun0;
1101 int error;
1102
1103 if (conf->conf_pidfile_path == NULL)
1104 conf->conf_pidfile_path = checked_strdup(DEFAULT_PIDFILE);
1105
1106 TAILQ_FOREACH(targ, &conf->conf_targets, t_next) {
1107 if (targ->t_auth_group == NULL) {
1108 log_warnx("missing authentication for target \"%s\"; "
1109 "must specify either \"auth-group\", \"chap\", "
1110 "or \"chap-mutual\"", targ->t_name);
1111 return (1);
1108 targ->t_auth_group = auth_group_find(conf,
1109 "default");
1110 assert(targ->t_auth_group != NULL);
1112 }
1113 if (targ->t_portal_group == NULL) {
1114 targ->t_portal_group = portal_group_find(conf,
1115 "default");
1116 assert(targ->t_portal_group != NULL);
1117 }
1118 found_lun0 = false;
1119 TAILQ_FOREACH(lun, &targ->t_luns, l_next) {

--- 763 unchanged lines hidden ---
1111 }
1112 if (targ->t_portal_group == NULL) {
1113 targ->t_portal_group = portal_group_find(conf,
1114 "default");
1115 assert(targ->t_portal_group != NULL);
1116 }
1117 found_lun0 = false;
1118 TAILQ_FOREACH(lun, &targ->t_luns, l_next) {

--- 763 unchanged lines hidden ---