Deleted Added
full compact
parse.y (263729) parse.y (265511)
1%{
2/*-
3 * Copyright (c) 2012 The FreeBSD Foundation
4 * All rights reserved.
5 *
6 * This software was developed by Edward Tomasz Napierala under sponsorship
7 * from the FreeBSD Foundation.
8 *

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

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

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

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

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

768 log_debugx("portal-group \"default\" not defined; "
769 "going with defaults");
770 pg = portal_group_find(conf, "default");
771 assert(pg != NULL);
772 portal_group_add_listen(pg, "0.0.0.0:3260", false);
773 portal_group_add_listen(pg, "[::]:3260", false);
774 }
775
31 */
32
33#include <sys/queue.h>
34#include <sys/types.h>
35#include <sys/stat.h>
36#include <assert.h>
37#include <stdio.h>
38#include <stdint.h>

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

768 log_debugx("portal-group \"default\" not defined; "
769 "going with defaults");
770 pg = portal_group_find(conf, "default");
771 assert(pg != NULL);
772 portal_group_add_listen(pg, "0.0.0.0:3260", false);
773 portal_group_add_listen(pg, "[::]:3260", false);
774 }
775
776 conf->conf_kernel_port_on = true;
777
776 error = conf_verify(conf);
777 if (error != 0) {
778 conf_delete(conf);
779 return (NULL);
780 }
781
782 return (conf);
783}
778 error = conf_verify(conf);
779 if (error != 0) {
780 conf_delete(conf);
781 return (NULL);
782 }
783
784 return (conf);
785}