diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2018-01-10 02:37:03 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-01-10 02:51:01 +0100 |
| commit | 7fc4c0af45ee2b1757d93f544361d22bcffc1461 (patch) | |
| tree | 3c23ef3ba77492a0e2713bf0c808bb58ecb14bbc /src | |
| parent | global: year bump (diff) | |
| download | wireguard-tools-7fc4c0af45ee2b1757d93f544361d22bcffc1461.tar.xz wireguard-tools-7fc4c0af45ee2b1757d93f544361d22bcffc1461.zip | |
wg-quick: ifnames have max len of 15
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/wg-quick.8 | 2 | ||||
| -rwxr-xr-x | src/wg-quick.bash | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/wg-quick.8 b/src/wg-quick.8 index 2039094..ceffb0d 100644 --- a/src/wg-quick.8 +++ b/src/wg-quick.8 @@ -97,7 +97,7 @@ interface upon shutdown. .P Recommended \fIINTERFACE\fP names include `wg0' or `wgvpn0' or even `wgmgmtlan0'. However, the number at the end is in fact optional, and really -any free-form string [a-zA-Z0-9_=+.-]{1,16} will work. So even interface names corresponding +any free-form string [a-zA-Z0-9_=+.-]{1,15} will work. So even interface names corresponding to geographic locations would suffice, such as `cincinnati', `nyc', or `paris', if that's somehow desirable. diff --git a/src/wg-quick.bash b/src/wg-quick.bash index aceeebc..a028b98 100755 --- a/src/wg-quick.bash +++ b/src/wg-quick.bash @@ -29,9 +29,9 @@ ARGS=( "$@" ) parse_options() { local interface_section=0 line key value CONFIG_FILE="$1" - [[ $CONFIG_FILE =~ ^[a-zA-Z0-9_=+.-]{1,16}$ ]] && CONFIG_FILE="/etc/wireguard/$CONFIG_FILE.conf" + [[ $CONFIG_FILE =~ ^[a-zA-Z0-9_=+.-]{1,15}$ ]] && CONFIG_FILE="/etc/wireguard/$CONFIG_FILE.conf" [[ -e $CONFIG_FILE ]] || die "\`$CONFIG_FILE' does not exist" - [[ $CONFIG_FILE =~ /?([a-zA-Z0-9_=+.-]{1,16})\.conf$ ]] || die "The config file must be a valid interface name, followed by .conf" + [[ $CONFIG_FILE =~ /?([a-zA-Z0-9_=+.-]{1,15})\.conf$ ]] || die "The config file must be a valid interface name, followed by .conf" CONFIG_FILE="$(readlink -f "$CONFIG_FILE")" ((($(stat -c '0%#a' "$CONFIG_FILE") & $(stat -c '0%#a' "${CONFIG_FILE%/*}") & 0007) == 0)) || echo "Warning: \`$CONFIG_FILE' is world accessible" >&2 INTERFACE="${BASH_REMATCH[1]}" |