Deleted Added
full compact
parse.y (222119) parse.y (222120)
1%{
2/*-
3 * Copyright (c) 2009-2010 The FreeBSD Foundation
4 * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
5 * All rights reserved.
6 *
7 * This software was developed by Pawel Jakub Dawidek under sponsorship from
8 * the FreeBSD Foundation.

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

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

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

23 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE.
30 *
31 * $FreeBSD: head/sbin/hastd/parse.y 222119 2011-05-20 11:15:27Z pjd $
31 * $FreeBSD: head/sbin/hastd/parse.y 222120 2011-05-20 11:16:25Z pjd $
32 */
33
34#include <sys/param.h> /* MAXHOSTNAMELEN */
35#include <sys/queue.h>
36#include <sys/socket.h>
37#include <sys/sysctl.h>
38
39#include <arpa/inet.h>

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

252 }
253 (void)strlcpy(lst->hl_addr, depth0_listen_tcp4,
254 sizeof(lst->hl_addr));
255 TAILQ_INSERT_TAIL(&lconfig->hc_listen, lst, hl_next);
256 } else {
257 pjdlog_debug(1,
258 "No IPv4 support in the kernel, not listening on IPv4 address.");
259 }
32 */
33
34#include <sys/param.h> /* MAXHOSTNAMELEN */
35#include <sys/queue.h>
36#include <sys/socket.h>
37#include <sys/sysctl.h>
38
39#include <arpa/inet.h>

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

252 }
253 (void)strlcpy(lst->hl_addr, depth0_listen_tcp4,
254 sizeof(lst->hl_addr));
255 TAILQ_INSERT_TAIL(&lconfig->hc_listen, lst, hl_next);
256 } else {
257 pjdlog_debug(1,
258 "No IPv4 support in the kernel, not listening on IPv4 address.");
259 }
260#ifdef notyet
261 if (family_supported(AF_INET6)) {
262 lst = calloc(1, sizeof(*lst));
263 if (lst == NULL) {
264 pjdlog_error("Unable to allocate memory for listen address.");
265 yy_config_free(lconfig);
266 if (exitonerror)
267 exit(EX_TEMPFAIL);
268 return (NULL);
269 }
270 (void)strlcpy(lst->hl_addr, depth0_listen_tcp6,
271 sizeof(lst->hl_addr));
272 TAILQ_INSERT_TAIL(&lconfig->hc_listen, lst, hl_next);
273 } else {
274 pjdlog_debug(1,
275 "No IPv6 support in the kernel, not listening on IPv6 address.");
276 }
260 if (family_supported(AF_INET6)) {
261 lst = calloc(1, sizeof(*lst));
262 if (lst == NULL) {
263 pjdlog_error("Unable to allocate memory for listen address.");
264 yy_config_free(lconfig);
265 if (exitonerror)
266 exit(EX_TEMPFAIL);
267 return (NULL);
268 }
269 (void)strlcpy(lst->hl_addr, depth0_listen_tcp6,
270 sizeof(lst->hl_addr));
271 TAILQ_INSERT_TAIL(&lconfig->hc_listen, lst, hl_next);
272 } else {
273 pjdlog_debug(1,
274 "No IPv6 support in the kernel, not listening on IPv6 address.");
275 }
277#endif
278 if (TAILQ_EMPTY(&lconfig->hc_listen)) {
279 pjdlog_error("No address to listen on.");
280 yy_config_free(lconfig);
281 if (exitonerror)
282 exit(EX_TEMPFAIL);
283 return (NULL);
284 }
285 }

--- 631 unchanged lines hidden ---
276 if (TAILQ_EMPTY(&lconfig->hc_listen)) {
277 pjdlog_error("No address to listen on.");
278 yy_config_free(lconfig);
279 if (exitonerror)
280 exit(EX_TEMPFAIL);
281 return (NULL);
282 }
283 }

--- 631 unchanged lines hidden ---