comparison lib-src/movemail.c @ 22235:ee90e9da3a70

Undo this previous change: [MAIL_USE_POP]: Add support for "-g" and "-k" command-line flags to tell movemail to use GSS-API or Kerberos authentication if they are supported.

22234:40229c79e16b

#ifdef MAIL_USE_MAILLOCK
  char *spool_name;
#endif

#ifdef MAIL_USE_POP
  int pop_flags = POP_NO_GETPASS | POP_NO_GSSAPI;
# define ARGSTR "gkp"
#else /* ! MAIL_USE_POP */
# define ARGSTR "p"
#endif /* MAIL_USE_POP */

  delete_lockname = 0;

  /*
    'g' enables Kerberos and disables GSS-API.
    'k' enables GSS-API and disables Kerberos.

    By default, Kerberos is enabled (if it is compiled in) and
    GSS-API is disabled, i.e., "-k" is the default.  However, I'm
    putting the flag in anyway, in case we decide to add new
    authentication methods or change the default later.
  */

  while ((c = getopt (argc, argv, ARGSTR)) != EOF)
    {
      switch (c) {
#ifdef MAIL_USE_POP
      case 'g':
	pop_flags |= POP_NO_KERBEROS;
	pop_flags &= ~POP_NO_GSSAPI;
	break;
      case 'k':
	pop_flags |= POP_NO_GSSAPI;
	pop_flags &= ~POP_NO_KERBEROS;
	break;
#endif
      case 'p':
	preserve_mail++;
	break;
      default:
	goto usage;
      }
    }

  if (
#ifdef MAIL_USE_POP

#else
      (argc - optind != 2)
#endif
      )
    {
    usage:
      fprintf (stderr, "Usage: movemail %s[-p] inbox destfile%s\n",
#ifdef MAIL_USE_POP
	       "[-g|-k] ", " [POP-password]"
#else
	       "", ""
#endif
	       );
      exit (1);
    }

  if (!strncmp (inname, "po:", 3))
    {
      int status;

      status = popmail (inname + 3, outname, preserve_mail,
			(argc - optind == 3) ? argv[optind+2] : NULL, pop_flags);
      exit (status);
    }

  setuid (getuid ());
#endif /* MAIL_USE_POP */

FILE *sfo;
char ibuffer[BUFSIZ];
char obuffer[BUFSIZ];
char Errmsg[80];

popmail (user, outfile, preserve, password, flags)
     char *user;
     char *outfile;
     int preserve;
     char *password;
     int flags;
{
  int nmsgs, nbytes;
  register int i;
  int mbfi;
  FILE *mbf;
  char *getenv ();
  popserver server;

  server = pop_open (0, user, password, flags);
  if (! server)
    {
      error (pop_error);
      return (1);
    }

22235:ee90e9da3a70

#ifdef MAIL_USE_MAILLOCK
  char *spool_name;
#endif

  delete_lockname = 0;

  while ((c = getopt (argc, argv, "p")) != EOF)
    {
      switch (c) {
      case 'p':
	preserve_mail++;
	break;
      default:
	exit(1);
      }
    }

  if (
#ifdef MAIL_USE_POP

#else
      (argc - optind != 2)
#endif
      )
    {
      fprintf (stderr, "Usage: movemail [-p] inbox destfile%s\n",
#ifdef MAIL_USE_POP
	       " [POP-password]"
#else
	       ""
#endif
	       );
      exit (1);
    }

  if (!strncmp (inname, "po:", 3))
    {
      int status;

      status = popmail (inname + 3, outname, preserve_mail,
			(argc - optind == 3) ? argv[optind+2] : NULL);
      exit (status);
    }

  setuid (getuid ());
#endif /* MAIL_USE_POP */

FILE *sfo;
char ibuffer[BUFSIZ];
char obuffer[BUFSIZ];
char Errmsg[80];

popmail (user, outfile, preserve, password)
     char *user;
     char *outfile;
     int preserve;
     char *password;
{
  int nmsgs, nbytes;
  register int i;
  int mbfi;
  FILE *mbf;
  char *getenv ();
  popserver server;

  server = pop_open (0, user, password, POP_NO_GETPASS);
  if (! server)
    {
      error (pop_error);
      return (1);
    }