Index: Makefile.in
--- Makefile.in.orig	2005-11-07 19:38:27 +0100
+++ Makefile.in	2005-11-07 19:38:52 +0100
@@ -152,7 +152,7 @@
 	@-for i in otp-md4 otp-md5; do ln -s opiekey.1 $(LOCALMAN)/man1/$$i.1; done
 	@if test ! -d $(LOCALMAN)/man1; then $(MKDIR) $(LOCALMAN)/man1; chmod 755 $(LOCALMAN)/man1; fi; cp opiekey.1 $(LOCALMAN)/man1/opiekey.1; $(CHOWN) $(OWNER) $(LOCALMAN)/man1/opiekey.1; chgrp $(GROUP) $(LOCALMAN)/man1/opiekey.1; chmod 644 $(LOCALMAN)/man1/opiekey.1
 
-server:	libopie/libopie.a libmissing/libmissing.a opietest-passed opielogin opiesu opiepasswd opieinfo opieftpd opieserv
+server:	libopie/libopie.a libmissing/libmissing.a opietest-passed opielogin opiesu opiepasswd opieinfo opieserv
 
 server-install: server
 	@echo "Installing OPIE server software..."
Index: libopie/atob8.c
--- libopie/atob8.c.orig	1999-03-11 03:09:57 +0100
+++ libopie/atob8.c	2005-11-07 19:39:30 +0100
@@ -72,5 +72,5 @@
     *out++ |= val;
   }
 
-  return out;
+  return (char *)out;
 }
Index: opie_cfg.h
--- opie_cfg.h.orig	2001-11-20 17:23:37 +0100
+++ opie_cfg.h	2005-11-07 19:39:05 +0100
@@ -69,6 +69,9 @@
 #define DOUTMPX 0
 #endif /* HAVE_GETUTXLINE && HAVE_UTMPX_H */
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 /* Adapted from the Autoconf hypertext info pages */
 #if HAVE_DIRENT_H
Index: libopie/generator.c
--- libopie/generator.c.orig	2006-06-18 02:06:28.215630000 +0200
+++ libopie/generator.c	2006-06-18 02:06:15.049431000 +0200
@@ -62,7 +62,7 @@
 static int opieauto_connect FUNCTION_NOARGS
 {
   int s;
-  struct sockaddr_un sun;
+  struct sockaddr_un locsun;
   char buffer[1024];
   char *c, *c2 ="/.opieauto";
   uid_t myuid = getuid(), myeuid = geteuid();
@@ -74,8 +74,8 @@
     return -1;
   };
 
-  memset(&sun, 0, sizeof(struct sockaddr_un));
-  sun.sun_family = AF_UNIX;
+  memset(&locsun, 0, sizeof(struct sockaddr_un));
+  locsun.sun_family = AF_UNIX;
 
   if (!(c = getenv("HOME"))) {
 #if DEBUG
@@ -84,15 +84,15 @@
     return -1;
   };
 
-  if (strlen(c) > (sizeof(sun.sun_path) - strlen(c2) - 1)) {
+  if (strlen(c) > (sizeof(locsun.sun_path) - strlen(c2) - 1)) {
 #if DEBUG
     syslog(LOG_DEBUG, "opieauto_connect: HOME is too long: %s", c);
 #endif /* DEBUG */
     return -1;
   };
 
-  strcpy(sun.sun_path, c);
-  strcat(sun.sun_path, c2);
+  strcpy(locsun.sun_path, c);
+  strcat(locsun.sun_path, c2);
 
   if ((s = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
 #if DEBUG
@@ -104,14 +104,14 @@
   {
     struct stat st;
 
-    if (stat(sun.sun_path, &st) < 0) {
+    if (stat(locsun.sun_path, &st) < 0) {
 #if DEBUG
       syslog(LOG_DEBUG, "opieauto_connect: stat: %s(%d)\n", strerror(errno), errno);
 #endif /* DEBUG */
       goto ret;
     };
 
-    if (connect(s, (struct sockaddr *)&sun, sizeof(struct sockaddr_un))) {
+    if (connect(s, (struct sockaddr *)&locsun, sizeof(struct sockaddr_un))) {
 #if DEBUG
       syslog(LOG_DEBUG, "opieauto_connect: connect: %s(%d)\n", strerror(errno), errno);
 #endif /* DEBUG */
Index: opieauto.c
--- opieauto.c.orig	2001-11-20 16:18:42.000000000 +0100
+++ opieauto.c	2006-06-18 02:28:20.526432000 +0200
@@ -282,10 +282,10 @@
     baile("atexit");
 
   {
-    struct sockaddr_un sun;
+    struct sockaddr_un locsun;
 
-    memset(&sun, 0, sizeof(struct sockaddr_un));
-    sun.sun_family = AF_UNIX;
+    memset(&locsun, 0, sizeof(struct sockaddr_un));
+    locsun.sun_family = AF_UNIX;
 
     {
     char *c;
@@ -294,12 +294,12 @@
     if (!(c = getenv("HOME")))
       bail("getenv(HOME) failed -- no HOME variable?");
 
-    if (strlen(c) > (sizeof(sun.sun_path) - strlen(c2) - 1))
+    if (strlen(c) > (sizeof(locsun.sun_path) - strlen(c2) - 1))
       bail("your HOME is too long");
 
-    strcpy(sun.sun_path, c);
-    strcat(sun.sun_path, c2);
-    sockpath = strdup(sun.sun_path);
+    strcpy(locsun.sun_path, c);
+    strcat(locsun.sun_path, c2);
+    sockpath = strdup(locsun.sun_path);
     };
 
     if ((parents = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
@@ -311,7 +311,7 @@
     if (umask(0177) < 0)
       baile("umask");
 
-    if (bind(parents, (struct sockaddr *)&sun, sizeof(struct sockaddr_un)))
+    if (bind(parents, (struct sockaddr *)&locsun, sizeof(struct sockaddr_un)))
       baile("bind");
 
     if (stat(sockpath, &st) < 0)