diff options
| author | Simon Rettberg | 2013-02-22 19:47:46 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-02-22 19:47:46 +0100 |
| commit | a59b7c0366d942cd4768b81a18d6a8e6b1ac7017 (patch) | |
| tree | 1e64e16a4a9d6fd897f385453ab6ee9f020b1184 | |
| parent | [helper] Fix password replacement sed expression in add_user, fix return valu... (diff) | |
| download | tm-scripts-a59b7c0366d942cd4768b81a18d6a8e6b1ac7017.tar.gz tm-scripts-a59b7c0366d942cd4768b81a18d6a8e6b1ac7017.tar.xz tm-scripts-a59b7c0366d942cd4768b81a18d6a8e6b1ac7017.zip | |
really fix password generation/replacement
| -rw-r--r-- | helper/useradd.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/helper/useradd.inc b/helper/useradd.inc index c9ab6b38..8b1315c6 100644 --- a/helper/useradd.inc +++ b/helper/useradd.inc @@ -131,7 +131,7 @@ add_user() { local PASSWORD='*' else pdebug "Hashing password '$PASSWORD' for '$USER'" - local PW=$(sha1pass "${PASSWORD}") + local PW=$(mkpasswd -m sha-512 "${PASSWORD}") [ -z "${PW}" ] && PASSWORD=$(openssl passwd -1 "${PASSWORD}") [ -z "${PW}" ] && perror "Error generating hashed password for $USER" PASSWORD=$PW @@ -144,7 +144,7 @@ add_user() { pinfo "Created user $USER" elif [ "$PASSWORD" != "*" ]; then # update user's password - sed -i -r 's/^'"${USER}"':[^:]*:(.*)$/'"${USER}"':'"${PASSWORD}"':\1/g' "${_SHADOW}" + sed -i -r "s#^${USER}:[^:]*:(.*)\$#${USER}:${PASSWORD}:\1#g" "${_SHADOW}" pinfo "Updated password of $USER" fi [ -z "${_GID}" ] && pinfo "Created group $GROUP" && echo "${GROUP}:x:${GROUPID}:" >> "${_GROUP}" |