pullup:

Remove DNS_COMPRESS_GLOBAL, since the only type of global compression
is GLOBAL14

diff --git a/bin/tests/compress_test.c b/bin/tests/compress_test.c
index 4750f51b9f4122246286871d7f41659c8cfc5169..0eb2d998a273d2cc4d3ba786aa865a080337a429 100644 (file)
--- a/bin/tests/compress_test.c
+++ b/bin/tests/compress_test.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: compress_test.c,v 1.22 2000/11/14 23:29:45 bwelling Exp $ */
+/* $Id: compress_test.c,v 1.22.4.1 2001/01/06 00:11:08 gson Exp $ */
 
 #include <config.h>
 
@@ -88,7 +88,6 @@ main(int argc, char *argv[]) {
        test(DNS_COMPRESS_NONE, &name1, &name2, &name3, plain, sizeof plain);
        test(DNS_COMPRESS_GLOBAL14, &name1, &name2, &name3, plain,
             sizeof plain);
-       test(DNS_COMPRESS_GLOBAL, &name1, &name2, &name3, plain, sizeof plain);
        test(DNS_COMPRESS_ALL, &name1, &name2, &name3, plain, sizeof plain);
 
        dns_name_init(&name1, NULL);
@@ -108,7 +107,6 @@ main(int argc, char *argv[]) {
 
        test(DNS_COMPRESS_NONE, &name1, &name2, &name3, bit, sizeof bit);
        test(DNS_COMPRESS_GLOBAL14, &name1, &name2, &name3, bit, sizeof bit);
-       test(DNS_COMPRESS_GLOBAL, &name1, &name2, &name3, bit, sizeof bit);
        test(DNS_COMPRESS_ALL, &name1, &name2, &name3, bit, sizeof bit);
 
        return (0);
@@ -132,8 +130,6 @@ test(unsigned int allowed, dns_name_t *name1, dns_name_t *name2,
                switch (allowed) {
                case DNS_COMPRESS_NONE: s = "DNS_COMPRESS_NONE"; break;
                case DNS_COMPRESS_GLOBAL14: s = "DNS_COMPRESS_GLOBAL14"; break;
-               case DNS_COMPRESS_GLOBAL16: s = "DNS_COMPRESS_GLOBAL16"; break;
-               case DNS_COMPRESS_GLOBAL: s = "DNS_COMPRESS_GLOBAL"; break;
                /* case DNS_COMPRESS_ALL: s = "DNS_COMPRESS_ALL"; break; */
                default: s = "UNKOWN"; break;
                }

diff --git a/bin/tests/names/dns_name_fromwire_1_data b/bin/tests/names/dns_name_fromwire_1_data
index 549a8b033e48b62777008032fe2b386be71ff55f..b7ae69bfd802036119b1976eec8e6e61a44d9802 100644 (file)
--- a/bin/tests/names/dns_name_fromwire_1_data
+++ b/bin/tests/names/dns_name_fromwire_1_data
@@ -13,7 +13,6 @@
 #
 # and where dc_method is one of
 #      DNS_COMPRESS_ALL
-#      DNS_COMPRESS_GLOBAL
 #      DNS_COMPRESS_GLOBAL14
 #      DNS_COMPRESS_NONE
 #

diff --git a/bin/tests/names/dns_name_fromwire_2_data b/bin/tests/names/dns_name_fromwire_2_data
index d66949055205fdf2301406b2eb4ab0437d6e3b4c..90dfec4e71ad329b1b5cf2c711c758b03e322f2f 100644 (file)
--- a/bin/tests/names/dns_name_fromwire_2_data
+++ b/bin/tests/names/dns_name_fromwire_2_data
@@ -13,7 +13,6 @@
 #
 # and where dc_method is one of
 #      DNS_COMPRESS_ALL
-#      DNS_COMPRESS_GLOBAL
 #      DNS_COMPRESS_GLOBAL14
 #      DNS_COMPRESS_NONE
 #

diff --git a/bin/tests/names/dns_name_fromwire_3_data b/bin/tests/names/dns_name_fromwire_3_data
index deeca0a315ba17b2f579d3862e4c3a9db7544c10..f4253b475d22b1c12655b77d4f5b9efebe71b320 100644 (file)
--- a/bin/tests/names/dns_name_fromwire_3_data
+++ b/bin/tests/names/dns_name_fromwire_3_data
@@ -13,7 +13,6 @@
 #
 # and where dc_method is one of
 #      DNS_COMPRESS_ALL
-#      DNS_COMPRESS_GLOBAL
 #      DNS_COMPRESS_GLOBAL14
 #      DNS_COMPRESS_NONE
 #

diff --git a/bin/tests/names/dns_name_fromwire_4_data b/bin/tests/names/dns_name_fromwire_4_data
index a45855e1730bb5b018f959c5c275ed864da687a4..b76b326dbc88a0867a71c3a9051c24e5367cf0cd 100644 (file)
--- a/bin/tests/names/dns_name_fromwire_4_data
+++ b/bin/tests/names/dns_name_fromwire_4_data
@@ -13,7 +13,6 @@
 #
 # and where dc_method is one of
 #      DNS_COMPRESS_ALL
-#      DNS_COMPRESS_GLOBAL
 #      DNS_COMPRESS_GLOBAL14
 #      DNS_COMPRESS_NONE
 #

diff --git a/bin/tests/names/dns_name_fromwire_5_data b/bin/tests/names/dns_name_fromwire_5_data
index 4d2da865c373bee88fd270b37620d1448aaeef5d..1a4221b64809da92614122b64f52b73c0a121bfe 100644 (file)
--- a/bin/tests/names/dns_name_fromwire_5_data
+++ b/bin/tests/names/dns_name_fromwire_5_data
@@ -13,7 +13,6 @@
 #
 # and where dc_method is one of
 #      DNS_COMPRESS_ALL
-#      DNS_COMPRESS_GLOBAL
 #      DNS_COMPRESS_GLOBAL14
 #      DNS_COMPRESS_NONE
 #

diff --git a/bin/tests/names/dns_name_fromwire_6_data b/bin/tests/names/dns_name_fromwire_6_data
index 39dd88b275e356717d37251e819f3e17b0a2ff63..e4460cea0c6c82ef4e573c0c5a18994c254575da 100644 (file)
--- a/bin/tests/names/dns_name_fromwire_6_data
+++ b/bin/tests/names/dns_name_fromwire_6_data
@@ -13,7 +13,6 @@
 #
 # and where dc_method is one of
 #      DNS_COMPRESS_ALL
-#      DNS_COMPRESS_GLOBAL
 #      DNS_COMPRESS_GLOBAL14
 #      DNS_COMPRESS_NONE
 #

diff --git a/bin/tests/names/dns_name_fromwire_7_data b/bin/tests/names/dns_name_fromwire_7_data
index 65c02022f4e49281ef8d3d34c3a4c16a1d571b3d..5828bfc884580c4ee3e164acba4c3178b53fd267 100644 (file)
--- a/bin/tests/names/dns_name_fromwire_7_data
+++ b/bin/tests/names/dns_name_fromwire_7_data
@@ -13,7 +13,6 @@
 #
 # and where dc_method is one of
 #      DNS_COMPRESS_ALL
-#      DNS_COMPRESS_GLOBAL
 #      DNS_COMPRESS_GLOBAL14
 #      DNS_COMPRESS_NONE
 #

diff --git a/bin/tests/names/dns_name_fromwire_8_data b/bin/tests/names/dns_name_fromwire_8_data
index 160d9a15d279503d47c038bcb87624361d66e7d4..744da071c0193c9ddd6df9e18dc9bef5ff465b14 100644 (file)
--- a/bin/tests/names/dns_name_fromwire_8_data
+++ b/bin/tests/names/dns_name_fromwire_8_data
@@ -13,7 +13,6 @@
 #
 # and where dc_method is one of
 #      DNS_COMPRESS_ALL
-#      DNS_COMPRESS_GLOBAL
 #      DNS_COMPRESS_GLOBAL14
 #      DNS_COMPRESS_NONE
 #

diff --git a/bin/tests/names/dns_name_fromwire_9_data b/bin/tests/names/dns_name_fromwire_9_data
index 22e68387814e3e58b404e4ecc61ce29dd30768a9..47c8a068aee01644fb001b473e5aae06444ff645 100644 (file)
--- a/bin/tests/names/dns_name_fromwire_9_data
+++ b/bin/tests/names/dns_name_fromwire_9_data
@@ -13,7 +13,6 @@
 #
 # and where dc_method is one of
 #      DNS_COMPRESS_ALL
-#      DNS_COMPRESS_GLOBAL
 #      DNS_COMPRESS_GLOBAL14
 #      DNS_COMPRESS_NONE
 #

diff --git a/bin/tests/names/dns_name_towire_1_data b/bin/tests/names/dns_name_towire_1_data
index 60adf11cc78e15b8a5ded5d7865fd415bb712dca..a45d80a69f6ba24a7d4b3daf3409d90da334bbac 100644 (file)
--- a/bin/tests/names/dns_name_towire_1_data
+++ b/bin/tests/names/dns_name_towire_1_data
@@ -7,7 +7,6 @@
 #
 # and where dc_method is one of
 #      DNS_COMPRESS_ALL
-#      DNS_COMPRESS_GLOBAL
 #      DNS_COMPRESS_GLOBAL14
 #      DNS_COMPRESS_NONE
 #

diff --git a/bin/tests/names/dns_name_towire_2_data b/bin/tests/names/dns_name_towire_2_data
index 22aa60ecbdb142530c0ff2988085d85b7943109a..35479bea10b0991a16a10fcc9c682616a5b3e373 100644 (file)
--- a/bin/tests/names/dns_name_towire_2_data
+++ b/bin/tests/names/dns_name_towire_2_data
@@ -7,7 +7,6 @@
 #
 # and where dc_method is one of
 #      DNS_COMPRESS_ALL
-#      DNS_COMPRESS_GLOBAL
 #      DNS_COMPRESS_GLOBAL14
 #      DNS_COMPRESS_NONE
 #

diff --git a/bin/tests/names/t_names.c b/bin/tests/names/t_names.c
index 2dc39ff9e8ecc12cbcc1f34c8b4b820081e61246..e0e2ba9f789b2ce7e78b07d66c6e1b66117f995e 100644 (file)
--- a/bin/tests/names/t_names.c
+++ b/bin/tests/names/t_names.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_names.c,v 1.30 2000/12/28 00:43:12 bwelling Exp $ */
+/* $Id: t_names.c,v 1.30.2.1 2001/01/06 00:11:21 gson Exp $ */
 
 #include <config.h>
 
@@ -2242,8 +2242,6 @@ t_dns_name_fromwire_x(const char *testfile, size_t buflen) {
                                dc_method = DNS_COMPRESS_NONE;
                                if (! strcmp(tok, "DNS_COMPRESS_GLOBAL14"))
                                        dc_method = DNS_COMPRESS_GLOBAL14;
-                               else if (! strcmp(tok, "DNS_COMPRESS_GLOBAL"))
-                                       dc_method = DNS_COMPRESS_GLOBAL;
                                else if (! strcmp(tok, "DNS_COMPRESS_ALL"))
                                        dc_method = DNS_COMPRESS_ALL;
 

diff --git a/lib/tests/t_api.c b/lib/tests/t_api.c
index 6c6997b4ea336e10ff0ba3cb3a59911af55e8156..6ad86b7f6a49a8a056399cd3c58f457d7566088a 100644 (file)
--- a/lib/tests/t_api.c
+++ b/lib/tests/t_api.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_api.c,v 1.45 2000/12/28 00:42:59 bwelling Exp $ */
+/* $Id: t_api.c,v 1.45.2.1 2001/01/06 00:11:23 gson Exp $ */
 
 #include <config.h>
 
@@ -654,7 +654,6 @@ struct dc_method_map {
 
        {       DNS_COMPRESS_NONE,      "DNS_COMPRESS_NONE"     },
        {       DNS_COMPRESS_GLOBAL14,  "DNS_COMPRESS_GLOBAL14" },
-       {       DNS_COMPRESS_GLOBAL,    "DNS_COMPRESS_GLOBAL"   },
        {       DNS_COMPRESS_ALL,       "DNS_COMPRESS_ALL"      },
        {       0,                      NULL                    }
 };