Date: Sun, 8 May 2011 11:10:56 +0000 (UTC) From: Pawel Jakub Dawidek <pjd@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r221643 - head/sbin/hastd Message-ID: <201105081110.p48BAuK9043163@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pjd Date: Sun May 8 11:10:56 2011 New Revision: 221643 URL: http://svn.freebsd.org/changeset/base/221643 Log: 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 Modified: head/sbin/hastd/parse.y Modified: head/sbin/hastd/parse.y ============================================================================== --- head/sbin/hastd/parse.y Sun May 8 11:05:03 2011 (r221642) +++ head/sbin/hastd/parse.y Sun May 8 11:10:56 2011 (r221643) @@ -289,6 +289,7 @@ yy_config_free(struct hastd_config *conf %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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105081110.p48BAuK9043163>