Commits

Kristian Fiskerstrand committed 337d76c

Remove debug output

  • Participants
  • Parent commits 58b4786

Comments (0)

Files changed (1)

 
 diff -r 3c75386bc7ce CHANGELOG
 --- a/CHANGELOG	Sat Oct 27 23:15:53 2012 +0200
-+++ b/CHANGELOG	Sun Oct 28 19:31:23 2012 +0100
++++ b/CHANGELOG	Sun Oct 28 19:39:53 2012 +0100
 @@ -3,6 +3,10 @@
      from self-signatures on the key's UIDs. In addition, instead of 8-digit
      key IDs, index entries now return the most specific key ID possible:
    - Fix X-HKP-Results-Count so that limit=0 returns no results, but include
 diff -r 3c75386bc7ce Makefile
 --- a/Makefile	Sat Oct 27 23:15:53 2012 +0200
-+++ b/Makefile	Sun Oct 28 19:31:23 2012 +0100
++++ b/Makefile	Sun Oct 28 19:39:53 2012 +0100
 @@ -80,11 +80,11 @@
  ROBJS=$(ROBJS.bc:.cmo=.cmx)
  
  	sksdump.cmo incdump.cmo dbserver.cmo reconComm.cmo recoverList.cmo \
 diff -r 3c75386bc7ce dbserver.ml
 --- a/dbserver.ml	Sat Oct 27 23:15:53 2012 +0200
-+++ b/dbserver.ml	Sun Oct 28 19:31:23 2012 +0100
++++ b/dbserver.ml	Sun Oct 28 19:39:53 2012 +0100
 @@ -170,7 +170,13 @@
    (** returns list of keys readied for presentation *)
    let clean_keys request keys =
              else key
 diff -r 3c75386bc7ce fixkey.ml
 --- a/fixkey.ml	Sat Oct 27 23:15:53 2012 +0200
-+++ b/fixkey.ml	Sun Oct 28 19:31:23 2012 +0100
++++ b/fixkey.ml	Sun Oct 28 19:39:53 2012 +0100
 @@ -24,6 +24,7 @@
  open MoreLabels
  open Common
  
  module Map = PMap.Map
  
-@@ -144,29 +145,87 @@
+@@ -144,29 +145,86 @@
    try ignore (ParsePGP.parse_pubkey_info pack); true
    with e -> false
  
 +                                      | (None, _)| (_, None) -> true
 +                                      | (Some x, Some y) -> 
 +                                        let keyid = Fingerprint.keyid_to_string ~short:false i in 
-+                                        plerror 10 "Signature %s" keyid;
 +                                        if List.exists (fun x -> x = keyid) robo_signers 
 +                                         then (if (Int64.to_float (Int64.add x y)) < today then false else true) 
 +                                         else true)
 + presentation_filter false key
 diff -r 3c75386bc7ce fixkey.mli
 --- a/fixkey.mli	Sat Oct 27 23:15:53 2012 +0200
-+++ b/fixkey.mli	Sun Oct 28 19:31:23 2012 +0100
++++ b/fixkey.mli	Sun Oct 28 19:39:53 2012 +0100
 @@ -15,4 +15,8 @@
  val drop_bad_sigs : Packet.packet list -> Packet.packet list
  val sig_filter_sigpair :
 +
 diff -r 3c75386bc7ce index.ml
 --- a/index.ml	Sat Oct 27 23:15:53 2012 +0200
-+++ b/index.ml	Sun Oct 28 19:31:23 2012 +0100
++++ b/index.ml	Sun Oct 28 19:39:53 2012 +0100
 @@ -27,40 +27,12 @@
  open Packet
  open Request
    List.stable_sort list
 diff -r 3c75386bc7ce index.mli
 --- a/index.mli	Sat Oct 27 23:15:53 2012 +0200
-+++ b/index.mli	Sun Oct 28 19:31:23 2012 +0100
++++ b/index.mli	Sun Oct 28 19:39:53 2012 +0100
 @@ -1,42 +1,39 @@
 -type siginfo
 -val empty_siginfo : unit -> siginfo
    Request.request -> Packet.packet list -> string -> string list
 diff -r 3c75386bc7ce request.ml
 --- a/request.ml	Sat Oct 27 23:15:53 2012 +0200
-+++ b/request.ml	Sun Oct 28 19:31:23 2012 +0100
++++ b/request.ml	Sun Oct 28 19:39:53 2012 +0100
 @@ -45,6 +45,7 @@
                   machine_readable: bool;
                   clean: bool;
              | ("op","x-stats") -> {request with kind = Stats };
 diff -r 3c75386bc7ce request.mli
 --- a/request.mli	Sat Oct 27 23:15:53 2012 +0200
-+++ b/request.mli	Sun Oct 28 19:31:23 2012 +0100
++++ b/request.mli	Sun Oct 28 19:39:53 2012 +0100
 @@ -11,6 +11,7 @@
    machine_readable : bool;
    clean : bool;
  val comma_rxp : Str.regexp
 diff -r 3c75386bc7ce sigInfo.ml
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/sigInfo.ml	Sun Oct 28 19:31:23 2012 +0100
++++ b/sigInfo.ml	Sun Oct 28 19:39:53 2012 +0100
 @@ -0,0 +1,132 @@
 +(***********************************************************************)
 +(* sigInfo.ml                                                           *)
 +  
 diff -r 3c75386bc7ce sigInfo.mli
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/sigInfo.mli	Sun Oct 28 19:31:23 2012 +0100
++++ b/sigInfo.mli	Sun Oct 28 19:39:53 2012 +0100
 @@ -0,0 +1,14 @@
 +type siginfo = {
 +  mutable userid : string option;