--- ./Makefile.orig Tue Jan 10 20:34:55 1995 +++ ./Makefile Wed Aug 4 21:23:01 1999 @@ -8,8 +8,8 @@ # # ################################################# DFLAGS = -CC = cc -CC2 = cc +CC = gcc +CC2 = gcc ########################## # # @@ -37,7 +37,7 @@ all: bwnfsd bwtrm bwnfsd: $(OBJS) - $(CC) $(DFLAGS) -o bwnfsd $(OBJS) $(CFLAGS) + $(CC) $(DFLAGS) -o bwnfsd $(OBJS) $(CFLAGS) -lcrypt ################################################################### # # @@ -63,8 +63,13 @@ make bwnfsd "CFLAGS= -O" #LINUX +ifeq ($(USE_GLIBC),1) linux: - make bwnfsd "CFLAGS= -O6 -DLINUX" "LDFLAGS = -s" + make bwnfsd "CFLAGS= -O6 -DLINUX -DHAS_SHADOW -lcrypt" "LDFLAGS = -s" +else +linux: + make bwnfsd "CFLAGS= -O6 -DLINUX -DHAS_SHADOW" "LDFLAGS = -s" +endif #In case they type "make sys5"... sys5: --- ./bwlock.c.orig Sun Feb 14 16:22:09 1993 +++ ./bwlock.c Wed Aug 4 21:19:47 1999 @@ -120,7 +120,7 @@ struct PC *pcs[256]; struct FH *fhs[256]; -int debugmode; +extern int debugmode; char *my_strdup(p) --- ./bwnfsd.c.orig Sun Feb 14 16:37:45 1993 +++ ./bwnfsd.c Wed Aug 4 21:19:47 1999 @@ -51,7 +51,7 @@ # include #endif -#ifdef SHADOW +#ifdef HAS_SHADOW # include #endif @@ -61,7 +61,9 @@ extern char *crypt(); +#ifndef strchr extern char *strchr(); +#endif #ifdef WINNFS # include @@ -1603,6 +1605,7 @@ return; } #else /* if SHADOW */ /* Use Shadow password facility */ +#if 0 if ( (sp = getspnam(auth_request.username)) == NULL) { if (debugmode) @@ -1617,8 +1620,17 @@ return; } +#else + if ( (sp = getspnam(auth_request.username)) != NULL) + pw->pw_passwd = sp->sp_pwdp; +#endif +#if 0 if ( strcmp(crypt(auth_request.password,sp->sp_pwdp), sp->sp_pwdp) != 0 ) +#else + if ( strcmp(crypt(auth_request.password,pw->pw_passwd), + pw->pw_passwd) != 0 ) +#endif { if (debugmode) (void) fprintf( stdout, "bwnfsd: [create_spool] crypt request failed\n" ); --- ./bwprint.c.orig Sun Feb 14 16:40:38 1993 +++ ./bwprint.c Wed Aug 4 21:19:47 1999 @@ -44,7 +44,7 @@ #include #endif -int debugmode; +extern int debugmode; void print_it(file,printer,jobname)