Support comments in password database (/etc/master.passwd).

Comments in group database (/etc/group) are currently not
supported - adduser silently delete blank lines and comments.

diff --git a/adduser/adduser.perl b/adduser/adduser.perl
index 0a77087160484ac2929ef9183c42c6b9ff2c210a..800694fc0a30456f5ca26a7a5ed5f8f891cd7c3c 100644 (file)
--- a/adduser/adduser.perl
+++ b/adduser/adduser.perl
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $Id$
+# $Id: adduser.perl,v 1.27 1997/02/22 16:01:18 peter Exp $
 
 
 # read variables
@@ -245,6 +245,10 @@ sub passwd_read {
     while(<P>) {
        chop;
        push(@passwd_backup, $_);
+       # ignore comments
+       next if /^\s*$/;
+       next if /^\s*#/;
+
        ($p_username, $pw, $p_uid, $p_gid, $sh) = (split(/:/, $_))[0..3,9];
 
        print "$p_username already exists with uid: $username{$p_username}!\n"
@@ -272,6 +276,10 @@ sub group_read {
     while(<G>) {
        chop;
        push(@group_backup, $_);
+       # ignore comments
+       next if /^\s*$/;
+       next if /^\s*#/;
+
        ($g_groupname, $pw, $g_gid, $memb) = (split(/:/, $_))[0..3];
 
        $groupmembers{$g_gid} = $memb;