]>
Commit | Line | Data |
---|---|---|
55c3ae1d | 1 | --- freeswan-1.97/utils/_confread Tue Mar 26 18:49:42 2002 |
2 | +++ freeswan-1.97/utils/_confread.org Wed May 1 18:30:05 2002 | |
64c24b24 | 3 | @@ -14,7 +14,7 @@ |
4 | # | |
5 | # RCSID $Id$ | |
6 | # | |
7 | -# Extract configuration info from /etc/ipsec.conf, repackage as assignments | |
8 | +# Extract configuration info from /etc/ipsec/ipsec.conf, repackage as assignments | |
9 | # to shell variables or tab-delimited fields. Success or failure is reported | |
10 | # inline, as extra data, due to the vagaries of shell backquote handling. | |
11 | # In the absence of --varprefix, output is tab-separated fields, like: | |
7cfbbab1 JK |
12 | @@ -41,7 +41,7 @@ |
13 | # exit 1 | |
14 | # fi | |
15 | ||
55c3ae1d | 16 | -config=${IPSEC_CONFS-/etc}/ipsec.conf |
64c24b24 | 17 | +config=/etc/ipsec/ipsec.conf |
7cfbbab1 JK |
18 | include=yes |
19 | type=conn | |
20 | fieldfmt=yes | |
55c3ae1d | 21 | --- freeswan-1.97/utils/auto Tue Mar 26 06:07:48 2002 |
22 | +++ freeswan-1.97/utils/auto.org Wed May 1 18:30:51 2002 | |
7cfbbab1 JK |
23 | @@ -24,7 +24,7 @@ |
24 | other options: [--config ipsecconfigfile] [--verbose] [--show]" | |
25 | ||
26 | showonly= | |
55c3ae1d | 27 | -config= |
64c24b24 | 28 | +config=/etc/ipsec/ipsec.conf |
7cfbbab1 JK |
29 | info=/var/run/ipsec.info |
30 | shopts= | |
31 | noinclude= | |
55c3ae1d | 32 | --- freeswan-1.97/utils/barf Tue Mar 26 18:49:42 2002 |
33 | +++ freeswan-1.97/utils/barf.org Wed May 1 18:32:11 2002 | |
34 | @@ -16,7 +16,7 @@ | |
7cfbbab1 | 35 | |
55c3ae1d | 36 | KERNSRC=${KERNSRC-/usr/src/linux} |
37 | LOGS=${LOGS-/var/log} | |
38 | -CONFS=${IPSEC_CONFS-/etc} | |
39 | +CONFS=/etc/ipsec/ipsec.conf | |
40 | me="ipsec barf" | |
41 | ||
42 | # message patterns that start relevant parts of logs | |
43 | --- freeswan-1.97/utils/showhostkey Fri Oct 26 18:17:02 2001 | |
44 | +++ freeswan-1.97/utils/showhostkey.org Wed May 1 18:33:00 2002 | |
64c24b24 | 45 | @@ -17,7 +17,7 @@ |
46 | me="ipsec showhostkey" | |
47 | usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id]" | |
48 | ||
49 | -file=/etc/ipsec.secrets | |
50 | +file=/etc/ipsec/ipsec.secrets | |
51 | fmt="dns" | |
52 | gw= | |
53 | id= |