From cd57e60f5b4e73e6300df682824611247fe68aaf Mon Sep 17 00:00:00 2001
From: user <user@Nokia-N900-42-11.(none)>
Date: Sun, 27 Mar 2011 21:10:57 -0700
Subject: Revert "mailcert.sh: Simplifying localpart-matching logic"

This reverts commit a36f1c4c25b9da052295ec26ed60fbfbd82339f0.
---
 mailcert.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mailcert.sh b/mailcert.sh
index 6002a1e..d3301d5 100755
--- a/mailcert.sh
+++ b/mailcert.sh
@@ -39,7 +39,9 @@ CACERT="$CA"/ca/"$CA".crt
 # attempt to work out where to send the certificate
 if ! [ "$USEREMAIL" ]; then # address from cmdline
   if ! USEREMAIL="$(openssl x509 -in "$USERCERT" -text | sed -ne '{s/.*Subject.\+emailAddress=\(.\+\)/\1/p}' | head -n 1 | grep . )"; then # address from cert
-    if [[ "$USERCERT" =~ (.+/|())(.+)(-|\.).+ ]]; then
+    if [[ "$USERCERT" =~ (.+/|())(.+)-.+ ]]; then
+      USEREMAIL="${BASH_REMATCH[3]}"@"$EMAIL_DEFAULT_DOMAIN"
+    elif [[ "$USERCERT" =~ (.+/|())(.+)\..+ ]]; then
       USEREMAIL="${BASH_REMATCH[3]}"@"$EMAIL_DEFAULT_DOMAIN"
     else
       echo "Cannot find email address!"
-- 
cgit v1.2.3