When being asked for additional recipients the option list of "no
carbon copy root second_mail_address" is confusing so rephrase the
question and use a blank list. It also makes more sense to first ask
the user if they want to send mail before asking about the specifics
of the message.

--- /usr/src/usr.sbin/adduser/adduser.perl      Wed Jan  3 15:26:04 2007
+++ /usr/sbin/adduser.new       Sat Mar 26 21:16:43 2011
@@ -692,13 +692,12 @@
 # send message to new user
 sub new_users_sendmessage {
     return 1 if $send_message eq "no";
+    return 1 if (!&confirm_yn("Send message to ``$name''", "yes"));

     local($cc) =
-       &confirm_list("Send message to ``$name'' and:",
-                     1, "no", ("root", "second_mail_address",
-                     "no carbon copy"));
+       &confirm_list("Additional recipients:",
+                     1, "","");
     local($e);
-    $cc = "" if $cc eq "no";

     @message_buffer = ();
     message_read ($send_message);
@@ -719,7 +718,6 @@
     }

     &sendmessage("$name $cc", (@message_buffer, @message_buffer_append))
-       if (&confirm_yn("Send message", "yes"));
 }

 sub sendmessage {

Reply via email to