diff options
| author | Nathan Neulinger <nneul@neulinger.org> | 2015-07-13 15:18:57 +0000 |
|---|---|---|
| committer | Nathan Neulinger <nneul@neulinger.org> | 2015-07-13 15:18:57 +0000 |
| commit | 66d3dd76a9ec9082bb8411549aa33afdb088ee5a (patch) | |
| tree | 65fe343fdfe4c4ae48e176290c08f3accdc90f1a | |
| parent | a623fdb60700646b39d3ec27dd1bc0410d1579da (diff) | |
| download | cracklib-66d3dd76a9ec9082bb8411549aa33afdb088ee5a.tar.gz | |
patch from Anton Dobkin to first detection of first password in dictionaryv2.9.5cracklib-2.9.5
git-svn-id: file:///tmp/cracklib-svn/trunk@242 4175fe1e-86d5-4fdc-8e6a-506fab9d8533
| -rw-r--r-- | cracklib/NEWS | 1 | ||||
| -rw-r--r-- | cracklib/configure.ac | 2 | ||||
| -rw-r--r-- | cracklib/lib/packlib.c | 5 | ||||
| -rw-r--r-- | cracklib/po/cracklib.pot | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/cracklib/NEWS b/cracklib/NEWS index 2585335..92d8382 100644 --- a/cracklib/NEWS +++ b/cracklib/NEWS @@ -1,3 +1,4 @@ +v2.9.5 fix matching against first password in dictionary (Anton Dobkin) v2.9.4 remove doubled prototype v2.9.3 expose additional functions externally v2.9.2 support build of python support outside of source tree (Michał Górny) diff --git a/cracklib/configure.ac b/cracklib/configure.ac index 3f1b3b6..9984b29 100644 --- a/cracklib/configure.ac +++ b/cracklib/configure.ac @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([cracklib], [2.9.4], [cracklib-devel@lists.sourceforge.net]) +AC_INIT([cracklib], [2.9.5], [cracklib-devel@lists.sourceforge.net]) AM_INIT_AUTOMAKE AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/cracklib/lib/packlib.c b/cracklib/lib/packlib.c index f851424..2711d94 100644 --- a/cracklib/lib/packlib.c +++ b/cracklib/lib/packlib.c @@ -579,11 +579,12 @@ fprintf(stderr, "look for (%s)\n", string); fprintf(stderr, "---- %lu, %lu ----\n", lwm, hwm); #endif + middle = lwm + ((hwm - lwm + 1) / 2); + for (;;) { int cmp; - middle = lwm + ((hwm - lwm + 1) / 2); #if DEBUG fprintf(stderr, "lwm = %lu, middle = %lu, hwm = %lu\n", lwm, middle, hwm); @@ -621,10 +622,12 @@ fprintf(stderr, "look for (%s)\n", string); if (cmp < 0) { hwm = middle; + middle = lwm + ((hwm - lwm ) / 2); } else if (cmp > 0) { lwm = middle; + middle = lwm + ((hwm - lwm + 1) / 2); } } diff --git a/cracklib/po/cracklib.pot b/cracklib/po/cracklib.pot index 1fd493a..2a5a84e 100644 --- a/cracklib/po/cracklib.pot +++ b/cracklib/po/cracklib.pot @@ -6,7 +6,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: cracklib 2.9.4\n" +"Project-Id-Version: cracklib 2.9.5\n" "Report-Msgid-Bugs-To: cracklib-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-04-14 20:41-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |