diff options
| author |   Mike Makonnen <mtm@FreeBSD.org> | 2003-02-09 18:29:09 +0000 |
|---|---|---|
| committer | Mike Makonnen <mtm@FreeBSD.org> | 2003-02-09 18:29:09 +0000 |
| commit | 49b2fe91cdbf735a6309ac7fb924dd29ee00373a (patch) | |
| tree | 22d8a28fdcfc3cb25ea7e6be58ce08c2de127b70 /adduser/adduser.sh | |
| parent | 64442c841c9c603f4fb09552a5ff28f9d5d319d3 (diff) | |
| download | pw-darwin-49b2fe91cdbf735a6309ac7fb924dd29ee00373a.tar.gz pw-darwin-49b2fe91cdbf735a6309ac7fb924dd29ee00373a.tar.zst pw-darwin-49b2fe91cdbf735a6309ac7fb924dd29ee00373a.zip | |
Revisit the shell special characters issue and settle it once-and-forall.
All characters will be accepted, and pw(8) can sort out which ones it
will allow and which ones it won't.
Approved by: markm (mentor)
Prodded by: Philippe Bourcier <philippe@cyberabuse.org>
Diffstat (limited to 'adduser/adduser.sh')
| -rw-r--r-- | adduser/adduser.sh | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/adduser/adduser.sh b/adduser/adduser.sh index ee47bdd..2b6398a 100644 --- a/adduser/adduser.sh +++ b/adduser/adduser.sh @@ -187,25 +187,31 @@ add_user() { _passwdmethod= _name="-n '$username'" - [ -n "$uuid" ] && _uid="-u '$uuid'" - [ -n "$ulogingroup" ] && _group="-g '$ulogingroup'" - [ -n "$ugroups" ] && _grouplist="-G '$ugroups'" - [ -n "$ushell" ] && _shell="-s '$ushell'" - [ -n "$uhome" ] && _home="-m -d '$uhome'" - [ -n "$uclass" ] && _class="-L '$uclass'" - [ -n "$ugecos" ] && _comment="-c '$ugecos'" - [ -n "$udotdir" ] && _dotdir="-k '$udotdir'" - [ -n "$uexpire" ] && _expire="-e '$uexpire'" - [ -n "$upwexpire" ] && _pwexpire="-p '$upwexpire'" + [ -n "$uuid" ] && _uid='-u "$uuid"' + [ -n "$ulogingroup" ] && _group='-g "$ulogingroup"' + [ -n "$ugroups" ] && _grouplist='-G "$ugroups"' + [ -n "$ushell" ] && _shell='-s "$ushell"' + [ -n "$uhome" ] && _home='-m -d "$uhome"' + [ -n "$uclass" ] && _class='-L "$uclass"' + [ -n "$ugecos" ] && _comment='-c "$ugecos"' + [ -n "$udotdir" ] && _dotdir='-k "$udotdir"' + [ -n "$uexpire" ] && _expire='-e "$uexpire"' + [ -n "$upwexpire" ] && _pwexpire='-p "$upwexpire"' case $passwdtype in no) _passwdmethod="-w no" _passwd="-h -" ;; yes) + # Note on processing the password: The outer double quotes + # make literal everything except ` and \ and $. + # The outer single quotes make literal ` and $. + # We can ensure the \ isn't treated specially by specifying + # the -r switch to the read command used to obtain the input. + # _passwdmethod="-w yes" _passwd="-h 0" - _upasswd="echo '$upass' |" + _upasswd='echo "$upass" |' ;; none) _passwdmethod="-w none" @@ -521,7 +527,7 @@ get_password() { input_from_file() { _field= - while read fileline ; do + while read -r fileline ; do case "$fileline" in \#*|'') return 0 @@ -629,7 +635,7 @@ input_interactive() { trap 'stty echo; exit' 0 1 2 3 15 stty -echo echo -n "Enter password: " - read upass + read -r upass echo'' echo -n "Enter password again: " read _passconfirm |