diff -c qmail-1.03/Makefile qmail-1.03-authenv/Makefile
*** qmail-1.03/Makefile	Mon Jun 15 19:53:16 1998
--- qmail-1.03-authenv/Makefile	Wed May  3 13:43:39 2000
***************
*** 1288,1298 ****
  
  qmail-popup: \
  load qmail-popup.o commands.o timeoutread.o timeoutwrite.o now.o \
! case.a fd.a sig.a wait.a stralloc.a alloc.a substdio.a error.a str.a \
  fs.a socket.lib
  	./load qmail-popup commands.o timeoutread.o timeoutwrite.o \
  	now.o case.a fd.a sig.a wait.a stralloc.a alloc.a \
! 	substdio.a error.a str.a fs.a  `cat socket.lib`
  
  qmail-popup.0: \
  qmail-popup.8
--- 1288,1298 ----
  
  qmail-popup: \
  load qmail-popup.o commands.o timeoutread.o timeoutwrite.o now.o \
! case.a fd.a sig.a wait.a stralloc.a alloc.a env.a substdio.a error.a str.a \
  fs.a socket.lib
  	./load qmail-popup commands.o timeoutread.o timeoutwrite.o \
  	now.o case.a fd.a sig.a wait.a stralloc.a alloc.a \
! 	env.a substdio.a error.a str.a fs.a  `cat socket.lib`
  
  qmail-popup.0: \
  qmail-popup.8
diff -c qmail-1.03/qmail-popup.c qmail-1.03-authenv/qmail-popup.c
*** qmail-1.03/qmail-popup.c	Mon Jun 15 19:53:16 1998
--- qmail-1.03-authenv/qmail-popup.c	Wed May  3 13:44:35 2000
***************
*** 13,18 ****
--- 13,19 ----
  #include "readwrite.h"
  #include "timeoutread.h"
  #include "timeoutwrite.h"
+ #include "env.h"
  
  void die() { _exit(1); }
  
***************
*** 145,150 ****
--- 146,152 ----
  {
    if (!seenuser) { err_wantuser(); return; }
    if (!*arg) { err_syntax(); return; }
+   if (!env_put("AUTH=pop")) die_nomem();
    doanddie(username.s,username.len,arg);
  }
  void pop3_apop(arg) char *arg;
***************
*** 153,158 ****
--- 155,161 ----
    space = arg + str_chr(arg,' ');
    if (!*space) { err_syntax(); return; }
    *space++ = 0;
+   if (!env_put("AUTH=apop")) die_nomem();
    doanddie(arg,space - arg,space);
  }