$NetBSD: patch-ah,v 1.7 2000/04/24 11:04:18 itojun Exp $ --- popper.h.orig Fri Jul 10 08:44:08 1998 +++ popper.h Mon Apr 24 19:56:38 2000 @@ -33,3 +33,3 @@ #include -# if (defined(BSD) && (BSD >= 199103)) +# if (defined(BSD) && (BSD >= 199103)) && 0 /* shouldn't be necessary anymore */ # define HAVE_UNISTD_H @@ -40,3 +40,15 @@ -#ifdef BSDI +#ifdef HAVE_STDLIB_H +# include +#endif + +#ifdef HAVE_STRING_H +# include +#endif + +#ifdef HAVE_TIME_H +# include +#endif + +#if defined (BSDI) || defined (__NetBSD__) #define BSD44_DBM @@ -62,3 +74,8 @@ #define MAXDROPLEN 64 -#define MAXLINELEN 1024 +/* + * This program always assume that fgets return whole line, + * so the buffer must be at least one char bigger than sendmail + * use, because of >From + */ +#define MAXLINELEN (2048 + 1) #define MAXMSGLINELEN MAXLINELEN @@ -66,11 +83,11 @@ #define MAXPARMCOUNT 5 -#define MAXPARMLEN 10 +#define MAXPARMLEN 32 /* Large enough for 32-byte APOP parm */ #define ALLOC_MSGS 20 -#ifndef OSF1 -# define POP_FACILITY LOG_LOCAL0 -#else +#if defined(OSF1) || defined(__NetBSD__) # define POP_FACILITY LOG_MAIL +#else +# define POP_FACILITY LOG_LOCAL0 #endif -#define POP_PRIORITY LOG_NOTICE +#define POP_PRIORITY LOG_INFO #define POP_DEBUG LOG_DEBUG @@ -294,3 +311,3 @@ #ifndef KERBEROS_SERVICE -# define KERBEROS_SERVICE "rcmd" +# define KERBEROS_SERVICE "pop" #endif @@ -300,3 +317,3 @@ #else -# ifdef BSDI +# if defined (BSDI) || defined (__NetBSD__) # include