bind-ttl.patch

   1 --- bind-8.2.2_P5/src/bin/named/db_load.c.ttl   Mon Feb 28 00:47:21 2000
   2 +++ bind-8.2.2_P5/src/bin/named/db_load.c       Mon Feb 28 00:50:13 2000
   3 @@ -292,6 +292,7 @@
   4                 default_warn = 1;
   5                 clev = nlabels(in_origin);
   6                 filenames = NULL;
   7 +               zp->z_minimum = USE_MINIMUM;
   8         }
   9         ttl = default_ttl;
  10
  11 @@ -742,7 +743,7 @@
  12                                         zp->z_minimum = 0;
  13                                 } else
  14                                         zp->z_minimum = n;
  15 -                               if (default_ttl == USE_MINIMUM)
  16 +                               if (ttl == USE_MINIMUM)
  17                                         ttl = n;
  18                                 n = cp - (char *)data;
  19                                 if (multiline) {
  20 @@ -750,6 +751,7 @@
  21                                         buf[1] = '\0';
  22                                         if (buf[0] != ')')
  23                                                 ERRTO("SOA \")\"");
  24 +                                       multiline = 0;
  25                                         endline(fp);
  26                                 }
  27                                  read_soa++;
  28 @@ -971,11 +973,14 @@
  29                         case ns_t_cert:
  30                         case ns_t_sig: {
  31                                 char *errmsg = NULL;
  32 -                               int ret = parse_sec_rdata(buf, sizeof(buf), 0,
  33 -                                                         data, sizeof(data),
  34 -                                                         fp, zp, domain, ttl,
  35 -                                                         type, domain_ctx,
  36 -                                                         transport, &errmsg);
  37 +                               int ret;
  38 +                               if (ttl == USE_MINIMUM) /* no ttl set */
  39 +                                  ttl = 0;
  40 +                               ret = parse_sec_rdata(buf, sizeof(buf), 0,
  41 +                                                     data, sizeof(data),
  42 +                                                     fp, zp, domain, ttl,
  43 +                                                     type, domain_ctx,
  44 +                                                     transport, &errmsg);
  45                                 if (ret < 0) {
  46                                         errtype = errmsg;
  47                                         goto err;
  48 @@ -1022,6 +1027,8 @@
  49                                         zp->z_origin);
  50                                 continue;
  51                         }
  52 +                       if (ttl == USE_MINIMUM) /* no ttl set */
  53 +                               ttl = 0;
  54                         dp = savedata(class, type, (u_int32_t)ttl,
  55                                       (u_char *)data, (int)n);
  56                         dp->d_zone = zp - zones;