From owner-freebsd-bugs Mon Jul 20 16:30:24 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id QAA15131 for freebsd-bugs-outgoing; Mon, 20 Jul 1998 16:30:24 -0700 (PDT) (envelope-from owner-freebsd-bugs@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id QAA15120 for ; Mon, 20 Jul 1998 16:30:20 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id QAA01907; Mon, 20 Jul 1998 16:30:01 -0700 (PDT) Date: Mon, 20 Jul 1998 16:30:01 -0700 (PDT) Message-Id: <199807202330.QAA01907@freefall.freebsd.org> To: freebsd-bugs@FreeBSD.ORG From: AnnMarie Scott Subject: Re: bin/7324: Suggestions for minor modifications to adduser Reply-To: AnnMarie Scott Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org The following reply was made to PR bin/7324; it has been noted by GNATS. From: AnnMarie Scott To: freebsd-gnats-submit@freebsd.org Cc: Subject: Re: bin/7324: Suggestions for minor modifications to adduser Date: Tue, 21 Jul 1998 08:50:49 +0930 This is a multi-part message in MIME format. --------------06965B09DA9F89DBD055109D Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit --------------06965B09DA9F89DBD055109D Content-Type: text/plain; charset=us-ascii; name="adduser.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="adduser.patch" *** adduser Tue Jun 30 12:48:02 1998 --- adduser.new Tue Jun 30 12:48:02 1998 *************** *** 255,259 **** # read /etc/group sub group_read { ! local($g_groupname,$pw,$g_gid, $memb); print "Check $group\n" if $verbose; --- 255,259 ---- # read /etc/group sub group_read { ! local($g_groupname,$g_pw,$g_gid, $memb); print "Check $group\n" if $verbose; *************** *** 262,266 **** chop; push(@group_backup, $_); ! ($g_groupname, $pw, $g_gid, $memb) = (split(/:/, $_))[0..3]; $groupmembers{$g_gid} = $memb; --- 262,266 ---- chop; push(@group_backup, $_); ! ($g_groupname, $g_pw, $g_gid, $memb) = (split(/:/, $_))[0..3]; $groupmembers{$g_gid} = $memb; *************** *** 271,274 **** --- 271,275 ---- if $gid{$g_gid} && $verbose; $gid{$g_gid} = $g_groupname; + $gpass{$g_gid} = $g_pw; } close G; *************** *** 564,568 **** if (!defined($groupname{$group_login}) && !defined($gid{$groupname{$group_login}})) { ! push(@group_backup, "$group_login:*:$g_id:"); $groupname{$group_login} = $g_id; $gid{$g_id} = $group_login; --- 565,569 ---- if (!defined($groupname{$group_login}) && !defined($gid{$groupname{$group_login}})) { ! push(@group_backup, "$group_login:$gpass{$g_id}:$g_id:"); $groupname{$group_login} = $g_id; $gid{$g_id} = $group_login; *************** *** 578,586 **** #warn "$group_login $groupname{$group_login} $groupmembers{$groupname{$group_login}}\n"; foreach $e (sort {$a <=> $b} (keys %gid)) { ! push(@a, "$gid{$e}:*:$e:$groupmembers{$e}"); } &append_file($group, @a); } else { ! &append_file($group, "$group_login:*:$g_id:"); } --- 579,587 ---- #warn "$group_login $groupname{$group_login} $groupmembers{$groupname{$group_login}}\n"; foreach $e (sort {$a <=> $b} (keys %gid)) { ! push(@a, "$gid{$e}:$gpass{$e}:$e:$groupmembers{$e}"); } &append_file($group, @a); } else { ! &append_file($group, "$group_login:$gpass{$g_id}:$g_id:"); } *************** *** 601,605 **** local($cc) = &confirm_list("Send message to ``$name'' and:", ! 1, "no", ("root", "second_mail_address", "no")); local($e); $cc = "" if $cc eq "no"; --- 602,606 ---- local($cc) = &confirm_list("Send message to ``$name'' and:", ! 1, "$cc", ("root", "$cc", "no")); local($e); $cc = "" if $cc eq "no"; *************** *** 761,765 **** &new_users_group_update; &new_users_passwd_update; print "Added user ``$name''\n"; ! &sendmessage($name, @message_buffer) if $send_message ne "no"; &adduser_log("$name:*:$u_id:$g_id($group_login):$fullname"); &home_create($name, $group_login); --- 762,766 ---- &new_users_group_update; &new_users_passwd_update; print "Added user ``$name''\n"; ! &sendmessage("$name $cc", @message_buffer) if $send_message ne "no"; &adduser_log("$name:*:$u_id:$g_id($group_login):$fullname"); &home_create($name, $group_login); --------------06965B09DA9F89DBD055109D-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message