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

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

55extern int yylex(void);
56extern void yyrestart(FILE *);
57
58%}
59
60%token ALIAS AUTH_GROUP AUTH_TYPE BACKEND BLOCKSIZE CHAP CHAP_MUTUAL
61%token CLOSING_BRACKET DEBUG DEVICE_ID DISCOVERY_AUTH_GROUP DISCOVERY_FILTER
62%token INITIATOR_NAME INITIATOR_PORTAL LISTEN LISTEN_ISER LUN MAXPROC
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>

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

55extern int yylex(void);
56extern void yyrestart(FILE *);
57
58%}
59
60%token ALIAS AUTH_GROUP AUTH_TYPE BACKEND BLOCKSIZE CHAP CHAP_MUTUAL
61%token CLOSING_BRACKET DEBUG DEVICE_ID DISCOVERY_AUTH_GROUP DISCOVERY_FILTER
62%token INITIATOR_NAME INITIATOR_PORTAL LISTEN LISTEN_ISER LUN MAXPROC
63%token OPENING_BRACKET OPTION PATH PIDFILE PORTAL_GROUP SERIAL SIZE STR
63%token OPENING_BRACKET OPTION PATH PIDFILE PORTAL_GROUP SEMICOLON SERIAL SIZE STR
64%token TARGET TIMEOUT ISNS_SERVER ISNS_PERIOD ISNS_TIMEOUT
65
66%union
67{
68 char *str;
69}
70
71%token <str> STR
72
73%%
74
75statements:
76 |
77 statements statement
64%token TARGET TIMEOUT ISNS_SERVER ISNS_PERIOD ISNS_TIMEOUT
65
66%union
67{
68 char *str;
69}
70
71%token <str> STR
72
73%%
74
75statements:
76 |
77 statements statement
78 |
79 statements statement SEMICOLON
78 ;
79
80statement:
81 debug
82 |
83 timeout
84 |
85 maxproc

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

215 if (auth_group == NULL)
216 return (1);
217 }
218 ;
219
220auth_group_entries:
221 |
222 auth_group_entries auth_group_entry
80 ;
81
82statement:
83 debug
84 |
85 timeout
86 |
87 maxproc

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

217 if (auth_group == NULL)
218 return (1);
219 }
220 ;
221
222auth_group_entries:
223 |
224 auth_group_entries auth_group_entry
225 |
226 auth_group_entries auth_group_entry SEMICOLON
223 ;
224
225auth_group_entry:
226 auth_group_auth_type
227 |
228 auth_group_chap
229 |
230 auth_group_chap_mutual

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

317 if (portal_group == NULL)
318 return (1);
319 }
320 ;
321
322portal_group_entries:
323 |
324 portal_group_entries portal_group_entry
227 ;
228
229auth_group_entry:
230 auth_group_auth_type
231 |
232 auth_group_chap
233 |
234 auth_group_chap_mutual

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

321 if (portal_group == NULL)
322 return (1);
323 }
324 ;
325
326portal_group_entries:
327 |
328 portal_group_entries portal_group_entry
329 |
330 portal_group_entries portal_group_entry SEMICOLON
325 ;
326
327portal_group_entry:
328 portal_group_discovery_auth_group
329 |
330 portal_group_discovery_filter
331 |
332 portal_group_listen

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

401 if (target == NULL)
402 return (1);
403 }
404 ;
405
406target_entries:
407 |
408 target_entries target_entry
331 ;
332
333portal_group_entry:
334 portal_group_discovery_auth_group
335 |
336 portal_group_discovery_filter
337 |
338 portal_group_listen

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

407 if (target == NULL)
408 return (1);
409 }
410 ;
411
412target_entries:
413 |
414 target_entries target_entry
415 |
416 target_entries target_entry SEMICOLON
409 ;
410
411target_entry:
412 target_alias
413 |
414 target_auth_group
415 |
416 target_auth_type

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

648 if (lun == NULL)
649 return (1);
650 }
651 ;
652
653lun_entries:
654 |
655 lun_entries lun_entry
417 ;
418
419target_entry:
420 target_alias
421 |
422 target_auth_group
423 |
424 target_auth_type

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

656 if (lun == NULL)
657 return (1);
658 }
659 ;
660
661lun_entries:
662 |
663 lun_entries lun_entry
664 |
665 lun_entries lun_entry SEMICOLON
656 ;
657
658lun_entry:
659 lun_backend
660 |
661 lun_blocksize
662 |
663 lun_device_id

--- 227 unchanged lines hidden --- 		666 ;
667
668lun_entry:
669 lun_backend
670 |
671 lun_blocksize
672 |
673 lun_device_id

--- 227 unchanged lines hidden ---