1.3 branch with alpha release

git-svn-id: https://svn.testnett.uninett.no/radsecproxy/branches/release-1.3@435 e88ac4ed-0b26-0410-9574-a7f39faa03bf

7 files changed, 15 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 3f9948a..50f2bbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,14 +40,12 @@
 	  cache of CA certificates and CRLs. This is particularly useful for
 	  regularly updating CRLs.
 	Some logging has been made more informative
-
-Additional features in devel-20081006
+2008-12-04 1.3-alpha
 	Support for TCP and DTLS transports (type tcp, type dtls)
 	Listen... options can be specified multiple times
 	Dynamic server discovery
 	DuplicateInterval option in client block for specifying for how
 	  long a request/reply shall be stored for duplicate detection
-Additional features in devel-20081106
 	Support for RADIUS TTL (hopcount) attribute. Decrements value of
 	  the TTL attribute if present, discards message if becomes 0.
 	  If addTTL option is used, the TTL attribute is added with the
diff --git a/README b/README
index 98459bf..cd36224 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
-This is a snapshot of the radsecproxy 2.0 devel branch from Nov 6, 2008
+This is radsecproxy 1.3-alpha from Dec 4, 2008
 
 radsecproxy is a generic RADIUS proxy that can support various
-RADIUS clients over UDP or TLS (RadSec).
+RADIUS clients over UDP, TLS (RadSec), TCP and DTLS.
 
 It should build on most Linux and BSD platforms by simply typing
 "make". You may also try to use autoconf, but this is currently
@@ -37,4 +37,4 @@ let me know if you feel left out.
 For more information, feedback etc. please see the information
 at http://software.uninett.no/radsecproxy/
 
-Stig Venaas <venaas@uninett.no> -- 2008.11.06
+Stig Venaas <venaas@uninett.no> -- 2008.12.04
diff --git a/configure.ac b/configure.ac
index e5aa6b2..ee71115 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(radsecproxy, devel-20081106, venaas@uninett.no)
+AC_INIT(radsecproxy, 1.3-alpha, venaas@uninett.no)
 AM_INIT_AUTOMAKE
 AC_PROG_CC
 AM_PROG_CC_C_O
diff --git a/radsecproxy.c b/radsecproxy.c
index 347d72a..d11cc97 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -3740,7 +3740,7 @@ void getargs(int argc, char **argv, uint8_t *foreground, uint8_t *pretend, uint8
 	    *pretend = 1;
 	    break;
 	case 'v':
-		debugx(0, DBG_ERR, "radsecproxy devel-20081106");
+		debugx(0, DBG_ERR, "radsecproxy 1.3-alpha");
 	default:
 	    goto usage;
 	}
@@ -3827,7 +3827,7 @@ int main(int argc, char **argv) {
 	debugx(1, DBG_ERR, "daemon() failed: %s", strerror(errno));
     
     debug_timestamp_on();
-    debug(DBG_INFO, "radsecproxy devel-20081106 starting");
+    debug(DBG_INFO, "radsecproxy 1.3-alpha starting");
 
     sigemptyset(&sigset);
     /* exit on all but SIGPIPE, ignore more? */
diff --git a/radsecproxy.conf-example b/radsecproxy.conf-example
index fdae1dd..bb154f7 100644
--- a/radsecproxy.conf-example
+++ b/radsecproxy.conf-example
@@ -32,6 +32,8 @@
 
 #There is an option for doing some simple loop prevention
 #LoopPrevention		on
+#Add TTL attribute with value 20 if not present (prevents endless loops)
+#addTTL 20
 
 #If we have TLS clients or servers we must define at least one tls block.
 #You can name them whatever you like and then reference them by name when
@@ -57,6 +59,9 @@ tls default {
     # CRLCheck on
     # Optionally specify how long CAs and CRLs are cached, default forever
     # CacheExpiry 3600
+    # Optionally require that peer certs have one of the specified policyOIDs
+    # policyoid     1.2.3 # this option can be used multiple times
+    # policyoid     1.3.4
 }
 
 #If you want one cert for all clients and another for all servers, use
diff --git a/radsecproxy.conf.5 b/radsecproxy.conf.5
index 0fb7826..fe48bb1 100644
--- a/radsecproxy.conf.5
+++ b/radsecproxy.conf.5
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH "radsecproxy.conf " 5 2008-11-06 "radsecproxy devel-20081106" ""
+.TH "radsecproxy.conf " 5 2008-12-04 "radsecproxy 1.3-alpha" ""
 .SH NAME
 radsecproxy.conf
 \- Radsec proxy configuration file 
diff --git a/radsecproxy.conf.5.xml b/radsecproxy.conf.5.xml
index a40e341..01003cd 100644
--- a/radsecproxy.conf.5.xml
+++ b/radsecproxy.conf.5.xml
@@ -2,14 +2,14 @@
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 <refentry>
   <refentryinfo>
-    <date>2008-11-06</date>
+    <date>2008-12-04</date>
   </refentryinfo>
   <refmeta>
     <refentrytitle>
       <application>radsecproxy.conf</application>
     </refentrytitle>
     <manvolnum>5</manvolnum>
-    <refmiscinfo>radsecproxy devel-20081106</refmiscinfo>
+    <refmiscinfo>radsecproxy 1.3-alpha</refmiscinfo>
   </refmeta>
   <refnamediv>
     <refname>