Deleted Added
full compact
parse.y (275244) parse.y (275245)
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 275244 2014-11-29 15:32:15Z trasz $
30 * $FreeBSD: stable/10/usr.sbin/ctld/parse.y 275245 2014-11-29 15:34:17Z 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>

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

233 |
234 auth_group_initiator_portal
235 ;
236
237auth_group_auth_type: AUTH_TYPE STR
238 {
239 int error;
240
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>

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

233 |
234 auth_group_initiator_portal
235 ;
236
237auth_group_auth_type: AUTH_TYPE STR
238 {
239 int error;
240
241 error = auth_group_set_type_str(auth_group, $2);
241 error = auth_group_set_type(auth_group, $2);
242 free($2);
243 if (error != 0)
244 return (1);
245 }
246 ;
247
248auth_group_chap: CHAP STR STR
249 {

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

353 free($2);
354 }
355 ;
356
357portal_group_discovery_filter: DISCOVERY_FILTER STR
358 {
359 int error;
360
242 free($2);
243 if (error != 0)
244 return (1);
245 }
246 ;
247
248auth_group_chap: CHAP STR STR
249 {

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

353 free($2);
354 }
355 ;
356
357portal_group_discovery_filter: DISCOVERY_FILTER STR
358 {
359 int error;
360
361 error = portal_group_set_filter_str(portal_group, $2);
361 error = portal_group_set_filter(portal_group, $2);
362 free($2);
363 if (error != 0)
364 return (1);
365 }
366 ;
367
368portal_group_listen: LISTEN STR
369 {

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

475 } else {
476 target->t_auth_group = auth_group_new(conf, NULL);
477 if (target->t_auth_group == NULL) {
478 free($2);
479 return (1);
480 }
481 target->t_auth_group->ag_target = target;
482 }
362 free($2);
363 if (error != 0)
364 return (1);
365 }
366 ;
367
368portal_group_listen: LISTEN STR
369 {

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

475 } else {
476 target->t_auth_group = auth_group_new(conf, NULL);
477 if (target->t_auth_group == NULL) {
478 free($2);
479 return (1);
480 }
481 target->t_auth_group->ag_target = target;
482 }
483 error = auth_group_set_type_str(target->t_auth_group, $2);
483 error = auth_group_set_type(target->t_auth_group, $2);
484 free($2);
485 if (error != 0)
486 return (1);
487 }
488 ;
489
490target_chap: CHAP STR STR
491 {

--- 399 unchanged lines hidden ---
484 free($2);
485 if (error != 0)
486 return (1);
487 }
488 ;
489
490target_chap: CHAP STR STR
491 {

--- 399 unchanged lines hidden ---