Removing old POP applications

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9427 dc483132-0cff-0310-8789-dd5450dbe970

5 files changed, 0 insertions, 996 deletions

diff --git a/src/appl/movemail/.Sanitize b/src/appl/movemail/.Sanitize
deleted file mode 100644
index 7146ae17d..000000000
--- a/src/appl/movemail/.Sanitize
+++ /dev/null
@@ -1,37 +0,0 @@
-# Sanitize.in for Kerberos V5
-
-# Each directory to survive it's way into a release will need a file
-# like this one called "./.Sanitize".  All keyword lines must exist,
-# and must exist in the order specified by this file.  Each directory
-# in the tree will be processed, top down, in the following order.
-
-# Hash started lines like this one are comments and will be deleted
-# before anything else is done.  Blank lines will also be squashed
-# out.
-
-# The lines between the "Do-first:" line and the "Things-to-keep:"
-# line are executed as a /bin/sh shell script before anything else is
-# done in this 
-
-Do-first:
-
-# All files listed between the "Things-to-keep:" line and the
-# "Files-to-sed:" line will be kept.  All other files will be removed.
-# Directories listed in this section will have their own Sanitize
-# called.  Directories not listed will be removed in their entirety
-# with rm -rf.
-
-Things-to-keep:
-
-.cvsignore
-ChangeLog
-Makefile.in
-configure
-configure.in
-movemail.c
-
-Things-to-lose:
-
-Do-last:
-
-# End of file.
diff --git a/src/appl/movemail/ChangeLog b/src/appl/movemail/ChangeLog
deleted file mode 100644
index 959c65b44..000000000
--- a/src/appl/movemail/ChangeLog
+++ /dev/null
@@ -1,86 +0,0 @@
-Thu Nov  7 15:21:13 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-
-	* movemail.c (main): Check the error return from
- 		krb5_init_context(), and print an error message if
- 		necessary.  
-		Cleaned up gcc -Wall warnings.
-
-Sat Jun 15 04:23:36 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
-
-	* movemail.c: Initialize auth_context to NULL.
-
-Fri Jul 7 15:44:13 EDT 1995	Paul Park	(pjpark@mit.edu)
-	* Makefile.in - Remove all explicit library handling and LDFLAGS.
-	* configure.in - add KRB5_LIBRARIES.
-
-Tue Jun 20 13:09:51 1995  Tom Yu  (tlyu@dragons-lair)
-
-	* movemail.c: USE_STRING_H -> HAVE_STRING_H; fix HAVE_STLIB_H to
-	dtrt.
-	* configure.in: added missing tests for string.h and stdlib.h
-
-Thu Jun 15 17:37:08 EDT 1995	Paul Park	(pjpark@mit.edu)
-	* Makefile.in - Change explicit library names to -l<lib> form, and
-		change target link line to use $(LD) and associated flags.
-	* configure.in - Add shared library usage check.
-
-Sat Jun 10 22:57:39 1995  Tom Yu  (tlyu@dragons-lair)
-
-	* movemail.c: krb5_auth_context redefinitions
-
-Fri Jun  9 18:27:12 1995    <tytso@rsx-11.mit.edu>
-
-	* configure.in: Remove standardized set of autoconf macros, which
-		are now handled by CONFIG_RULES.
-
-Fri Mar 31 21:24:48 1995  Theodore Y. Ts'o  (tytso@dcl)
-
-	* configure.in, movemail.c: Use configure to see if unistd.h needs
-		to be included.  Remove leftover hair from emacs config.
-
-Mon Mar 27 09:17:06 1995 Chris Provenzano  (proven@mit.edu)
-
-	* movemail.c: Fixups to get movemail to compile.
-
-Thu Mar  2 12:28:04 1995  Theodore Y. Ts'o  <tytso@dcl>
-
-	* Makefile.in (ISODELIB): Remove reference to $(ISODELIB).
-
-Wed Mar  1 11:56:05 1995  Theodore Y. Ts'o  <tytso@dcl>
-
-	* movemail.c: Add proper #ifdef's to #include the appropriate
-		system header files.
-
-	* configure.in: Replace check for -lsocket and -lnsl with
-	        WITH_NETLIB check.
-
-Tue Feb 28 01:53:27 1995  John Gilmore  (gnu at toad.com)
-
-	* movemail.c:  Avoid <krb5/...> includes.
-
-Tue Feb 14 15:30:55 1995 Chris Provenzano  (proven@mit.edu)
-
-        * movemail.c Call krb5_sendauth() with new calling convention.
-
-Fri Jan 13 15:23:47 1995  Chris Provenzano (proven@mit.edu)
-
-    * Added krb5_context to all krb5_routines
-
-Thu Sep 29 22:52:50 1994  Theodore Y. Ts'o  (tytso@dcl)
-
-	* Makefile.in: Relink executables if libraries change
-
-Thu Aug 18 14:54:33 1994  Theodore Y. Ts'o  (tytso@dcl)
-
-	* configure.in:
-	* movemail.c: Add NEED_SYS_FCNTL_H
-
-	* Makefile.in: Add $(LIBS) declaration on link line.
-
-Tue Aug  9 21:11:54 1994  Tom Yu  (tlyu@dragons-lair)
-
-	* Makefile.in:
-	* configure.in: make install fixes
-
-	* movemail.c: fix spelling error
-
diff --git a/src/appl/movemail/Makefile.in b/src/appl/movemail/Makefile.in
deleted file mode 100644
index 838b42d00..000000000
--- a/src/appl/movemail/Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-CFLAGS = $(CCOPTS) -DKERBEROS -DKRB5 -DMAIL_USE_POP $(DEFS) $(LOCALINCLUDE)
-
-OBJS = movemail.o movemail-mmdf.o
-
-all::
-
-HESIODLIB = 
-LOCAL_LIBRARIES = $(HESIODLIB)
-DEPLOCAL_LIBRARIES = $(HESIODLIB)
-
-movemail: movemail.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o movemail movemail.o $(LIBS)
-
-all:: movemail
-
-clean::
-	$(RM) movemail
-
-install::
-	$(INSTALL_PROGRAM) movemail ${DESTDIR}$(CLIENT_BINDIR)/movemail
-
-movemail.o:	$(srcdir)/movemail.c
-
diff --git a/src/appl/movemail/configure.in b/src/appl/movemail/configure.in
deleted file mode 100644
index 19711245a..000000000
--- a/src/appl/movemail/configure.in
+++ /dev/null
@@ -1,7 +0,0 @@
-AC_INIT(movemail.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-AC_HAVE_HEADERS(stdlib.h string.h unistd.h)
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/movemail/movemail.c b/src/appl/movemail/movemail.c
deleted file mode 100644
index 66ee4d3da..000000000
--- a/src/appl/movemail/movemail.c
+++ /dev/null
@@ -1,843 +0,0 @@
-/* movemail foo bar -- move file foo to file bar,
-   locking file foo the way /bin/mail respects.
-   Copyright (C) 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/*
- * Modified January, 1986 by Michael R. Gretzinger (Project Athena)
- *
- * Added POP (Post Office Protocol) service.  When compiled -DPOP
- * movemail will accept input filename arguments of the form
- * "po:username".  This will cause movemail to open a connection to
- * a pop server running on $MAILHOST (environment variable).  Movemail
- * must be setuid to root in order to work with POP.
- * 
- * New module: popmail.c
- * Modified routines:
- *	main - added code within #ifdef MAIL_USE_POP; added setuid(getuid())
- *		after POP code. 
- * New routines in movemail.c:
- *	get_errmsg - return pointer to system error message
- *
- * Modified November, 1990 by Jonathan I. Kamens (Project Athena)
- *
- * Added KPOP (Kerberized POP) service to POP code.  If KERBEROS is
- * defined, then:
- *
- * 1. The "kpop" service is used instead of the "pop" service.
- * 2. Kerberos authorization data is sent to the server upon start-up.
- * 3. Instead of sending USER and RPOP, USER and PASS are sent, both
- *    containing the username of the user retrieving mail.
- *
- * Added HESIOD support.  If HESIOD is defined, then an attempt will
- * be made to look up the user's mailhost in the hesiod nameserver
- * database if the MAILHOST environment variable is not set.
- * 
- */
-
-#include <stdio.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#define NO_SHORTNAMES   /* Tell config not to load remap.h */
-/* #include "../src/config.h" */
-
-#ifdef KERBEROS
-#ifdef KRB5
-/* these need to be here to declare the functions which are used by
-   non-kerberos specific code */
-#include "krb5.h"
-#endif
-#endif
-
-#include <fcntl.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifndef F_OK
-#define F_OK 0
-#define X_OK 1
-#define W_OK 2
-#define R_OK 4
-#endif
-
-#ifdef XENIX
-#include <sys/locking.h>
-#endif
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#else
-extern char *malloc(), *realloc(), *calloc();
-extern char *getenv();
-#endif /* HAVE_STDLIB_H */
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
-char *concat ();
-void fatal(), error(), pfatal_with_name();
-void mbx_write(), mbx_delimit_begin(), mbx_delimit_end();
-int pop_init(), popmail(), pop_command(), pop_stat(), pop_retr();
-int getline(), multiline(), putline();
-
-extern int errno;
-
-/* Nonzero means this is name of a lock file to delete on fatal error.  */
-char *delete_lockname;
-
-int main (argc, argv)
-     int argc;
-     char **argv;
-{
-  char *inname, *outname;
-  int indesc, outdesc;
-  char buf[1024];
-  int nread;
-
-#ifndef MAIL_USE_FLOCK
-  struct stat st;
-  long now;
-  int tem;
-  char *lockname, *p;
-  char tempname[40];
-  int desc;
-#endif /* not MAIL_USE_FLOCK */
-
-  delete_lockname = 0;
-
-  if (argc < 3)
-    fatal ("two arguments required");
-
-  inname = argv[1];
-  outname = argv[2];
-
-  /* Check access to output file.  */
-  if (access (outname, F_OK) == 0 && access (outname, W_OK) != 0)
-    pfatal_with_name (outname);
-
-  /* Also check that outname's directory is writeable to the real uid.  */
-  {
-    char *buf = (char *) malloc (strlen (outname) + 1);
-    char *p;
-    strcpy (buf, outname);
-    p = buf + strlen (buf);
-    while (p > buf && p[-1] != '/')
-      *--p = 0;
-    if (p == buf)
-      *p++ = '.';
-    if (access (buf, W_OK) != 0)
-      pfatal_with_name (buf);
-    free (buf);
-  }
-
-#ifdef MAIL_USE_POP
-  if (!memcmp (inname, "po:", 3))
-    {
-      int status; char *user;
-
-      user = (char *) strrchr (inname, ':') + 1;
-      status = popmail (user, outname);
-      exit (status);
-    }
-
-  setuid (getuid());
-#endif /* MAIL_USE_POP */
-
-  /* Check access to input file.  */
-  if (access (inname, R_OK | W_OK) != 0)
-    pfatal_with_name (inname);
-
-#ifndef MAIL_USE_FLOCK
-  /* Use a lock file named /usr/spool/mail/$USER.lock:
-     If it exists, the mail file is locked.  */
-  lockname = concat (inname, ".lock", "");
-  strcpy (tempname, inname);
-  p = tempname + strlen (tempname);
-  while (p != tempname && p[-1] != '/')
-    p--;
-  *p = 0;
-  strcpy (p, "EXXXXXX");
-  mktemp (tempname);
-  (void) unlink (tempname);
-
-  while (1)
-    {
-      /* Create the lock file, but not under the lock file name.  */
-      /* Give up if cannot do that.  */
-      desc = open (tempname, O_WRONLY | O_CREAT, 0666);
-      if (desc < 0)
-        pfatal_with_name (concat ("temporary file \"", tempname, "\""));
-      close (desc);
-
-      tem = link (tempname, lockname);
-      (void) unlink (tempname);
-      if (tem >= 0)
-	break;
-      sleep (1);
-
-      /* If lock file is a minute old, unlock it.  */
-      if (stat (lockname, &st) >= 0)
-	{
-	  now = time (0);
-	  if (st.st_ctime < now - 60)
-	    (void) unlink (lockname);
-	}
-    }
-
-  delete_lockname = lockname;
-#endif /* not MAIL_USE_FLOCK */
-
-#ifdef MAIL_USE_FLOCK
-  indesc = open (inname, O_RDWR);
-#else /* if not MAIL_USE_FLOCK */
-  indesc = open (inname, O_RDONLY);
-#endif /* not MAIL_USE_FLOCK */
-  if (indesc < 0)
-    pfatal_with_name (inname);
-
-#if defined(BSD) || defined(XENIX)
-  /* In case movemail is setuid to root, make sure the user can
-     read the output file.  */
-  /* This is desirable for all systems
-     but I don't want to assume all have the umask system call */
-  umask (umask (0) & 0333);
-#endif /* BSD or Xenix */
-  outdesc = open (outname, O_WRONLY | O_CREAT | O_EXCL, 0666);
-  if (outdesc < 0)
-    pfatal_with_name (outname);
-#ifdef MAIL_USE_FLOCK
-#ifdef XENIX
-  if (locking (indesc, LK_RLCK, 0L) < 0) pfatal_with_name (inname);
-#else
-  flock (indesc, LOCK_EX);
-#endif
-#endif /* MAIL_USE_FLOCK */
-
-  while (1)
-    {
-      nread = read (indesc, buf, sizeof buf);
-      if (nread != write (outdesc, buf, nread))
-	{
-	  int saved_errno = errno;
-	  (void) unlink (outname);
-	  errno = saved_errno;
-	  pfatal_with_name (outname);
-	}
-      if (nread < sizeof buf)
-	break;
-    }
-
-#ifdef BSD
-  fsync (outdesc);
-#endif
-
-  /* Check to make sure no errors before we zap the inbox.  */
-  if (close (outdesc) != 0)
-    {
-      int saved_errno = errno;
-      (void) unlink (outname);
-      errno = saved_errno;
-      pfatal_with_name (outname);
-  }
-
-#ifdef MAIL_USE_FLOCK
-#if defined(STRIDE) || defined(XENIX)
-  /* Stride, xenix have file locking, but no ftruncate.  This mess will do. */
-  (void) close (open (inname, O_CREAT | O_TRUNC | O_RDWR, 0666));
-#else
-  (void) ftruncate (indesc, 0L);
-#endif /* STRIDE or XENIX */
-#endif /* MAIL_USE_FLOCK */
-  close (indesc);
-
-#ifndef MAIL_USE_FLOCK
-  /* Delete the input file; if we can't, at least get rid of its contents.  */
-  if (unlink (inname) < 0)
-    if (errno != ENOENT)
-      creat (inname, 0666);
-  (void) unlink (lockname);
-#endif /* not MAIL_USE_FLOCK */
-  exit (0);
-}
-
-/* Print error message and exit.  */
-
-void fatal (s1, s2)
-     char *s1, *s2;
-{
-  if (delete_lockname)
-    unlink (delete_lockname);
-  error (s1, s2);
-  exit (1);
-}
-
-/* Print error message.  `s1' is printf control string, `s2' is arg for it. */
-
-void error (s1, s2, s3)
-     char *s1, *s2, *s3;
-{
-  printf ("movemail: ");
-  printf (s1, s2, s3);
-  printf ("\n");
-}
-
-void pfatal_with_name (name)
-     char *name;
-{
-  char *s;
-
-  s = concat ("", strerror(errno), " for %s");
-  fatal (s, name);
-}
-
-/* Return a newly-allocated string whose contents concatenate those of s1, s2, s3.  */
-
-char *
-concat (s1, s2, s3)
-     char *s1, *s2, *s3;
-{
-  int len1 = strlen (s1), len2 = strlen (s2), len3 = strlen (s3);
-  char *xmalloc();
-  char *result = (char *) xmalloc (len1 + len2 + len3 + 1);
-
-  strcpy (result, s1);
-  strcpy (result + len1, s2);
-  strcpy (result + len1 + len2, s3);
-  *(result + len1 + len2 + len3) = 0;
-
-  return result;
-}
-
-/* Like malloc but get fatal error if memory is exhausted.  */
-
-char *
-xmalloc (size)
-     int size;
-{
-  char *result = malloc (size);
-  if (!result)
-    fatal ("virtual memory exhausted", 0);
-  return result;
-}
-
-/* This is the guts of the interface to the Post Office Protocol.  */
-
-#ifdef MAIL_USE_POP
-
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#ifdef KERBEROS
-#ifndef POP_SNAME
-#define	POP_SNAME	"pop"
-#endif
-#ifndef KPOP_SERVICE
-#define KPOP_SERVICE	"kpop"
-#endif
-#ifdef KRB4
-#ifdef KRB5
- #error can only use one of KRB4 or KRB5
-#endif
-#include <krb.h>
-#include <des.h>
-#endif /* KRB4 */
-#ifdef KRB5
-#include "krb5.h"
-#include "com_err.h"
-#include <ctype.h>
-#endif /* KRB5 */
-#endif /* KERBEROS */
-#ifdef HESIOD
-#include <hesiod.h>
-#endif
-
-#define NOTOK (-1)
-#define OK 0
-#define DONE 1
-
-char *progname;
-FILE *sfi;
-FILE *sfo;
-char Errmsg[80];
-
-static int debug = 0;
-
-int popmail(user, outfile)
-char *user;
-char *outfile;
-{
-    char *host;
-    int nmsgs, nbytes;
-    char response[128];
-    register int i;
-    int mbfi;
-    FILE *mbf;
-    char *getenv();
-    char *get_errmsg();
-#ifdef HESIOD
-    struct hes_postoffice *p;
-#endif
-    
-    host = getenv("MAILHOST");
-#ifdef HESIOD
-    if (host == NULL) {
-	 p = hes_getmailhost(user);
-	 if (p != NULL && strcmp(p->po_type, "POP") == 0)
-	      host = p->po_host;
-	 else
-	      fatal("no POP server listed in Hesiod");
-    }
-#endif /* HESIOD */
-    if (host == NULL) {
-	fatal("no MAILHOST defined");
-    }
-
-    if (pop_init(host) == NOTOK) {
-	error(Errmsg);
-	return(1);
-    }
-
-    if (getline(response, sizeof response, sfi) != OK) {
-	error(response);
-	return(1);
-    }
-
-#ifdef KERBEROS
-    if (pop_command("USER %s", user) == NOTOK || 
-	pop_command("PASS %s", user) == NOTOK)
-#else
-    if (pop_command("USER %s", user) == NOTOK || 
-	pop_command("RPOP %s", user) == NOTOK)
-#endif
-    {
-	error(Errmsg);
-	pop_command("QUIT");
-	return(1);
-    }
-
-    if (pop_stat(&nmsgs, &nbytes) == NOTOK) {
-	error(Errmsg);
-	pop_command("QUIT");
-	return(1);
-    }
-
-    if (!nmsgs)
-      {
-	pop_command("QUIT");
-	return(0);
-      }
-
-    mbfi = open (outfile, O_WRONLY | O_CREAT | O_EXCL, 0666);
-    if (mbfi < 0)
-      {
-	pop_command("QUIT");
-	error("Error in open: %s, %s", get_errmsg(), outfile);
-	return(1);
-      }
-    fchown(mbfi, getuid(), -1);
-
-    if ((mbf = fdopen(mbfi, "w")) == NULL)
-      {
-	pop_command("QUIT");
-	error("Error in fdopen: %s", get_errmsg());
-	close(mbfi);
-	unlink(outfile);
-	return(1);
-      }
-
-    for (i = 1; i <= nmsgs; i++) {
-	mbx_delimit_begin(mbf);
-	if (pop_retr(i, mbx_write, mbf) != OK) {
-	    error(Errmsg);
-	    pop_command("QUIT");
-	    close(mbfi);
-	    return(1);
-	}
-	mbx_delimit_end(mbf);
-	fflush(mbf);
-	if (ferror(mbf)) {
-	  error("Error in fflush: %s", get_errmsg());
-	  pop_command("QUIT");
-	  close(mbfi);
-	  return(1);
-	}
-    }
-
-    /* On AFS, a call to write() only modifies the file in the local
-       workstation's AFS cache.  The changes are not written to the server
-       until a call to fsync() or close() is made.  Users with AFS home
-       directories have lost mail when over quota because these checks were
-       not made in previous versions of movemail. */
-
-    if (fsync(mbfi) < 0) {
-      error("Error in fsync: %s", get_errmsg());
-      pop_command("QUIT");
-      return(1);
-    }
-
-    if (close(mbfi) == -1) {
-      error("Error in close: %s", get_errmsg());
-      pop_command("QUIT");
-      return(1);
-    }
-
-    for (i = 1; i <= nmsgs; i++) {
-	if (pop_command("DELE %d", i) == NOTOK) {
-	    error(Errmsg);
-	    pop_command("QUIT");
-	    close(mbfi);
-	    return(1);
-	}
-    }
-
-    pop_command("QUIT");
-    return(0);
-}
-
-int pop_init(host)
-char *host;
-{
-    register struct hostent *hp;
-    register struct servent *sp;
-#ifndef KERBEROS
-    int lport = IPPORT_RESERVED - 1;
-#endif
-    struct sockaddr_in sin;
-    int s;
-    char *get_errmsg();
-#ifdef KERBEROS
-#ifdef KRB4
-    KTEXT ticket;
-    MSG_DAT msg_data;
-    CREDENTIALS cred;
-    Key_schedule schedule;
-    int rem;
-#endif /* KRB4 */
-#ifdef KRB5
-    krb5_error_code retval;
-    krb5_ccache ccdef;
-    krb5_context context;
-    krb5_principal client, server;
-    krb5_error *err_ret = NULL;
-    krb5_auth_context auth_context = NULL;
-    char *hostname;
-#endif /* KRB5 */
-#endif /* KERBEROS */
-    hp = gethostbyname(host);
-    if (hp == NULL) {
-	sprintf(Errmsg, "MAILHOST unknown: %s", host);
-	return(NOTOK);
-    }
-
-#ifdef KERBEROS
-    hostname = malloc(strlen(hp->h_name)+1);
-    if (!hostname) {
-	    sprintf(Errmsg, "Couldn't allocate space for hostname");
-	    return(NOTOK);
-    }
-    strcpy(hostname, hp->h_name);
-    sp = getservbyname(KPOP_SERVICE, "tcp");
-#else
-    sp = getservbyname("pop", "tcp");
-#endif
-    if (sp == 0) {
-#ifdef KERBEROS
-	strcpy(Errmsg, "tcp/kpop: unknown service");
-#else
-	strcpy(Errmsg, "tcp/pop: unknown service");
-#endif
-	return(NOTOK);
-    }
-
-    sin.sin_family = hp->h_addrtype;
-    memcpy((char *)&sin.sin_addr, hp->h_addr, hp->h_length);
-    sin.sin_port = sp->s_port;
-#ifdef KERBEROS
-    s = socket(AF_INET, SOCK_STREAM, 0);
-#else
-    s = rresvport(&lport);
-#endif
-
-    if (s < 0) {
-	sprintf(Errmsg, "error creating socket: %s", get_errmsg());
-	return(NOTOK);
-    }
-
-    if (connect(s, (struct sockaddr *)&sin, sizeof sin) < 0) {
-	sprintf(Errmsg, "error during connect: %s", get_errmsg());
-	close(s);
-	return(NOTOK);
-    }
-
-#ifdef KERBEROS
-#ifdef KRB4
-    ticket = (KTEXT) malloc(sizeof(KTEXT_ST));
-    rem = krb_sendauth(0L, s, ticket, POP_SNAME, hostname,
-		       (char *) krb_realmofhost(hostname),
-		       (unsigned long)0, &msg_data, &cred, schedule,
-		       (struct sockaddr_in *)0,
-		       (struct sockaddr_in *)0,
-		       "KPOPV0.1");
-    if (rem != KSUCCESS) {
-	 sprintf(Errmsg, "kerberos error: %s", krb_err_txt[rem]);
-	 close(s);
-	 return(NOTOK);
-    }
-#endif /* KRB4 */
-#ifdef KRB5
-    retval = krb5_init_context(&context);
-    if (retval) {
-	    com_err("movemail", retval, "while initializing krb5");
-	    exit(1);
-    }
-
-    if ((retval = krb5_cc_default(context, &ccdef))) {
-    krb5error:
-	sprintf(Errmsg, "krb5 error: %s", error_message(retval));
-	close(s);
-	return(NOTOK);
-    }
-    if ((retval = krb5_cc_get_principal(context, ccdef, &client))) {
-	goto krb5error;
-    }
-
-    if ((retval = krb5_sname_to_principal(context, hostname, POP_SNAME,
-					  KRB5_NT_SRV_HST, &server))) {
-	goto krb5error;
-    }
-
-    retval = krb5_sendauth(context, &auth_context, (krb5_pointer) &s, 
-			   "KPOPV1.0", client, server,
-			   AP_OPTS_MUTUAL_REQUIRED,
-			   NULL,	/* no data to checksum */
-			   0,		/* no creds, use ccache instead */
-			   ccdef,
-			   &err_ret, 0,
-			   NULL);	/* don't need reply */
-    krb5_free_principal(context, server);
-    krb5_auth_con_free(context, auth_context);
-    if (retval) {
-	if (err_ret && err_ret->text.length) {
-	    sprintf(Errmsg, "krb5 error: %s [server says '%*s'] ",
-		    error_message(retval),
-		    err_ret->text.length,
-		    err_ret->text.data);
-	    krb5_free_error(context, err_ret);
-	} else
-	    sprintf(Errmsg, "krb5 error: %s", error_message(retval));
-	close(s);
-	return(NOTOK);
-    }
-#endif /* KRB5 */
-    free(hostname);
-#endif /* KERBEROS */
-		       
-    sfi = fdopen(s, "r");
-    sfo = fdopen(s, "w");
-    if (sfi == NULL || sfo == NULL) {
-	sprintf(Errmsg, "error in fdopen: %s", get_errmsg());
-	close(s);
-	return(NOTOK);
-    }
-
-    return(OK);
-}
-
-int pop_command(fmt, a, b, c, d)
-char *fmt;
-char *a, *b, *c, *d;
-{
-    char buf[128];
-
-    sprintf(buf, fmt, a, b, c, d);
-
-    if (debug) fprintf(stderr, "---> %s\n", buf);
-    if (putline(buf, Errmsg, sfo) == NOTOK) return(NOTOK);
-
-    if (getline(buf, sizeof buf, sfi) != OK) {
-	strcpy(Errmsg, buf);
-	return(NOTOK);
-    }
-
-    if (debug) fprintf(stderr, "<--- %s\n", buf);
-    if (*buf != '+') {
-	strcpy(Errmsg, buf);
-	return(NOTOK);
-    } else {
-	return(OK);
-    }
-}
-
-    
-int pop_stat(nmsgs, nbytes)
-int *nmsgs, *nbytes;
-{
-    char buf[128];
-
-    if (debug) fprintf(stderr, "---> STAT\n");
-    if (putline("STAT", Errmsg, sfo) == NOTOK) return(NOTOK);
-
-    if (getline(buf, sizeof buf, sfi) != OK) {
-	strcpy(Errmsg, buf);
-	return(NOTOK);
-    }
-
-    if (debug) fprintf(stderr, "<--- %s\n", buf);
-    if (*buf != '+') {
-	strcpy(Errmsg, buf);
-	return(NOTOK);
-    } else {
-	sscanf(buf, "+OK %d %d", nmsgs, nbytes);
-	return(OK);
-    }
-}
-
-int pop_retr(msgno, action, arg)
-int msgno;
-void (*action)();
-void* arg;			/* may always be FILE* -- eichin -- XXX */
-{
-    char buf[1024];
-
-    sprintf(buf, "RETR %d", msgno);
-    if (debug) fprintf(stderr, "%s\n", buf);
-    if (putline(buf, Errmsg, sfo) == NOTOK) return(NOTOK);
-
-    if (getline(buf, sizeof buf, sfi) != OK) {
-	strcpy(Errmsg, buf);
-	return(NOTOK);
-    }
-
-    while (1) {
-	switch (multiline(buf, sizeof buf, sfi)) {
-	case OK:
-	    (*action)(buf, arg);
-	    break;
-	case DONE:
-	    return (OK);
-	case NOTOK:
-	    strcpy(Errmsg, buf);
-	    return (NOTOK);
-	}
-    }
-}
-
-int getline(buf, n, f)
-char *buf;
-register int n;
-FILE *f;
-{
-    register char *p;
-    int c;
-
-    p = buf;
-    while (--n > 0 && (c = fgetc(f)) != EOF)
-      if ((*p++ = c) == '\n') break;
-
-    if (ferror(f)) {
-	strcpy(buf, "error on connection");
-	return (NOTOK);
-    }
-
-    if (c == EOF && p == buf) {
-	strcpy(buf, "connection closed by foreign host");
-	return (DONE);
-    }
-
-    *p = '\0';
-    if (*--p == '\n') *p = '\0';
-    if (*--p == '\r') *p = '\0';
-    return(OK);
-}
-
-int multiline(buf, n, f)
-char *buf;
-register int n;
-FILE *f;
-{
-    if (getline(buf, n, f) != OK) return (NOTOK);
-    if (*buf == '.') {
-	if (buf[1] == '\0') {
-	    return (DONE);
-	} else {
-	    strcpy(buf, buf+1);
-	}
-    }
-    return(OK);
-}
-
-char *
-get_errmsg()
-{
-    char *s;
-
-    s = strerror(errno);
-    return(s);
-}
-
-int putline(buf, err, f)
-char *buf;
-char *err;
-FILE *f;
-{
-    fprintf(f, "%s\r\n", buf);
-    fflush(f);
-    if (ferror(f)) {
-	strcpy(err, "lost connection");
-	return(NOTOK);
-    }
-    return(OK);
-}
-
-void mbx_write(line, mbf)
-char *line;
-FILE *mbf;
-{
-    fputs(line, mbf);
-    fputc(0x0a, mbf);
-}
-
-void mbx_delimit_begin(mbf)
-FILE *mbf;
-{
-#ifdef OUTPUT_MMDF_FORMAT
-    fputs("



\n", mbf);
-#else	
-    fputs("\f\n0, unseen,,\n", mbf);
-#endif
-}
-
-void mbx_delimit_end(mbf)
-FILE *mbf;
-{
-#ifdef OUTPUT_MMDF_FORMAT
-    fputs("



\n", mbf);
-#else	
-    putc('\037', mbf);
-#endif
-}
-
-#endif /* MAIL_USE_POP */