[Sks-devel] a few diffs to sks

[Chris Kuethe]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Voodoo programming here. But it seems to work.  So what's changed:

   * dbserver.ml: Trivial hack to log ip at debug level 5 or higher

   * bdb/bdb_stubs.c: db 4.2.X uses DB_RPCCLIENT (not DB_CLIENT)

   * number.ml: allow the makefile to set the bignum library
   * Makefile.local.unused: allow the makefile to set the bignum library
   * Makefile.: allow the makefile to set the bignum library

   * wserver.ml: allow up to a 10M HTTP POST, and better error codes

Index: dbserver.ml
===================================================================
RCS file: /cvsroot/sks/sks/dbserver.ml,v
retrieving revision 1.38
diff -u -r1.38 dbserver.ml
- --- dbserver.ml       24 Dec 2003 02:56:42 -0000      1.38
+++ dbserver.ml 28 Jan 2004 06:07:34 -0000
@@ -344,6 +344,7 @@
     match msg with 
       | Wserver.GET (request,headers) ->
          ignore (plerror 5 "Get request received");
+         ignore (plerror 5 "%s => %s" (sockaddr_to_string addr) request);
          let (base,oplist) = string_to_oplist request in
          if base = "/pks/lookup" then (
            let request = request_of_oplist oplist in

Index: bdb/bdb_stubs.c
===================================================================
RCS file: /cvsroot/sks/sks/bdb/bdb_stubs.c,v
retrieving revision 1.7
diff -u -r1.7 bdb_stubs.c
- --- bdb/bdb_stubs.c   28 Feb 2003 19:12:36 -0000      1.7
+++ bdb/bdb_stubs.c     28 Jan 2004 06:07:41 -0000
@@ -223,7 +223,7 @@
 
 // Declaration of flag enums in ocaml must be in same order as in C
 
- -static int dbenv_create_flags[] = { DB_CLIENT };
+static int dbenv_create_flags[] = { DB_RPCCLIENT };
 
 //+
 //+   type create_flag = CLIENT

Index: Makefile
===================================================================
RCS file: /cvsroot/sks/sks/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
- --- Makefile  24 Dec 2003 02:56:42 -0000      1.36
+++ Makefile    28 Jan 2004 06:10:59 -0000
@@ -36,6 +36,9 @@
 
 include Makefile.local
 
+ifndef NUMERIX_LONG
+       NUMERIX_LONG=Numerix.Slong
+endif
 ifndef PREFIX
        PREFIX=/usr/local
 endif
@@ -107,6 +110,13 @@
 FILES := $(shell sed s/.*/$(VERSIONPREFIX)\\/\&/ FILES)
 
 # Special case make rules for functions which require preprocessor directives
+
+number.cmx: number.ml VERSION
+       $(OCAMLOPT) $(OCAMLOPTFLAGS) \
+       -pp "sed s/NUMERIX_LONG/$(NUMERIX_LONG)/" -c $<
+
+number.cmo: number.ml VERSION
+       $(OCAMLC) $(OCAMLFLAGS) -pp "sed s/NUMERIX_LONG/$(NUMERIX_LONG)/" -c $<
 
 common.cmx: common.ml VERSION
        $(OCAMLOPT) $(OCAMLOPTFLAGS) \

Index: Makefile.local.unused
===================================================================
RCS file: /cvsroot/sks/sks/Makefile.local.unused,v
retrieving revision 1.3
diff -u -r1.3 Makefile.local.unused
- --- Makefile.local.unused     5 Jul 2003 15:16:29 -0000       1.3
+++ Makefile.local.unused       28 Jan 2004 06:10:59 -0000
@@ -2,6 +2,9 @@
 BDBINCLUDE=-I/usr/include
 PREFIX=/usr/local
 LIBDB=-ldb-4.1
+#  Change to "Numerix.Dlong" for non x86 platforms
+NUMERIX_LONG=Numerix.Slong
+export NUMERIX_LONG
 export BDBLIB
 export BDBINCLUDE
 export PREFIX

Index: number.ml
===================================================================
RCS file: /cvsroot/sks/sks/number.ml,v
retrieving revision 1.2
diff -u -r1.2 number.ml
- --- number.ml 12 Oct 2003 20:20:19 -0000      1.2
+++ number.ml   28 Jan 2004 06:10:59 -0000
@@ -18,7 +18,7 @@
 (** Basic operations and definitions for multi-precistion integers. *)
 
 (* Change to Dlong for non x86 platforms *)
- -module Nx = Numerix.Slong
+module Nx = NUMERIX_LONG
 
 let two = Nx.of_int 2
 let one = Nx.of_int 1

Index: wserver.ml
===================================================================
RCS file: /cvsroot/sks/sks/wserver.ml,v
retrieving revision 1.15
diff -u -r1.15 wserver.ml
- --- wserver.ml        24 Dec 2003 02:56:42 -0000      1.15
+++ wserver.ml  28 Jan 2004 06:10:59 -0000
@@ -165,7 +165,7 @@
 let get_lines cin = 
   Str.split eol (get_all cin)
 
- -let max_post_length = 5 * 1024 * 1024  (* posts restricted to 5 Megs or less 
*)
+let max_post_length = 10 * 1024 * 1024  (* posts restricted to 10 Megs or less 
*)
 
 let parse_post headers cin = 
   try 
@@ -300,7 +300,7 @@
            let output = HtmlTemplates.page ~title:"Error handling request"
                 ~body:(sprintf "Error handling request: %s" s)
            in
- -         send_result cout ~error_code:403 output
+           send_result cout ~error_code:500 output
 
        | e -> 
            ignore (Unix.alarm recover_timeout);
@@ -314,7 +314,7 @@
                 ~body:(sprintf "Error handling request.  Exception raised: %s"
                          (Common.err_to_string e)))
            in
- -         send_result cout ~error_code:403 output
+           send_result cout ~error_code:500 output
     with
       | Sys.Break as e -> raise e
       | Eventloop.SigAlarm as e ->

- -- 
Chris Kuethe, GCIA CISSP: Secure Systems Specialist - U of A CNS
      office: 157 General Services Bldg.    +1.780.492.8135
              address@hidden

     GDB has a 'break' feature; why doesn't it have 'fix' too?

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (OpenBSD)

iD8DBQFAF1RO8bLxfOPbiw4RApgIAJ0SFwbUATAZuJNKoH9g1Hk1AVp1lgCgoGbk
QW3FgzFPl1XMYdywPs5Eh0g=
=EyPT
-----END PGP SIGNATURE-----