/[sks]/sks/dbserver.ml
ViewVC logotype

Diff of /sks/dbserver.ml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.36 by yminsky, Fri Nov 21 11:44:29 2003 UTC revision 1.37 by yminsky, Tue Dec 2 11:03:33 2003 UTC
# Line 398  struct Line 398  struct
398                            Keydb.add_key_merge ~newkey:true key;                            Keydb.add_key_merge ~newkey:true key;
399                            cout#write_string "Key Accepted<br>"                            cout#write_string "Key Accepted<br>"
400                          with                          with
401                            | KeyMerge.Unparseable_packet_sequence ->                              | Fixkey.Bad_key | KeyMerge.Unparseable_packet_sequence ->
402                                cout#write_string                                cout#write_string
403                                ("Add failed: Malformed Key --- unexpected packet " ^                                ("Add failed: Malformed Key --- unexpected packet " ^
404                                 "type and/or order of packets");                                 "type and/or order of packets");
# Line 474  struct Line 474  struct
474            let keys = List.fold_left ~init:[] keys            let keys = List.fold_left ~init:[] keys
475                         ~f:(fun list key ->                         ~f:(fun list key ->
476                               try (Fixkey.canonicalize key)::list                               try (Fixkey.canonicalize key)::list
477                               with KeyMerge.Unparseable_packet_sequence -> list                               with KeyMerge.Unparseable_packet_sequence | Fixkey.Bad_key -> list
478                            )                            )
479            in            in
480            marshal cout (Ack 0);            marshal cout (Ack 0);

Legend:
Removed from v.1.36  
changed lines
  Added in v.1.37

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26