[or-cvs] r9020: Patch from Fabian Keil: Fix return statement in get_pf_socke (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2006-12-04 00:09:09 -0500 (Mon, 04 Dec 2006)
New Revision: 9020

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/connection_edge.c
Log:
 r9853 at Kushana:  nickm | 2006-12-04 00:02:03 -0500
 Patch from Fabian Keil: Fix return statement in get_pf_socket()



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r9853] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2006-12-03 23:17:11 UTC (rev 9019)
+++ tor/trunk/ChangeLog	2006-12-04 05:09:09 UTC (rev 9020)
@@ -1,3 +1,8 @@
+Changes in version 0.1.2.5-xxxx - 200?-??-??
+  o Minor bugfixes;
+    - Fix a bug when a PF socket is first used.  (Patch from Fabian
+      Keil)
+
 Changes in version 0.1.2.4-alpha - 2006-12-03
   o Major features:
     - Add support for using natd; this allows FreeBSDs earlier than

Modified: tor/trunk/src/or/connection_edge.c
===================================================================
--- tor/trunk/src/or/connection_edge.c	2006-12-03 23:17:11 UTC (rev 9019)
+++ tor/trunk/src/or/connection_edge.c	2006-12-04 05:09:09 UTC (rev 9020)
@@ -1310,6 +1310,7 @@
   }
 
   pf_socket = pf;
+  return pf_socket;
 }
 #endif