diff options
| author | Nathan Neulinger <nneul@neulinger.org> | 2012-12-14 22:10:00 +0000 |
|---|---|---|
| committer | Nathan Neulinger <nneul@neulinger.org> | 2012-12-14 22:10:00 +0000 |
| commit | 1fb4805062ff6f129d70d4baa00356ba9bcb6e65 (patch) | |
| tree | 2fed1b02e1848cbd2dc4d9a383220544cd34e1f3 | |
| parent | a2aeaab05082ad9b47bf476296f4e8d5a771c159 (diff) | |
| download | cracklib-1fb4805062ff6f129d70d4baa00356ba9bcb6e65.tar.gz | |
error return instead of exit - Nalinv2.8.22cracklib-2.8.22
git-svn-id: file:///tmp/cracklib-svn/trunk@208 4175fe1e-86d5-4fdc-8e6a-506fab9d8533
| -rw-r--r-- | cracklib/NEWS | 2 | ||||
| -rw-r--r-- | cracklib/lib/fascist.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/cracklib/NEWS b/cracklib/NEWS index 75e5cf5..a5d3d11 100644 --- a/cracklib/NEWS +++ b/cracklib/NEWS @@ -1,4 +1,4 @@ -v2.8.22 +v2.8.22 error return instead of exit if dictionary can't be opened (Nalin Dahyabhai) v2.8.21 export prototype for FascistLook (Nalin Dahyabhai) v2.8.20 include python/test_cracklib.py in release tarball (Jan Dittberner) rename python/_cracklibmodule.c to python/_cracklib.c to support Python 3.3 (Jan Dittberner) diff --git a/cracklib/lib/fascist.c b/cracklib/lib/fascist.c index e61ea49..184469e 100644 --- a/cracklib/lib/fascist.c +++ b/cracklib/lib/fascist.c @@ -864,10 +864,7 @@ FascistCheck(password, path) if (!(pwp = PWOpen(path, "r"))) { - /* shouldn't perror in a library or exit */ - /* but should we return a "bad password" or "good password" if this error occurs */ - perror("PWOpen"); - exit(-1); + return _("error loading dictionary"); } /* sure seems like we should close the database, since we're only likely to check one password */ |