Cherry-pick upstream fix to add missing continuation in postgresql sample config
Closes: #992207
Bernhard Schmidt
2 years ago
| 0 | From eef366956e2e4a689ab33a0d1f265eb15f749d8d Mon Sep 17 00:00:00 2001 | |
| 1 | From: Alejandro Perez <alex.perez-mendez@jisc.ac.uk> | |
| 2 | Date: Mon, 6 Apr 2020 15:52:38 +0200 | |
| 3 | Subject: [PATCH] Add missing backslash that precluded server from starting | |
| 4 | ||
| 5 | Server did not start, because it found an unterminated string. Adding the previous-existing backslash fixed it. | |
| 6 | ``` | |
| 7 | including configuration file /etc/raddb/mods-config/sql/main/postgresql/queries.conf | |
| 8 | /etc/raddb/mods-config/sql/main/postgresql/queries.conf[505]: Parse error: Unterminated string | |
| 9 | Errors reading or parsing /etc/raddb/radiusd.conf | |
| 10 | ``` | |
| 11 | --- | |
| 12 | raddb/mods-config/sql/main/postgresql/queries.conf | 2 +- | |
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 14 | ||
| 15 | diff --git a/raddb/mods-config/sql/main/postgresql/queries.conf b/raddb/mods-config/sql/main/postgresql/queries.conf | |
| 16 | index da82467aea5..b868238306a 100644 | |
| 17 | --- a/raddb/mods-config/sql/main/postgresql/queries.conf | |
| 18 | +++ b/raddb/mods-config/sql/main/postgresql/queries.conf | |
| 19 | @@ -502,7 +502,7 @@ accounting { | |
| 20 | FramedInterfaceId = NULLIF('%{Framed-Interface-Id}', ''), \ | |
| 21 | DelegatedIPv6Prefix = NULLIF('%{Delegated-IPv6-Prefix}', '')::inet, \ | |
| 22 | AcctUpdateTime = ${....event_timestamp}, \ | |
| 23 | - AcctSessionTime = COALESCE(%{%{Acct-Session-Time}:-NULL}, | |
| 24 | + AcctSessionTime = COALESCE(%{%{Acct-Session-Time}:-NULL}, \ | |
| 25 | (${....event_timestamp_epoch} - EXTRACT(EPOCH FROM(AcctStartTime)))), \ | |
| 26 | AcctInputOctets = (('%{%{Acct-Input-Gigawords}:-0}'::bigint << 32) + \ | |
| 27 | '%{%{Acct-Input-Octets}:-0}'::bigint), \ |