]>
Commit | Line | Data |
---|---|---|
5676ba56 | 1 | diff -Naur freeswan-1.96.orig/utils/_confread freeswan-1.96/utils/_confread |
2 | --- freeswan-1.96.orig/utils/_confread Mon Mar 18 09:49:41 2002 | |
3 | +++ freeswan-1.96/utils/_confread Mon Mar 18 09:54:25 2002 | |
64c24b24 | 4 | @@ -14,7 +14,7 @@ |
5 | # | |
6 | # RCSID $Id$ | |
7 | # | |
8 | -# Extract configuration info from /etc/ipsec.conf, repackage as assignments | |
9 | +# Extract configuration info from /etc/ipsec/ipsec.conf, repackage as assignments | |
10 | # to shell variables or tab-delimited fields. Success or failure is reported | |
11 | # inline, as extra data, due to the vagaries of shell backquote handling. | |
12 | # In the absence of --varprefix, output is tab-separated fields, like: | |
7cfbbab1 JK |
13 | @@ -41,7 +41,7 @@ |
14 | # exit 1 | |
15 | # fi | |
16 | ||
17 | -config=/etc/ipsec.conf | |
64c24b24 | 18 | +config=/etc/ipsec/ipsec.conf |
7cfbbab1 JK |
19 | include=yes |
20 | type=conn | |
21 | fieldfmt=yes | |
5676ba56 | 22 | diff -Naur freeswan-1.96.orig/utils/auto freeswan-1.96/utils/auto |
23 | --- freeswan-1.96.orig/utils/auto Mon Mar 18 09:49:41 2002 | |
24 | +++ freeswan-1.96/utils/auto Mon Mar 18 09:55:54 2002 | |
7cfbbab1 JK |
25 | @@ -24,7 +24,7 @@ |
26 | other options: [--config ipsecconfigfile] [--verbose] [--show]" | |
27 | ||
28 | showonly= | |
29 | -config=/etc/ipsec.conf | |
64c24b24 | 30 | +config=/etc/ipsec/ipsec.conf |
7cfbbab1 JK |
31 | info=/var/run/ipsec.info |
32 | shopts= | |
33 | noinclude= | |
5676ba56 | 34 | diff -Naur freeswan-1.96.orig/utils/barf freeswan-1.96/utils/barf |
35 | --- freeswan-1.96.orig/utils/barf Mon Mar 18 09:49:41 2002 | |
36 | +++ freeswan-1.96/utils/barf Mon Mar 18 09:56:45 2002 | |
37 | @@ -163,9 +163,9 @@ | |
aaf2feac | 38 | _________________________ ipsec/showdefaults |
7cfbbab1 | 39 | ipsec showdefaults |
aaf2feac | 40 | _________________________ ipsec/conf |
7cfbbab1 | 41 | -ipsec _include /etc/ipsec.conf | ipsec _keycensor |
64c24b24 | 42 | +ipsec _include /etc/ipsec/ipsec.conf | ipsec _keycensor |
aaf2feac | 43 | _________________________ ipsec/secrets |
7cfbbab1 | 44 | -ipsec _include /etc/ipsec.secrets | ipsec _secretcensor |
64c24b24 | 45 | +ipsec _include /etc/ipsec/ipsec.secrets | ipsec _secretcensor |
aaf2feac | 46 | _________________________ ipsec/ls-dir |
64c24b24 | 47 | ls -l ${IPSEC_DIR-/usr/local/lib/ipsec} |
aaf2feac | 48 | _________________________ ipsec/updowns |
5676ba56 | 49 | diff -Naur freeswan-1.96.orig/utils/manual freeswan-1.96/utils/manual |
50 | --- freeswan-1.96.orig/utils/manual Mon Mar 18 09:49:41 2002 | |
51 | +++ freeswan-1.96/utils/manual Mon Mar 18 09:58:04 2002 | |
aaf2feac SZ |
52 | @@ -26,7 +26,7 @@ |
53 | unset LANG LANGUAGE LC_ALL LC_MESSAGES | |
7cfbbab1 JK |
54 | |
55 | showonly= | |
56 | -config=/etc/ipsec.conf | |
64c24b24 | 57 | +config=/etc/ipsec/ipsec.conf |
7cfbbab1 JK |
58 | info=/var/run/ipsec.info |
59 | shopts= | |
60 | other=0 | |
5676ba56 | 61 | diff -Naur freeswan-1.96.orig/utils/showhostkey freeswan-1.96/utils/showhostkey |
62 | --- freeswan-1.96.orig/utils/showhostkey Mon Mar 18 09:49:41 2002 | |
63 | +++ freeswan-1.96/utils/showhostkey Mon Mar 18 09:58:55 2002 | |
64c24b24 | 64 | @@ -17,7 +17,7 @@ |
65 | me="ipsec showhostkey" | |
66 | usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id]" | |
67 | ||
68 | -file=/etc/ipsec.secrets | |
69 | +file=/etc/ipsec/ipsec.secrets | |
70 | fmt="dns" | |
71 | gw= | |
72 | id= |