--- doc/examples/postgresql.sql 5 Jan 2007 15:27:05 -0000       1.1.2.8
+++ doc/examples/postgresql.sql 17 Apr 2007 13:37:56 -0000
@@ -199,13 +199,13 @@
 CREATE TABLE radippool (
        id                      BIGSERIAL PRIMARY KEY,
        pool_name               text NOT NULL,
-       FramedIPAddress         INET,
-       NASIPAddress            text NOT NULL,
+       FramedIPAddress         INET NOT NULL,
+       NASIPAddress            text,
        CalledStationId         VARCHAR(64),
-       CallingStationId        text NOT NULL DEFAULT ''::text,
-       expiry_time             TIMESTAMP(0) without time zone NOT NULL,
+       CallingStationId        text DEFAULT ''::text,
+       expiry_time             TIMESTAMP(0) without time zone NOT NULL DEFAULT now(),
        username                text DEFAULT ''::text,
-       pool_key                VARCHAR(30) NOT NULL
+       pool_key                VARCHAR(30)
 );

 --
--- raddb/sqlippool.conf        17 Aug 2006 14:20:52 -0000      1.1.2.3
+++ raddb/sqlippool.conf        17 Apr 2007 13:27:08 -0000
@@ -26,7 +26,7 @@
  # like Cisco internal pools do - it _trys_ to allocate the same IP-address
  # which user had last session...
  allocate-find = "SELECT framedipaddress FROM radippool \
-  WHERE pool_name = '%{reply:Pool-Name}' AND expiry_time < 'now'::timestamp(0) \
+  WHERE pool_name = '%{Pool-Name}' AND expiry_time < 'now'::timestamp(0) \
   ORDER BY pool_name, (username <> '%{User-Name}'), (callingstationid <> '%{Calling-Station-Id}'), expiry_time \
   LIMIT 1 \
   FOR UPDATE"