--- Makefile +++ Makefile 1996/08/14 13:30:19 @@ -16,7 +16,7 @@ SHELL=/bin/sh TAR=tar MAKE=make -DESTROOT=/usr/local +DESTROOT=/usr DESTDIR=$(DESTROOT)/sbin MANROOT=$(DESTROOT)/man MANSECT=8 @@ -45,7 +45,7 @@ # GLIBS=-lident -ldes GLIBS= -CFLAGS=-O +CFLAGS=$(O) all: @echo "Please specify the type of system you wish to build for." @@ -108,7 +108,7 @@ # linux: @echo "Building for Linux 0.99.13q or later ..." - @(cd src ; $(MAKE) CC="$(CC)" LDFLAGS="$(LDFLAGS)" LIBS="$(GLIBS)" CFLAGS="$(CFLAGS) -DLINUX -DNO_KVM $(GDEFS)" KSRC=linux in.identd) + @(cd src ; $(MAKE) CC="$(CC)" LDFLAGS="$(LDFLAGS)" LIBS="$(GLIBS)" CFLAGS="$(CFLAGS) -Wall -DLINUX -DNO_KVM $(GDEFS)" KSRC=linux in.identd) # @@ -470,11 +470,11 @@ @sh -c "exit 1" install: in.identd idecrypt - cp identd.man $(MANDIR)/identd.$(MANSECT) + install -m 644 identd.man $(MANDIR)/identd.$(MANSECT) echo ".so man$(MANSECT)/identd.$(MANSECT)" > $(MANDIR)/in.identd.$(MANSECT) - cp in.identd $(DESTDIR)/in.identd - cp idecrypt.man $(MANDIR)/idecrypt.$(MANSECT) - cp idecrypt $(DESTDIR)/idecrypt + install -s in.identd $(DESTDIR)/in.identd + install -m 644 idecrypt.man $(MANDIR)/idecrypt.$(MANSECT) + install -s idecrypt $(DESTDIR)/idecrypt tests: (cd testdir ; make) --- Makefile.Linux +++ Makefile.Linux 1996/08/14 13:30:59 @@ -0,0 +1,18 @@ +# +# +# Makefile.Linux to integrate package into source tree of S.u.S.E.-Linux +# +# Copyright (C) 1996 S.u.S.E. GmbH Fuerth, Germany. +# +# Please send bug-fixes or comments to feedback@suse.de. +# +# Author: Florian La Roche +# +# + +compile: + make linux + +install: + make install + --- src/identd.c +++ src/identd.c 1996/08/14 13:30:19 @@ -62,7 +62,7 @@ extern int errno; #endif -#if defined(SOLARIS) || defined(__FreeBSD__) +#if defined(SOLARIS) || defined(__FreeBSD__) || defined(__linux__) # include # include # include --- src/kernel/linux.c +++ src/kernel/linux.c 1996/08/14 13:30:19 @@ -28,6 +28,7 @@ { FILE *fp; long dummy; + int idummy; char buf[512]; struct in_addr myladdr, myraddr; int mylport, myrport; @@ -48,7 +49,7 @@ while (fgets(buf, sizeof(buf)-1, fp)) { if (sscanf(buf,"%d: %lX:%x %lX:%x %x %lX:%lX %x:%lX %lx %d", - &dummy, &myladdr, &mylport, &myraddr, &myrport, + &idummy, &myladdr, &mylport, &myraddr, &myrport, &dummy, &dummy, &dummy, &dummy, &dummy, &dummy, uid) == 12) { --- src/parse.c +++ src/parse.c 1996/08/14 13:30:19 @@ -41,7 +41,7 @@ extern int errno; #endif -#ifdef SOLARIS +#if defined(SOLARIS) || defined(__linux__) # include # include #endif