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