diff options
| author | pjd <pjd@FreeBSD.org> | 2011-05-08 11:10:56 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2011-05-08 11:10:56 +0000 |
| commit | 426d60677ddc353303f816c0ee91163d79ea4e45 (patch) | |
| tree | 391a48418b1b0db138cca33ec91038b564420f9e /sbin | |
| parent | 141d7e265f2d310c96089c289c0c38c9b096b986 (diff) | |
| download | FreeBSD-src-426d60677ddc353303f816c0ee91163d79ea4e45.zip FreeBSD-src-426d60677ddc353303f816c0ee91163d79ea4e45.tar.gz | |
Allow to specify remote as 'none' again which was broken by r219351, where
'none' was defined as a value for checksum.
Reported by: trasz
MFC after: 1 week
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/hastd/parse.y | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sbin/hastd/parse.y b/sbin/hastd/parse.y index 8cf6ed9..a04b686 100644 --- a/sbin/hastd/parse.y +++ b/sbin/hastd/parse.y @@ -289,6 +289,7 @@ yy_config_free(struct hastd_config *config) %token FULLSYNC MEMSYNC ASYNC NONE CRC32 SHA256 HOLE LZF %token NUM STR OB CB +%type <str> remote_str %type <num> replication_type %type <num> checksum_type %type <num> compression_type @@ -796,7 +797,7 @@ resource_node_entry: source_statement ; -remote_statement: REMOTE STR +remote_statement: REMOTE remote_str { assert(depth == 2); if (mynode) { @@ -813,6 +814,12 @@ remote_statement: REMOTE STR } ; +remote_str: + NONE { $$ = strdup("none"); } + | + STR { } + ; + source_statement: SOURCE STR { assert(depth == 2); |
