@@ -3,6 +3,9 @@

     This prevents them turning up in Depends - see the README.
+  * Use correct variable name for cht_adnstcl_{queries,resolvers}
+    everywhere (prevents coredump accessing uninitialised version).
+  * Correct doc comment for supplying query options to adns asynch.

diff --git a/adns/adns.c b/adns/adns.c
index 53a1b01b61ae452ea91eea08dc5d6b23c2d547ad..b924c0705c41fef580d1006cf361d5e0f9588f30 100644 (file)
--- a/adns/adns.c
+++ b/adns/adns.c
@@ -20,7 +20,7 @@
  *
  * adns asynch ON-YES ON-NO ON-DONTKNOW XARGS \
  *             TYPE DOMAIN \
  *
  * adns asynch ON-YES ON-NO ON-DONTKNOW XARGS \
  *             TYPE DOMAIN \

- *             [QUERY-OPTIONS]                               => QUERY-ID
+ *             [QUERY-OPTIONS...]                            => QUERY-ID

  *        calls, later,
  *           [concat ON-YES|ON-NO|ON-DONTKNOW XARGS RESULTS]
  * adns asynch-cancel QUERY-ID
  *        calls, later,
  *           [concat ON-YES|ON-NO|ON-DONTKNOW XARGS RESULTS]
  * adns asynch-cancel QUERY-ID


@@ -323,7 +323,7 @@ static void destroy_resolver_defcb(ClientData resolver_v, Tcl_Interp *ip) {
 }
 
 int cht_do_adns_destroy_resolver(ClientData cd, Tcl_Interp *ip, void *res_v) {
 }
 
 int cht_do_adns_destroy_resolver(ClientData cd, Tcl_Interp *ip, void *res_v) {

-  cht_tabledataid_disposing(ip,res_v,&adnstcl_resolvers);
+  cht_tabledataid_disposing(ip,res_v,&cht_adnstcl_resolvers);

   destroy_resolver(ip,res_v);
   return TCL_OK;
 }
   destroy_resolver(ip,res_v);
   return TCL_OK;
 }


@@ -429,7 +429,7 @@ static int oifn_resolver(Tcl_Interp *ip, const OptionInfo *oi,
   void *val_v;
   int rc;
   
   void *val_v;
   int rc;
   

-  rc= cht_pat_iddata(ip,arg,&val_v,&adnstcl_resolvers);
+  rc= cht_pat_iddata(ip,arg,&val_v,&cht_adnstcl_resolvers);

   if (rc) return rc;
   op->resolver= val_v;
   return TCL_OK;
   if (rc) return rc;
   op->resolver= val_v;
   return TCL_OK;


@@ -724,7 +724,7 @@ static void asynch_check_now(Resolver *res) {
     query= query_v;
 
     query->aqu= 0;
     query= query_v;
 
     query->aqu= 0;

-    cht_tabledataid_disposing(interp, query, &adnstcl_queries);
+    cht_tabledataid_disposing(interp, query, &cht_adnstcl_queries);

 
     si= (!answer->status ? &query->on_yes
         : answer->status > adns_s_max_tempfail ? &query->on_no
 
     si= (!answer->status ? &query->on_yes
         : answer->status > adns_s_max_tempfail ? &query->on_no


@@ -787,7 +787,7 @@ int cht_do_adns_asynch_cancel(ClientData cd, Tcl_Interp *ip, void *query_v) {
 }
 
 static void asynch_query_dispose(Tcl_Interp *interp, Query *query) {
 }
 
 static void asynch_query_dispose(Tcl_Interp *interp, Query *query) {

-  cht_tabledataid_disposing(interp, query, &adnstcl_queries);
+  cht_tabledataid_disposing(interp, query, &cht_adnstcl_queries);

   cht_scriptinv_cancel(&query->on_yes);
   cht_scriptinv_cancel(&query->on_no);
   cht_scriptinv_cancel(&query->on_fail);
   cht_scriptinv_cancel(&query->on_yes);
   cht_scriptinv_cancel(&query->on_no);
   cht_scriptinv_cancel(&query->on_fail);


@@ -800,7 +800,7 @@ static void destroy_query_idtabcb(Tcl_Interp *interp, void *query_v) {
   asynch_query_dispose(interp, query_v);
 }
 
   asynch_query_dispose(interp, query_v);
 }
 

-const IdDataSpec adnstcl_queries= {
+const IdDataSpec cht_adnstcl_queries= {

   "adns", "adns-query-table", destroy_query_idtabcb
 };
 
   "adns", "adns-query-table", destroy_query_idtabcb
 };
 

diff --git a/adns/adns.tct b/adns/adns.tct
index dbb700ce0e1298c5d04b3aed2db387603a3cada7..a1c27565ec4cd3b884f419e010e860ea4a40465f 100644 (file)
--- a/adns/adns.tct
+++ b/adns/adns.tct
@@ -45,14 +45,14 @@ Table adns Adns_SubCommand
                rrtype  enum(AdnsTclRRTypeInfo/, "rrtype")
                domain  string
                ...     obj
                rrtype  enum(AdnsTclRRTypeInfo/, "rrtype")
                domain  string
                ...     obj

-               =>      iddata(&adnstcl_queries)
+               =>      iddata(&cht_adnstcl_queries)

        asynch-cancel
        asynch-cancel

-               query   iddata(&adnstcl_queries)
+               query   iddata(&cht_adnstcl_queries)

        new-resolver
                ...     obj
        new-resolver
                ...     obj

-               =>      iddata(&adnstcl_resolvers)
+               =>      iddata(&cht_adnstcl_resolvers)

        set-default-resolver
        set-default-resolver

-               res     iddata(&adnstcl_resolvers)
+               res     iddata(&cht_adnstcl_resolvers)

        destroy-resolver
        destroy-resolver

-               res     iddata(&adnstcl_resolvers)
+               res     iddata(&cht_adnstcl_resolvers)

 
 

diff --git a/adns/chiark_tcl_adns.h b/adns/chiark_tcl_adns.h
index f450f4a6efcb95dfc69e35ce0b1d225d0050b5ae..eec6d21524c0c1645de01ab19d26dff69970d8ce 100644 (file)
--- a/adns/chiark_tcl_adns.h
+++ b/adns/chiark_tcl_adns.h
@@ -28,7 +28,7 @@ typedef struct {
   adns_rrtype number;
 } AdnsTclRRTypeInfo;
 
   adns_rrtype number;
 } AdnsTclRRTypeInfo;
 

-const IdDataSpec adnstcl_queries, adnstcl_resolvers;
+extern const IdDataSpec cht_adnstcl_queries, cht_adnstcl_resolvers;

 
 #include "adns+tcmdif.h"
 
 
 #include "adns+tcmdif.h"
 

diff --git a/debian/changelog b/debian/changelog
index 6b91a92e3b1b0bde223534435aa77137f85dbf38..40bba4b86add24ee4be5bdc218734ff971807ecd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ chiark-tcl (1.0.1) unstable; urgency=low
   * Do not run dpkg-shlibdeps on adns and nettle plugins.
     This prevents them turning up in Depends - see the README.
   * Use correct syntax for avoiding compressing doc/*/*.[ch].txt.
   * Do not run dpkg-shlibdeps on adns and nettle plugins.
     This prevents them turning up in Depends - see the README.
   * Use correct syntax for avoiding compressing doc/*/*.[ch].txt.

+  * Use correct variable name for cht_adnstcl_{queries,resolvers}
+    everywhere (prevents coredump accessing uninitialised version).
+  * Correct doc comment for supplying query options to adns asynch.

 
  --
 
 
  --