--- Makefile.orig	Sun Jun 18 19:26:32 2000
+++ Makefile	Mon Jun  9 08:44:32 2003
@@ -19,7 +19,6 @@
 # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 # FOR A PARTICULAR PURPOSE. 
 
-CC = gcc
 
 # For AIX
 # See /usr/lpp/bos/bsdport on your system for details of how to define bsdcc
@@ -33,8 +32,6 @@ CC = gcc
 # OS=-DMIPS
 
 # For Solaris (SUNOS 5.3, 5.4, 5.5, 5.6) uncomment the following two lines
-OS=-DSOLARIS
-OSLIBS=-lsocket -lnsl
 
 # For FreeBSD
 # OS=-DFREEBSD
@@ -44,6 +41,9 @@ OSLIBS=-lsocket -lnsl
 # e.g. SunOS, you may need to instead use:
 # OSLIBS=-ldescrypt
 
+# For OpenBSD
+OS=-DOPENBSD
+
 # For LINUX
 # OS=-DLINUX
 #
@@ -59,13 +59,11 @@ OSLIBS=-lsocket -lnsl
 # configuration file and obtaining a privileged socket. If you always
 # want tac_plus to run as root, then just comment out the FLAGS line.
 
-# USERID  = 1500
-# GROUPID = 25
-# FLAGS   = -DTAC_PLUS_USERID=$(USERID) -DTAC_PLUS_GROUPID=$(GROUPID)
+FLAGS = -DTAC_PLUS_USER=\"%%TACACSUSER%%\" -DTAC_PLUS_GROUP=\"%%TACACSGROUP%%\"
 
 # Definitions for SKEY functionality
-# DEFINES = -DSKEY
-# LIBS = ../crimelab/skey/src/libskey.a
+DEFINES = -DSKEY
+LIBS = /usr/lib/libskey.a
 # INCLUDES = -I../crimelab/skey/src
 
 # Debugging flags
@@ -85,13 +83,13 @@ MAXSESS = -DMAXSESS
 # possible), containing its process id. Uncomment and modify the
 # following line to change this filename
 
-# PIDFILE = -DTAC_PLUS_PIDFILE=\"/var/run/tac_plus.pid\" 
+PIDFILE = -DTAC_PLUS_PIDFILE=\"/var/run/tac_plus.pid\" 
 
 #
 # End of customisable section of Makefile
 #
 
-CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) $(FLAGS) $(OS) $(PIDFILE) $(MAXSESS)
+CFLAGS+= $(DEBUG) $(DEFINES) $(INCLUDES) $(FLAGS) $(OS) $(PIDFILE) $(MAXSESS)
 
 HFILES = expire.h parse.h regmagic.h md5.h regexp.h tac_plus.h