修复禁用用户后重新添加同名用户提示用户已存在的问题

This commit is contained in:
even 2022-02-17 21:47:15 +08:00
parent 34e2249b22
commit 249ded3db6

View File

@ -1074,7 +1074,7 @@ function newClient() {
read -rp "Select an option [1-2]: " -e -i 1 PASS
done
CLIENTEXISTS=$(tail -n +2 /etc/openvpn/easy-rsa/pki/index.txt | grep -c -E "/CN=$CLIENT\$")
CLIENTEXISTS=$(tail -n +2 /etc/openvpn/easy-rsa/pki/index.txt | grep -E "^V" | grep -c -E "/CN=$CLIENT\$")
if [[ $CLIENTEXISTS == '1' ]]; then
echo ""
echo "The specified client CN was already found in easy-rsa, please choose another name."
@ -1183,7 +1183,6 @@ function revokeClient() {
rm -f "/root/$CLIENT.ovpn"
sed -i "/^$CLIENT,.*/d" /etc/openvpn/ipp.txt
cp /etc/openvpn/easy-rsa/pki/index.txt{,.bk}
sed -i "/CN=$CLIENT/d" /etc/openvpn/easy-rsa/pki/index.txt
echo ""
echo "Certificate for client $CLIENT revoked."