Selaa lähdekoodia

Ask for user password to create maildir account

Bob Mottram 7 vuotta sitten
vanhempi
commit
0702d2448c
1 muutettua tiedostoa jossa 19 lisäystä ja 2 poistoa
  1. 19
    2
      src/freedombone-app-bdsmail

+ 19
- 2
src/freedombone-app-bdsmail Näytä tiedosto

@@ -68,8 +68,6 @@ function bdsmail_configure_users {
68 68
                 mkdir -p /home/$USERNAME/Maildir/i2p/cur
69 69
                 mkdir -p /home/$USERNAME/Maildir/i2p/new
70 70
                 chown -R $USERNAME:$USERNAME /home/$USERNAME/Maildir/i2p
71
-
72
-                $BDSMAIL_DIR/bin/newmail $MY_USERNAME /home/$MY_USERNAME/MailDir/i2p
73 71
             fi
74 72
         fi
75 73
     done
@@ -97,6 +95,7 @@ function add_user_bdsmail {
97 95
     fi
98 96
     sed -i "s|username|$new_username|g" /home/$new_username/.mutt/bdsmail
99 97
     bdsmail_configure_users
98
+    $BDSMAIL_DIR/bin/newmail $new_username /home/$new_username/MailDir/i2p "$new_user_password"
100 99
     chown -R $new_username:$new_username /home/$new_username/.mutt
101 100
     echo '0'
102 101
 }
@@ -368,6 +367,24 @@ function install_bdsmail {
368 367
 
369 368
     bdsmail_configure_users
370 369
 
370
+    # ask to the ssh login password for the admin user
371
+    # This is then used to create the maildir account
372
+    data=$(tempfile 2>/dev/null)
373
+    trap "rm -f $data" 0 1 2 5 15
374
+    dialog --title $"Password" \
375
+           --clear \
376
+           --passwordbox $"Enter your ssh login password" 8 60 2> $data
377
+    ret=$?
378
+    case $ret in
379
+        0)
380
+            $BDSMAIL_DIR/bin/newmail $MY_USERNAME /home/$MY_USERNAME/MailDir/i2p $(cat $data)
381
+            ;;
382
+        1)
383
+            exit 643856384;;
384
+        255)
385
+            exit 638762424;;
386
+    esac
387
+
371 388
     APP_INSTALLED=1
372 389
 }
373 390