diff options
| author | Wolfram Schneider <wosch@FreeBSD.org> | 1997-03-09 12:21:45 +0000 |
|---|---|---|
| committer | Wolfram Schneider <wosch@FreeBSD.org> | 1997-03-09 12:21:45 +0000 |
| commit | eac4b079c7da09e762efd941e6513aeb711c9545 (patch) | |
| tree | 3b21fa6918747c5b3d5fd22be6b520d2dcba9a3d | |
| parent | 22bf981261cd01e835e75e98e0b92eee0f3a982e (diff) | |
| download | src-eac4b079c7da09e762efd941e6513aeb711c9545.tar.gz src-eac4b079c7da09e762efd941e6513aeb711c9545.zip | |
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.
Notes
Notes:
svn path=/head/; revision=23573
| -rw-r--r-- | usr.sbin/adduser/adduser.perl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/usr.sbin/adduser/adduser.perl b/usr.sbin/adduser/adduser.perl index 0a7708716048..800694fc0a30 100644 --- a/usr.sbin/adduser/adduser.perl +++ b/usr.sbin/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; |