--- socks4-server-4.3.beta2.orig/rfinger/finger.c
+++ socks4-server-4.3.beta2/rfinger/finger.c
@@ -12,8 +12,8 @@
 #include <net/errno.h>
 #endif /* #if defined(ISC) */
 #include "socks.h"
+#include <getopt.h>
 
-extern int	errno;
 extern char	*strrchr();
 char		*Progname;
 extern char	*getenv();
@@ -40,13 +40,6 @@
 
 	struct in_addr	dstaddr[21];
 
-#ifdef LINUX
-	int                     optind = 1;
-#else
-	extern int		optind;
-#endif
-	extern char		*optarg;
-	
 	if ((Progname = strrchr(argv[0], '/')) == NULL)
 		Progname = argv[0];
 	else