[Pkg-sks-commit] r141 - in sks/trunk/sks/debian: . patches

[chrism at alioth.debian.org]

Author: chrism
Date: 2008-06-19 15:07:26 +0000 (Thu, 19 Jun 2008)
New Revision: 141

Added:
   sks/trunk/sks/debian/patches/205_show_peer_when_config_rejected
Modified:
   sks/trunk/sks/debian/changelog
Log:
[project @ 143]
print peername in reject errors

Original author: weasel
Date: 2004-05-02 14:02:32.194960+00:00

Modified: sks/trunk/sks/debian/changelog
===================================================================
--- sks/trunk/sks/debian/changelog	2008-06-19 15:07:05 UTC (rev 140)
+++ sks/trunk/sks/debian/changelog	2008-06-19 15:07:26 UTC (rev 141)
@@ -1,6 +1,11 @@
+sks (1.0.7-0.2) UNRELEASED; urgency=low
+
+  * print peername in reject errors.
+
+ -- Peter Palfrader <weasel at debian.org>  Sun,  2 May 2004 15:38:02 +0200
+
 sks (1.0.7-0.1) UNRELEASED; urgency=low
 
-  * (Peter Palfrader)
-  * (Fabio M. Di Nitto)
+  * packaging sks.
 
  -- Peter Palfrader <weasel at debian.org>  Sun, 14 Mar 2004 01:46:23 +0100

Added: sks/trunk/sks/debian/patches/205_show_peer_when_config_rejected
===================================================================
--- sks/trunk/sks/debian/patches/205_show_peer_when_config_rejected	                        (rev 0)
+++ sks/trunk/sks/debian/patches/205_show_peer_when_config_rejected	2008-06-19 15:07:26 UTC (rev 141)
@@ -0,0 +1,51 @@
+Binary files sks-1.0.7-old/.reconCS.ml.swp and sks-1.0.7/.reconCS.ml.swp differ
+diff -ruN sks-1.0.7-old/reconCS.ml sks-1.0.7/reconCS.ml
+--- sks-1.0.7-old/reconCS.ml	Fri Feb 20 00:58:18 2004
++++ sks-1.0.7/reconCS.ml	Sun May  2 15:45:11 2004
+@@ -83,7 +83,7 @@
+   @param filters list of strings representing filters that have been applied
+   to data.
+ *)
+-let handle_config cin cout filters = 
++let handle_config cin cout filters peer = 
+   let configdata = build_configdata filters in
+   marshal cout (Config configdata); (* channel is flushed here *)
+   let remote_configdata = 
+@@ -99,15 +99,15 @@
+ 	 marshal_string cout "failed";
+ 	 marshal_string cout reason;
+ 	 cout#flush;
+-	 failwith (sprintf "Remote configuration rejected: %s"
+-		     reason)
++	 failwith (sprintf "Remote (%s) configuration rejected: %s"
++		     (sockaddr_to_string peer) reason)
+   );
+   (match unmarshal_string cin with
+        "passed" -> ()
+      | "failed" ->
+ 	 let reason = unmarshal_string cin in
+-	 failwith (sprintf "Local configuration rejected remotely: %s"
+-		     reason)
++	 failwith (sprintf "Local configuration rejected remotely(%s): %s"
++		     (sockaddr_to_string peer) reason)
+      | _ -> failwith "Unexpected configuration confirmation response"
+   );
+   remote_configdata
+@@ -144,7 +144,7 @@
+     let cin = Channel.sys_in_from_fd s
+     and cout = Channel.sys_out_from_fd s in
+     signore (plerror 4 "Initiating reconciliation");
+-    let remote_config = handle_config cin cout filters in
++    let remote_config = handle_config cin cout filters partner in
+     ignore (Unix.alarm !Settings.reconciliation_timeout);
+ 
+     let http_port = config_get_http_port remote_config in
+@@ -160,7 +160,7 @@
+ let handle_connection tree ~filters ~partner cin cout  = 
+ 
+   signore (plerror 4 "Joining reconciliation");
+-  let remote_config = handle_config cin cout filters in
++  let remote_config = handle_config cin cout filters partner in
+   ignore (Unix.alarm !Settings.reconciliation_timeout);
+   
+   let http_port = config_get_http_port remote_config in