--- su2.c.orig	Sun Aug 15 17:59:03 2004
+++ su2.c	Sun Aug 15 18:00:37 2004
@@ -113,9 +113,9 @@
 #ifndef NOSU2RC
 char   *UsersNameFile = ".su2rc";
 #endif NOSU2RC
-char   *SULog = "/usr/adm/sulog";
+char   *SULog = SU2LOGFILE;
 
-char   *UtmpFile = "/etc/utmp";
+char   *UtmpFile = "/var/run/utmp";
 
 #ifndef PATH
 # ifdef BSD
@@ -182,17 +182,18 @@
 
 char   *malloc ();
 
+#if !(defined(BSD) && (BSD >= 199306))
 #ifdef OSF
 int    setpwent ();
-#else
+#elseif !(defined(BSD) && (BSD >= 199306))
 void   setpwent ();
 #endif
+#endif
 
-#ifndef sgi
+#if !defined(sgi) && !(defined(BSD) && (BSD >= 199306))
 struct passwd  *getpwuid ();
 struct passwd  *getpwnam ();
 void    endpwent ();
-int     chmod ();
 #endif
 
 struct passwd  *pw;
@@ -570,7 +571,7 @@
 	}
     }
 
-#ifndef sgi
+#if !(defined(sgi) && (defined(BSD) && (BSD >= 199306)))
     setpwent ();
 #endif