Attachment #42687 for bug #66518

View | Details | Raw Unified | Return to bug 66518
Collapse All | Expand All

Lines 6-12 Link Here

(-)imap-uw/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= imap	8	PORTNAME= imap
9	PORTVERSION= 2002d	9	PORTVERSION= 2004
10	PORTEPOCH= 1	10	PORTEPOCH= 1
11	CATEGORIES= mail	11	CATEGORIES= mail
12	MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \	12	MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \

Lines 1-2 Link Here

(-)imap-uw/distinfo (-2 / +2 lines)
1	MD5 (imap-2002d.tar.Z) = 64e82a195d21481fc4c54c4ed9fe0527	1	MD5 (imap-2004.tar.Z) = ec3dafeeae320457a1d098157e9bf969
2	SIZE (imap-2002d.tar.Z) = 2155224	2	SIZE (imap-2004.tar.Z) = 2220333




--- src/osdep/unix/Makefile.orig	Fri Apr 30 04:08:48 2004
+++ src/osdep/unix/Makefile	Tue May 11 08:34:26 2004
@@ -22,20 +22,20 @@
 
 EXTRAAUTHENTICATORS=
 EXTRADRIVERS=mbox
-PASSWDTYPE=std
-SSLTYPE=nopwd
-IP=4
+PASSWDTYPE=pam
+SSLTYPE=unix.nopwd
+IP=6
 
 
 # Extended flags needed for SSL.  You may need to modify.
 
-SSLDIR=/usr/local/ssl
-SSLCERTS=$(SSLDIR)/certs
-SSLINCLUDE=$(SSLDIR)/include
-SSLLIB=$(SSLDIR)/lib
+SSLDIR=$(OPENSSLBASE)
+SSLCERTS=$(PREFIX)/certs
 SSLKEYS=$(SSLCERTS)
-SSLINCLUDE=$(SSLDIR)/include
-SSLLIB=$(SSLDIR)/lib
+SSLINCLUDE=$(OPENSSLINC)
+SSLLIB=$(OPENSSLLIB)
 

 
 # Older versions of MIT Kerberos also have a libcrypto.  If so, you may need
 # to use this instead
@@ -62,7 +62,7 @@
 
 SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
  -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\"
-SSLLDFLAGS= -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
+SSLLDFLAGS= # -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
 
 
 # Extended flags needed for non-standard passwd types.  You may need to modify.
@@ -60,7 +60,7 @@
 # AFSLDFLAGS may also need -L/usr/ucblib -lucb
 DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
 DCELDFLAGS= -ldce

 
 
 # Build parameters normally set by the individual port
@@ -99,7 +99,7 @@
 # Commands possibly overriden by the individual port
 
 ARRC=ar rc
-CC=cc
+#CC=cc
 LN=ln -s
 RANLIB=ranlib
 
@@ -117,7 +117,7 @@
  dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
  rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
  unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
-CFLAGS=-g
+CFLAGS+=-g $(BASECFLAGS) $(EXTRACFLAGS)
 
 CAT=cat
 MAKE=make
@@ -134,6 +134,10 @@
  PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE)
 
 
+# Need this for the shared library rule to work correctly
+.SUFFIXES: .o .so
+SOFILES=${BINARIES:.o=.so}
+	 ACTIVEFILE=/usr/local/news/lib/active \
+	 RSHPATH=/usr/bin/rsh \
+	 LOCKPGM=$(PREFIX)/libexec/mlock \
+	 BASECFLAGS="-DNFSKLUDGE" \
+	 BASELDFLAGS="-lpam -lcrypt"
+
 # Here if no make argument established
 
 missing: osdep.h
@@ -214,13 +218,14 @@
 	 BASECFLAGS="-g -Dconst="
 
 bsf:	# FreeBSD
-	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
+	$(BUILD) `$(CAT) SPECIALS` OS=$@ CHECKPW=pam \
 	 SIGTYPE=psx CRXTYPE=nfs \
 	 SPOOLDIR=/var \
 	 ACTIVEFILE=/usr/local/news/lib/active \
 	 RSHPATH=/usr/bin/rsh \

-	 BASELDFLAGS="-lcrypt"
+	 LOCKPGM=$(PREFIX)/libexec/mlock \
+	 BASECFLAGS="-DNFSKLUDGE" \
+	 BASELDFLAGS="-lpam"
 
 bsi:	# BSD/i386
 	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
@@ -786,23 +791,35 @@
 
 # Build it!
 
-build:	clean once $(ARCHIVE)
+build:	clean once $(ARCHIVE) $(SHLIBNAME)
 
-all:	$(ARCHIVE)
+all:	$(ARCHIVE) $(SHLIBNAME)
 
 $(ARCHIVE): $(BINARIES)
 	sh -c '$(RM) $(ARCHIVE) || true'
 	@$(CAT) ARCHIVE
 	@$(SH) ARCHIVE
 
+$(SHLIBNAME): $(SOFILES)
+.if $(PORTOBJFORMAT) == "elf"
+	ld -shared -x -soname $(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS`
+.else
+	ld -Bshareable -x -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS`
+.endif
+	ln -s $(SHLIBNAME) lib$(SHLIBBASE).so
+
+.c.so: osdep.h
+	$(CC) -fPIC -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@
+
 .c.o:
-	`$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
+	$(CC) -c $(CFLAGS) $*.c
 
 
 # Cleanup
 
 clean:
 	sh -c '$(RM) auths.c crexcl.c nfstest.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
+	sh -c '$(RM) *.so $(SHLIBNAME)'
 
 
 # Dependencies
@@ -835,7 +852,7 @@
 
 # OS-dependent
 
-osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
+OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
 	osdep.h env_unix.h tcp_unix.h \
 	osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\
 	auths.c crexcl.c flocksim.c nfstest.c flcksafe.c fsync.c gethstid.c \
@@ -848,12 +865,19 @@
 	write.c sslstdio.c \
 	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
 	OSCFLAGS
+
+osdep.o: $(OSDEPS)
+	$(CC) $(CFLAGS) `$(CAT) OSCFLAGS` -c osdep.c
+	@echo ========================================================================
 	@echo Building OS-dependent module
 	@echo If you get No such file error messages for files x509.h, ssl.h,
 	@echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
 	@echo is not installed on your system.  Either install OpenSSL first
 	@echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none
-	`$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
+	@echo ========================================================================
+
+osdep.so: $(OSDEPS)
+	$(CC) -fPIC -DPIC -c $(CFLAGS) `cat OSCFLAGS` osdep.c -o $@
 
 osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
 	$(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c




--- src/ipopd/ipop3d.c.orig	Tue Apr 27 23:50:29 2004
+++ src/ipopd/ipop3d.c	Tue May 11 09:24:43 2004
@@ -28,6 +28,11 @@
 #include <time.h>
 #include "c-client.h"

+extern char *getenv ();
+#endif /* DRAC_AUTH */
+
 char *version = "2004.87";	/* server version */
 short state = AUTHORIZATION;	/* server state */
 short critical = NIL;		/* non-zero if in critical code */
@@ -88,7 +99,53 @@

 #include "linkage.c"
 				/* initialize server */
   server_init (pgmname,"pop3","pop3s",clkint,kodint,hupint,trmint);
@@ -201,9 +258,13 @@
 	      syslog (LOG_INFO,"AUTHENTICATE %s failure host=%.80s",s,
 		      tcp_clienthost ());
 	    }

 	    else syslog (LOG_INFO,"Auth user=%.80s host=%.80s no mailbox",
 			 user,tcp_clienthost ());
 	  }
@@ -231,9 +292,13 @@
 	      PSOUT ("-ERR Missing APOP argument\015\012");
 	    else if (!(user = apop_login (challenge,s,t,argc,argv)))
 	      PSOUT ("-ERR Bad APOP\015\012");

 	    else syslog (LOG_INFO,"APOP user=%.80s host=%.80s no mailbox",
 			 user,tcp_clienthost ());
 	  }
@@ -564,6 +629,9 @@
 				/* attempt the login */
     if (server_login (user,pass,t,argc,argv)) {
       int ret = mbxopen ("INBOX");

Lines 22-28 Link Here

(-)imap-uw/files/patch-ai (-1 / +1 lines)
22	+extern char *getenv ();	22	+extern char *getenv ();
23	+#endif /* DRAC_AUTH */	23	+#endif /* DRAC_AUTH */
24	+	24	+
25	char version = "2003.338"; / version number of this server */	25	char version = "2004.350"; / version number of this server */
26	time_t alerttime = 0; /* time of last alert */	26	time_t alerttime = 0; /* time of last alert */
27	time_t sysalerttime = 0; /* time of last system alert */	27	time_t sysalerttime = 0; /* time of last system alert */
28	@@ -238,7 +249,50 @@	28	@@ -238,7 +249,50 @@

Return to bug 66518

Lines 1-15 Link Here

(-)imap-uw/files/patch-ab (-40 / +103 lines)
1	--- src/osdep/unix/Makefile.orig Wed Apr 11 00:02:06 2001	1	--- src/osdep/unix/Makefile.orig Fri Apr 30 04:08:48 2004
2	+++ src/osdep/unix/Makefile Sat Apr 14 03:20:57 2001	2	+++ src/osdep/unix/Makefile Tue May 11 08:34:26 2004
3	@@ -28,12 +28,12 @@	3	@@ -22,20 +22,20 @@
		4
		5	EXTRAAUTHENTICATORS=
		6	EXTRADRIVERS=mbox
		7	-PASSWDTYPE=std
		8	-SSLTYPE=nopwd
		9	-IP=4
		10	+PASSWDTYPE=pam
		11	+SSLTYPE=unix.nopwd
		12	+IP=6
		13
4		14
5	# Extended flags needed for SSL. You may need to modify.	15	# Extended flags needed for SSL. You may need to modify.
6		16
7	-SSLDIR=/usr/local/ssl	17	-SSLDIR=/usr/local/ssl
8	-SSLCERTS=$(SSLDIR)/certs	18	-SSLCERTS=$(SSLDIR)/certs
9	-SSLINCLUDE=$(SSLDIR)/include
10	-SSLLIB=$(SSLDIR)/lib
11	+SSLDIR=$(OPENSSLBASE)	19	+SSLDIR=$(OPENSSLBASE)
12	+SSLCERTS=$(PREFIX)/certs	20	+SSLCERTS=$(PREFIX)/certs
		21	SSLKEYS=$(SSLCERTS)
		22	-SSLINCLUDE=$(SSLDIR)/include
		23	-SSLLIB=$(SSLDIR)/lib
13	+SSLINCLUDE=$(OPENSSLINC)	24	+SSLINCLUDE=$(OPENSSLINC)
14	+SSLLIB=$(OPENSSLLIB)	25	+SSLLIB=$(OPENSSLLIB)
15		26
Lines 18-33 Link Here
18		29
19	# Older versions of MIT Kerberos also have a libcrypto. If so, you may need	30	# Older versions of MIT Kerberos also have a libcrypto. If so, you may need
20	# to use this instead	31	# to use this instead
21	@@ -46,7 +46,7 @@	32	@@ -62,7 +62,7 @@
22
23	SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
24	-DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\"
25	-SSLLDFLAGS= -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
26	+SSLLDFLAGS= # -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
27
28
29	# Extended flags needed for non-standard passwd types. You may need to modify.
30	@@ -60,7 +60,7 @@
31	# AFSLDFLAGS may also need -L/usr/ucblib -lucb	33	# AFSLDFLAGS may also need -L/usr/ucblib -lucb
32	DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"	34	DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
33	DCELDFLAGS= -ldce	35	DCELDFLAGS= -ldce
Lines 36-76 Link Here
36		38
37		39
38	# Build parameters normally set by the individual port	40	# Build parameters normally set by the individual port
39	@@ -97,7 +97,7 @@	41	@@ -99,7 +99,7 @@
40	# Commands possibly overriden by the individual port	42	# Commands possibly overriden by the individual port
41		43
42	ARRC=ar rc	44	ARRC=ar rc
43	-CC=cc	45	-CC=cc
44	+CC?=cc	46	+#CC=cc
45	LN=ln -s	47	LN=ln -s
46	RANLIB=ranlib	48	RANLIB=ranlib
47		49
48	@@ -115,7 +115,7 @@	50	@@ -117,7 +117,7 @@
49	dummy.o pseudo.o netmsg.o flstring.o fdstring.o \	51	dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
50	rfc822.o nntp.o smtp.o imap4r1.o pop3.o \	52	rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
51	unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o	53	unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
52	-CFLAGS=-g	54	-CFLAGS=-g
53	+CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)	55	+CFLAGS+=-g $(BASECFLAGS) $(EXTRACFLAGS)
54		56
55	CAT=cat	57	CAT=cat
56	MAKE=make	58	MAKE=make
57	@@ -198,6 +198,15 @@	59	@@ -134,6 +134,10 @@
58	BASECFLAGS="-g -B/usr/lib/big/ -Dvoid=char -Dconst=" \	60	PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE)
59	RANLIB=true ARRC="ar -rc"	61
60		62
61	+bfp: # FreeBSD Pluggable Authentication Modules	63	+# Need this for the shared library rule to work correctly
62	+ $(BUILD) `cat SPECIALS` OS=bsi SIGTYPE=psx CHECKPW=pam \	64	+.SUFFIXES: .o .so
63	+ SPOOLDIR=/var \	65	+SOFILES=${BINARIES:.o=.so}
64	+ ACTIVEFILE=/usr/local/news/lib/active \
65	+ RSHPATH=/usr/bin/rsh \
66	+ LOCKPGM=$(PREFIX)/libexec/mlock \
67	+ BASECFLAGS="-DNFSKLUDGE" \
68	+ BASELDFLAGS="-lpam -lcrypt"
69	+	66	+
70	bs3: # BSD/i386 3.0 or higher	67	# Here if no make argument established
71	$(BUILD) `$(CAT) SPECIALS` OS=bsi \	68
72	CHECKPW=bsi LOGINPW=bsi CRXTYPE=nfs \	69	missing: osdep.h
73	@@ -217,8 +226,9 @@	70	@@ -214,13 +218,14 @@
		71	BASECFLAGS="-g -Dconst="
		72
		73	bsf: # FreeBSD
		74	- $(BUILD) `$(CAT) SPECIALS` OS=$@ \
		75	+ $(BUILD) `$(CAT) SPECIALS` OS=$@ CHECKPW=pam \
		76	SIGTYPE=psx CRXTYPE=nfs \
74	SPOOLDIR=/var \	77	SPOOLDIR=/var \
75	ACTIVEFILE=/usr/local/news/lib/active \	78	ACTIVEFILE=/usr/local/news/lib/active \
76	RSHPATH=/usr/bin/rsh \	79	RSHPATH=/usr/bin/rsh \
Lines 78-93 Link Here
78	- BASELDFLAGS="-lcrypt"	81	- BASELDFLAGS="-lcrypt"
79	+ LOCKPGM=$(PREFIX)/libexec/mlock \	82	+ LOCKPGM=$(PREFIX)/libexec/mlock \
80	+ BASECFLAGS="-DNFSKLUDGE" \	83	+ BASECFLAGS="-DNFSKLUDGE" \
81	+ BASELDFLAGS=""	84	+ BASELDFLAGS="-lpam"
82		85
83	bsi: # BSD/i386	86	bsi: # BSD/i386
84	$(BUILD) `$(CAT) SPECIALS` OS=$@ \	87	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
85	@@ -764,7 +774,7 @@	88	@@ -786,23 +791,35 @@
		89
		90	# Build it!
86		91
87	build: clean once $(ARCHIVE)	92	-build: clean once $(ARCHIVE)
		93	+build: clean once $(ARCHIVE) $(SHLIBNAME)
88		94
89	-all: $(ARCHIVE)	95	-all: $(ARCHIVE)
90	+all: onceenv	96	+all: $(ARCHIVE) $(SHLIBNAME)
91		97
92	$(ARCHIVE): $(BINARIES)	98	$(ARCHIVE): $(BINARIES)
93	sh -c '$(RM) $(ARCHIVE) \|\| true'	99	sh -c '$(RM) $(ARCHIVE) \|\| true'
		100	@$(CAT) ARCHIVE
		101	@$(SH) ARCHIVE
		102
		103	+$(SHLIBNAME): $(SOFILES)
		104	+.if $(PORTOBJFORMAT) == "elf"
		105	+ ld -shared -x -soname $(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS`
		106	+.else
		107	+ ld -Bshareable -x -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS`
		108	+.endif
		109	+ ln -s $(SHLIBNAME) lib$(SHLIBBASE).so
		110	+
		111	+.c.so: osdep.h
		112	+ $(CC) -fPIC -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@
		113	+
		114	.c.o:
		115	- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
		116	+ $(CC) -c $(CFLAGS) $*.c
		117
		118
		119	# Cleanup
		120
		121	clean:
		122	sh -c '$(RM) auths.c crexcl.c nfstest.c linkage.[ch] siglocal.c osdep.[ch] .o ARCHIVE FLAGS TYPE $(ARCHIVE) \|\| true'
		123	+ sh -c '$(RM) *.so $(SHLIBNAME)'
		124
		125
		126	# Dependencies
		127	@@ -835,7 +852,7 @@
		128
		129	# OS-dependent
		130
		131	-osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
		132	+OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
		133	osdep.h env_unix.h tcp_unix.h \
		134	osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\
		135	auths.c crexcl.c flocksim.c nfstest.c flcksafe.c fsync.c gethstid.c \
		136	@@ -848,12 +865,19 @@
		137	write.c sslstdio.c \
		138	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
		139	OSCFLAGS
		140	+
		141	+osdep.o: $(OSDEPS)
		142	+ $(CC) $(CFLAGS) `$(CAT) OSCFLAGS` -c osdep.c
		143	+ @echo ========================================================================
		144	@echo Building OS-dependent module
		145	@echo If you get No such file error messages for files x509.h, ssl.h,
		146	@echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
		147	@echo is not installed on your system. Either install OpenSSL first
		148	@echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none
		149	- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
		150	+ @echo ========================================================================
		151	+
		152	+osdep.so: $(OSDEPS)
		153	+ $(CC) -fPIC -DPIC -c $(CFLAGS) `cat OSCFLAGS` osdep.c -o $@
		154
		155	osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
		156	$(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c

Lines 1-5 Link Here

(-)imap-uw/files/patch-ah (-6 / +6 lines)
1	--- src/ipopd/ipop3d.c.orig Fri Jan 17 18:17:58 2003	1	--- src/ipopd/ipop3d.c.orig Tue Apr 27 23:50:29 2004
2	+++ src/ipopd/ipop3d.c Mon Jun 2 02:47:10 2003	2	+++ src/ipopd/ipop3d.c Tue May 11 09:24:43 2004
3	@@ -28,6 +28,11 @@	3	@@ -28,6 +28,11 @@
4	#include <time.h>	4	#include <time.h>
5	#include "c-client.h"	5	#include "c-client.h"
Lines 22-28 Link Here
22	+extern char *getenv ();	22	+extern char *getenv ();
23	+#endif /* DRAC_AUTH */	23	+#endif /* DRAC_AUTH */
24	+	24	+
25	char version = "2003.83"; / server version */	25	char version = "2004.87"; / server version */
26	short state = AUTHORIZATION; /* server state */	26	short state = AUTHORIZATION; /* server state */
27	short critical = NIL; /* non-zero if in critical code */	27	short critical = NIL; /* non-zero if in critical code */
28	@@ -88,7 +99,53 @@	28	@@ -88,7 +99,53 @@
Lines 89-95 Link Here
89	#include "linkage.c"	89	#include "linkage.c"
90	/* initialize server */	90	/* initialize server */
91	server_init (pgmname,"pop3","pop3s",clkint,kodint,hupint,trmint);	91	server_init (pgmname,"pop3","pop3s",clkint,kodint,hupint,trmint);
92	@@ -209,9 +266,13 @@	92	@@ -201,9 +258,13 @@
93	syslog (LOG_INFO,"AUTHENTICATE %s failure host=%.80s",s,	93	syslog (LOG_INFO,"AUTHENTICATE %s failure host=%.80s",s,
94	tcp_clienthost ());	94	tcp_clienthost ());
95	}	95	}
Lines 104-110 Link Here
104	else syslog (LOG_INFO,"Auth user=%.80s host=%.80s no mailbox",	104	else syslog (LOG_INFO,"Auth user=%.80s host=%.80s no mailbox",
105	user,tcp_clienthost ());	105	user,tcp_clienthost ());
106	}	106	}
107	@@ -248,9 +309,13 @@	107	@@ -231,9 +292,13 @@
108	PSOUT ("-ERR Missing APOP argument\015\012");	108	PSOUT ("-ERR Missing APOP argument\015\012");
109	else if (!(user = apop_login (challenge,s,t,argc,argv)))	109	else if (!(user = apop_login (challenge,s,t,argc,argv)))
110	PSOUT ("-ERR Bad APOP\015\012");	110	PSOUT ("-ERR Bad APOP\015\012");
Lines 119-125 Link Here
119	else syslog (LOG_INFO,"APOP user=%.80s host=%.80s no mailbox",	119	else syslog (LOG_INFO,"APOP user=%.80s host=%.80s no mailbox",
120	user,tcp_clienthost ());	120	user,tcp_clienthost ());
121	}	121	}
122	@@ -580,6 +645,9 @@	122	@@ -564,6 +629,9 @@
123	/* attempt the login */	123	/* attempt the login */
124	if (server_login (user,pass,t,argc,argv)) {	124	if (server_login (user,pass,t,argc,argv)) {
125	int ret = mbxopen ("INBOX");	125	int ret = mbxopen ("INBOX");