Index: cracklib/fascist.c =================================================================== RCS file: /src/packages/kth-krb/src/cracklib/cracklib/fascist.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- fascist.c 1996/02/04 09:48:13 1.1.1.1 +++ fascist.c 1996/02/04 11:35:33 1.2 @@ -193,6 +193,23 @@ } char * +FascistStrings(password, strings) + char *password; + char **strings; +{ + char *p; + + while(p = *strings++) + { + if(GTry(p, password)) + { + return ("it is based on your name"); + } + } + return ((char *) 0); +} + +char * FascistGecos(password, uid) char *password; int uid; @@ -309,9 +326,10 @@ } char * -FascistLook(pwp, instring) +FascistLook(pwp, instring, strings) PWDICT *pwp; char *instring; + char **strings; { register int i; register char *ptr; @@ -390,10 +408,16 @@ return ("it looks like a National Insurance number."); } +#if 0 if (ptr = FascistGecos(password, getuid())) { return (ptr); } +#endif + if (ptr = FascistStrings(password, strings)) + { + return (ptr); + } for (i = 0; r_destructors[i]; i++) { @@ -429,9 +453,10 @@ } char * -FascistCheck(password, path) +FascistCheck(password, path, strings) char *password; char *path; + char **strings; { static PWDICT *pwp; static char lastpath[STRINGSIZE]; @@ -452,5 +477,5 @@ strncpy(lastpath, path, STRINGSIZE); } - return (FascistLook(pwp, password)); + return (FascistLook(pwp, password, strings)); } Index: cracklib/packlib.c =================================================================== RCS file: /src/packages/kth-krb/src/cracklib/cracklib/packlib.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- packlib.c 1996/02/04 09:48:13 1.1.1.1 +++ packlib.c 1996/02/04 11:35:20 1.2 @@ -329,6 +329,13 @@ #ifdef DEBUG printf("%lu, %lu\n", lwm, hwm); #endif + if (lwm > hwm) { + register int32 tmp; + + tmp = hwm; + hwm = lwm; + lwm = tmp; + } middle = lwm + ((hwm - lwm + 1) / 2); Index: util/Makefile =================================================================== RCS file: /src/packages/kth-krb/src/cracklib/util/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 1996/02/04 09:48:14 1.1.1.1 +++ Makefile 1996/02/04 11:34:52 1.2 @@ -18,19 +18,19 @@ touch all packer: packer.o $(LIBS) - cc $(CFLAGS) -o $@ $@.o $(LIBS) + $(CC) $(CFLAGS) -o $@ $@.o $(LIBS) unpacker: unpacker.o $(LIBS) - cc $(CFLAGS) -o $@ $@.o $(LIBS) + $(CC) $(CFLAGS) -o $@ $@.o $(LIBS) testnum: testnum.o $(LIBS) - cc $(CFLAGS) -o $@ $@.o $(LIBS) + $(CC) $(CFLAGS) -o $@ $@.o $(LIBS) teststr: teststr.o $(LIBS) - cc $(CFLAGS) -o $@ $@.o $(LIBS) + $(CC) $(CFLAGS) -o $@ $@.o $(LIBS) testlib: testlib.o $(LIBS) - cc $(CFLAGS) -o $@ $@.o $(LIBS) + $(CC) $(CFLAGS) -o $@ $@.o $(LIBS) clean: -rm *.o all