diff options
| author | kevlo <kevlo@FreeBSD.org> | 2012-02-22 06:27:20 +0000 |
|---|---|---|
| committer | kevlo <kevlo@FreeBSD.org> | 2012-02-22 06:27:20 +0000 |
| commit | 1381e63d6caac1d5d064b60f6e2cb11bf0608e14 (patch) | |
| tree | 456afe25d5d911e27dc003830e6ca01ed80dab54 /usr.bin/lock | |
| parent | 749a5f142f69ff02971e21c6dca8eab3f65d8de9 (diff) | |
| download | FreeBSD-src-1381e63d6caac1d5d064b60f6e2cb11bf0608e14.zip FreeBSD-src-1381e63d6caac1d5d064b60f6e2cb11bf0608e14.tar.gz | |
Handle NULL return from crypt(3). Mostly from DragonFly
Diffstat (limited to 'usr.bin/lock')
| -rw-r--r-- | usr.bin/lock/lock.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c index 2f26171..3f23a98 100644 --- a/usr.bin/lock/lock.c +++ b/usr.bin/lock/lock.c @@ -94,7 +94,7 @@ main(int argc, char **argv) struct itimerval ntimer, otimer; struct tm *timp; int ch, failures, sectimeout, usemine, vtylock; - char *ap, *mypw, *ttynam, *tzn; + char *ap, *cryptpw, *mypw, *ttynam, *tzn; char hostname[MAXHOSTNAMELEN], s[BUFSIZ], s1[BUFSIZ]; openlog("lock", LOG_ODELAY, LOG_AUTH); @@ -222,7 +222,8 @@ main(int argc, char **argv) } if (usemine) { s[strlen(s) - 1] = '\0'; - if (!strcmp(mypw, crypt(s, mypw))) + cryptpw = crypt(s, mypw); + if (cryptpw == NULL || !strcmp(mypw, cryptpw)) break; } else if (!strcmp(s, s1)) |
