diff options
| author | Brian Feldman <green@FreeBSD.org> | 2000-08-26 03:42:51 +0000 |
|---|---|---|
| committer | Brian Feldman <green@FreeBSD.org> | 2000-08-26 03:42:51 +0000 |
| commit | 0debe874a0e8bb34d3df41dfd8759a1603c22ca6 (patch) | |
| tree | 76507f37a7839313d7bc7f4c2114a5fb7f014e90 | |
| parent | 31c8f3f0af34c25d90d0a3917ba4231d78cba885 (diff) | |
| download | src-0debe874a0e8bb34d3df41dfd8759a1603c22ca6.tar.gz src-0debe874a0e8bb34d3df41dfd8759a1603c22ca6.zip | |
Notes
| -rw-r--r-- | usr.bin/passwd/local_passwd.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.bin/passwd/local_passwd.c b/usr.bin/passwd/local_passwd.c index e23968337b8b..ccf8bbbb6889 100644 --- a/usr.bin/passwd/local_passwd.c +++ b/usr.bin/passwd/local_passwd.c @@ -132,7 +132,6 @@ getnewpasswd(pw, nis) } /* mixpasswordcase capability */ force_mix_case = login_getcapbool(lc, "mixpasswordcase", 1); - login_close(lc); } #endif @@ -172,8 +171,13 @@ getnewpasswd(pw, nis) #else /* Make a good size salt for algoritms that can use it. */ gettimeofday(&tv,0); +#ifdef LOGIN_CAP if (login_setcryptfmt(lc, "md5", NULL) == NULL) pw_error("cannot set password cipher", 1, 1); + login_close(lc); +#else + (void)crypt_set_format("md5"); +#endif /* Salt suitable for anything */ to64(&salt[0], random(), 3); to64(&salt[3], tv.tv_usec, 3); |