# 
# patch "ChangeLog"
#  from [b52234a6c67f46af1ec7c215089e6428c3b4ba77]
#    to [2abd9c04f20c78fc540bfd97b882a5bf4d898ef3]
# 
# patch "netcmd.cc"
#  from [e267e539b35fdb9b5ad72b330773d0e92ea485f3]
#    to [d6a4b557b616231cd233f2935c5c3c9cae327362]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,10 @@
 2005-07-04  Nathaniel Smith  <address@hidden>
 
+	* netcmd.cc (test_netcmd_functions): Update for new anonymous/auth
+	packet formats.
+
+2005-07-04  Nathaniel Smith  <address@hidden>
+
 	* monotone.texi, monotone.1: Update for new glob stuff.
 	* commands.cc (process_netsync_args, push, pull, sync, serve):
 	'serve' always requires arguments, rather than falling back on db
--- netcmd.cc
+++ netcmd.cc
@@ -685,12 +685,15 @@
         // total cheat, since we don't actually verify that rsa_oaep_sha_data
         // is sensible anywhere here...
         rsa_oaep_sha_data out_key("nonce start my heart"), in_key;
-        string out_pattern("radishes galore!"), in_pattern;
+        utf8 out_include_pattern("radishes galore!"), in_include_pattern;
+        utf8 out_exclude_pattern("turnips galore!"), in_exclude_pattern;
 
-        out_cmd.write_anonymous_cmd(out_role, out_pattern, out_key);
+        out_cmd.write_anonymous_cmd(out_role, out_include_pattern, out_exclude_pattern, out_key);
         do_netcmd_roundtrip(out_cmd, in_cmd, buf);
-        in_cmd.read_anonymous_cmd(in_role, in_pattern, in_key);
+        in_cmd.read_anonymous_cmd(in_role, in_include_pattern, in_exclude_pattern, in_key);
         BOOST_CHECK(in_key == out_key);
+        BOOST_CHECK(in_include_pattern == out_include_pattern);
+        BOOST_CHECK(in_exclude_pattern == out_exclude_pattern);
         BOOST_CHECK(in_role == out_role);
         L(F("anonymous_cmd test done, buffer was %d bytes\n") % buf.size());
       }
@@ -706,19 +709,22 @@
         // total cheat, since we don't actually verify that rsa_oaep_sha_data
         // is sensible anywhere here...
         rsa_oaep_sha_data out_key("nonce start my heart"), in_key;
-        string out_signature(raw_sha1("burble") + raw_sha1("gorby")), out_pattern("radishes galore!"), 
-          in_signature, in_pattern;
+        string out_signature(raw_sha1("burble") + raw_sha1("gorby")), in_signature;
+        utf8 out_include_pattern("radishes galore!"), in_include_pattern;
+        utf8 out_exclude_pattern("turnips galore!"), in_exclude_pattern;
 
-        out_cmd.write_auth_cmd(out_role, out_pattern, out_client, out_nonce1, 
-                               out_key, out_signature);
+        out_cmd.write_auth_cmd(out_role, out_include_pattern, out_exclude_pattern
+                               , out_client, out_nonce1, out_key, out_signature);
         do_netcmd_roundtrip(out_cmd, in_cmd, buf);
-        in_cmd.read_auth_cmd(in_role, in_pattern, in_client,
-                             in_nonce1, in_key, in_signature);
+        in_cmd.read_auth_cmd(in_role, in_include_pattern, in_exclude_pattern,
+                             in_client, in_nonce1, in_key, in_signature);
         BOOST_CHECK(in_client == out_client);
         BOOST_CHECK(in_nonce1 == out_nonce1);
         BOOST_CHECK(in_key == out_key);
         BOOST_CHECK(in_signature == out_signature);
         BOOST_CHECK(in_role == out_role);
+        BOOST_CHECK(in_include_pattern == out_include_pattern);
+        BOOST_CHECK(in_exclude_pattern == out_exclude_pattern);
         L(F("auth_cmd test done, buffer was %d bytes\n") % buf.size());
       }