Henning Brauer <[EMAIL PROTECTED]> writes:
> especially given I have less and less time to bring the smtp auth
> patch up to date (and don't like some parts) I would appreciate that.
FWIW, if it helps, here's a diff between the smtp-auth-20030301.patch
and what I needed to apply it cleanly to qmail-ldap-20030501.patch
This is just the minimum I needed to make it go, but perhaps isn't the
best way to do it.
*** smtp-auth-20030301.patch Wed Jul 30 14:51:35 2003
--- smtp-auth-20030301-NASAHQ.patch Wed Jul 30 15:43:45 2003
***************
*** 50,57 ****
received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \
datetime.a getln.a open.a sig.a case.a env.a stralloc.a \
alloc.a substdio.a error.a fs.a auto_qmail.o dns.o str.a \
! - `cat dns.lib` `cat socket.lib` ${TLSLIBS}
! + ${SMTPAUTHOBJS} `cat dns.lib` `cat socket.lib` ${TLSLIBS}
qmail-smtpd.0: \
qmail-smtpd.8
--- 50,57 ----
received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \
datetime.a getln.a open.a sig.a case.a env.a stralloc.a \
alloc.a substdio.a error.a fs.a auto_qmail.o dns.o str.a \
! - `cat dns.lib` `cat socket.lib` $(TLSLIBS)
! + ${SMTPAUTHOBJS} `cat dns.lib` `cat socket.lib` $(TLSLIBS)
qmail-smtpd.0: \
qmail-smtpd.8
***************
*** 59,66 ****
error.h ipme.h ip.h ipalloc.h ip.h gen_alloc.h ip.h qmail.h \
substdio.h str.h fmt.h scan.h byte.h case.h env.h now.h datetime.h \
exit.h rcpthosts.h timeoutread.h timeoutwrite.h commands.h rbl.h
! - ./compile ${TLSON} ${TLSINCLUDES} qmail-smtpd.c
! + ./compile ${TLSON} ${TLSINCLUDES} ${SMTPAUTH} qmail-smtpd.c
qmail-start: \
load qmail-start.o prot.o fd.a auto_uids.o
--- 59,66 ----
error.h ipme.h ip.h ipalloc.h ip.h gen_alloc.h ip.h qmail.h \
substdio.h str.h fmt.h scan.h byte.h case.h env.h now.h datetime.h \
exit.h rcpthosts.h timeoutread.h timeoutwrite.h commands.h rbl.h
! - ./compile $(TLS) $(TLSINCLUDES) qmail-smtpd.c
! + ./compile $(TLS) $(TLSINCLUDES) ${SMTPAUTH} qmail-smtpd.c
qmail-start: \
load qmail-start.o prot.o fd.a auto_uids.o
***************
*** 930,936 ****
{
smtp_greet("250-");
smtpsize[fmt_ulong(smtpsize,(unsigned long) databytes)] = 0;
! -#ifdef TLS
- if (ssl) {
- out("\r\n250-PIPELINING\r\n");
- out("250-SIZE "); out(smtpsize); out("\r\n");
--- 930,936 ----
{
smtp_greet("250-");
smtpsize[fmt_ulong(smtpsize,(unsigned long) databytes)] = 0;
! -#ifdef TLS_SMTPD
- if (ssl) {
- out("\r\n250-PIPELINING\r\n");
- out("250-SIZE "); out(smtpsize); out("\r\n");
***************
*** 947,959 ****
+ out("250-AUTH LOGIN PLAIN\r\n");
+#endif
+#endif
! #ifdef TLS
- out("250-STARTTLS\r\n");
+ if ( !ssl) out("250-STARTTLS\r\n");
#endif
out("250-SIZE "); out(smtpsize); out("\r\n");
out("250 8BITMIME\r\n");
! -#ifdef TLS
- }
-#endif
seenmail = 0; dohelo(arg);
--- 947,959 ----
+ out("250-AUTH LOGIN PLAIN\r\n");
+#endif
+#endif
! #ifdef TLS_SMTPD
- out("250-STARTTLS\r\n");
+ if ( !ssl) out("250-STARTTLS\r\n");
#endif
out("250-SIZE "); out(smtpsize); out("\r\n");
out("250 8BITMIME\r\n");
! -#ifdef TLS_SMTPD
- }
-#endif
seenmail = 0; dohelo(arg);
***************
*** 1193,1198 ****
+#ifdef USE_SMTPAUTH
+ smtpauth_argv = argv;
+#endif
! #ifdef TLS
sig_alarmcatch(sigalrm);
#endif
--- 1193,1198 ----
+#ifdef USE_SMTPAUTH
+ smtpauth_argv = argv;
+#endif
! #ifdef TLS_SMTPD
sig_alarmcatch(sigalrm);
#endif
