diff options
| author | An-Cheng Huang <ancheng@sydney.vyatta.com> | 2007-10-19 15:36:51 -0700 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@sydney.vyatta.com> | 2007-10-19 15:36:51 -0700 |
| commit | 65f1eec84304afcde1935808519bd2cf51677a8a (patch) | |
| tree | b5ef2f0e0d1f2fa10674a7eb57f5a6994f250704 | |
| parent | 07183520f3f4d2f89e526055db418046d0d2450f (diff) | |
| download | vyatta-cfg-system-65f1eec84304afcde1935808519bd2cf51677a8a.tar.gz vyatta-cfg-system-65f1eec84304afcde1935808519bd2cf51677a8a.zip | |
replace "rl_passwd" with the standard "mkpasswd".
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | templates/system/login/user/node.tag/authentication/plaintext-password/node.def | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/control b/debian/control index 2d092ba5..c3bd1482 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Depends: bash (>= 3.1), perl (>= 5.8.8), procps (>= 1:3.2.7-3), coreutils (>= 5.97-5.3), - vyatta-cfg, sysv-rc, ifrename, ntp, sysklogd, busybox, ssh + vyatta-cfg, sysv-rc, ifrename, ntp, sysklogd, busybox, ssh, whois Suggests: util-linux (>= 2.13-5), net-tools, ethtool, diff --git a/templates/system/login/user/node.tag/authentication/plaintext-password/node.def b/templates/system/login/user/node.tag/authentication/plaintext-password/node.def index 78619d79..0e2bd7a5 100644 --- a/templates/system/login/user/node.tag/authentication/plaintext-password/node.def +++ b/templates/system/login/user/node.tag/authentication/plaintext-password/node.def @@ -5,5 +5,6 @@ help: "Configure plaintext password for encryption" # "encrypted-password" to an empty string (which actually allows login without # password). update: $(@) == "" \ -|| ($(../encrypted-password/@) = `/opt/vyatta/sbin/rl_passwd '$(@)' dummy` \ +|| ($(../encrypted-password/@) \ + = `/usr/bin/mkpasswd -H md5 '$(@)' | tr -d \\\\n` \ && $(@) = "") |