diff options
| author |   weingart <weingart@openbsd.org> | 1998-09-22 01:40:30 +0000 |
|---|---|---|
| committer | weingart <weingart@openbsd.org> | 1998-09-22 01:40:30 +0000 |
| commit | 4cdcf8a69c63de935a0d86284f644409cb9c171f (patch) | |
| tree | 764705304ec908c5c2d5015e1eef295631e21ede /usr.sbin/adduser/adduser.perl | |
| parent | alpha ramdisk has dhcp support now too (diff) | |
| download | wireguard-openbsd-4cdcf8a69c63de935a0d86284f644409cb9c171f.tar.xz wireguard-openbsd-4cdcf8a69c63de935a0d86284f644409cb9c171f.zip | |
Add support for having UIDs past 32000. Changed the option -uid to
-uid_start, and added -uid_end to specify valid ranges to adduser.
Manpage updated to relfect reality, plus a couple spelling errors.
Diffstat (limited to 'usr.sbin/adduser/adduser.perl')
| -rw-r--r-- | usr.sbin/adduser/adduser.perl | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/usr.sbin/adduser/adduser.perl b/usr.sbin/adduser/adduser.perl index 08ac1e026fd..f80c8853797 100644 --- a/usr.sbin/adduser/adduser.perl +++ b/usr.sbin/adduser/adduser.perl @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# $OpenBSD: adduser.perl,v 1.9 1998/07/20 07:20:58 deraadt Exp $ +# $OpenBSD: adduser.perl,v 1.10 1998/09/22 01:40:30 weingart Exp $ # # Copyright (c) 1995-1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin. # All rights reserved. @@ -45,6 +45,7 @@ if (!$check_only && $#batch < 0) { # check $changes = 0; +&variable_check; # check for valid variables &passwd_check; # check for valid passwdb &shells_read; # read /etc/shells &passwd_read; # read /etc/master.passwd @@ -863,11 +864,12 @@ usage: adduser [-noconfig] [-shell shell] [-s|-silent|-q|-quiet] - [-uid uid_start] + [-uid_start uid_start] + [-uid_end uid_end] [-v|-verbose] home=$home shell=$defaultshell dotdir=$dotdir login_group=$defaultgroup -message_file=$send_message uid_start=$uid_start +message_file=$send_message uid_start=$uid_start uid_end=$uid_end USAGE exit 1; } @@ -947,9 +949,6 @@ sub hints { if ($verbose) { print "Use option ``-silent'' if you don't want see " . "all warnings & questions.\n\n"; - } else { - print "Use option ``-verbose'' if you want see more warnings & " . - "questions \nor try to repair bugs.\n\n"; } } @@ -967,7 +966,8 @@ sub parse_arguments { elsif (/^--?(home)$/) { $home = $argv[0]; shift @argv } elsif (/^--?(shell)$/) { $defaultshell = $argv[0]; shift @argv } elsif (/^--?(dotdir)$/) { $dotdir = $argv[0]; shift @argv } - elsif (/^--?(uid)$/) { $uid_start = $argv[0]; shift @argv } + elsif (/^--?(uid_start)$/) { $uid_start = $argv[0]; shift @argv } + elsif (/^--?(uid_end)$/) { $uid_end = $argv[0]; shift @argv } elsif (/^--?(group)$/) { $defaultgroup = $argv[0]; shift @argv } elsif (/^--?(check_only)$/) { $check_only = 1 } elsif (/^--?(message)$/) { $send_message = $argv[0]; shift @argv; @@ -1442,7 +1442,7 @@ sub config_write { print C <<EOF; # -# $OpenBSD: adduser.perl,v 1.9 1998/07/20 07:20:58 deraadt Exp $ +# $OpenBSD: adduser.perl,v 1.10 1998/09/22 01:40:30 weingart Exp $ # $config - automatic generated by adduser(8) # # Note: adduser read *and* write this file. @@ -1492,6 +1492,7 @@ defaultgroup = $defaultgroup # new users get this uid uid_start = $uid_start +uid_end = $uid_end $do_not_delete ## your own variables, see /etc/adduser.message @@ -1501,3 +1502,12 @@ EOF close C; } +# check for sane variables +sub variable_check { + local($abort) = 0; + + # Check uid_start & uid_end + warn "WARNING: uid_start < 1000!\n" if($uid_start < 1000); + die "ERROR: uid_start >= uid_end!\n" if($uid_start >= $uid_end); +} + |