A few things aren't right.
You lost two $s in configure.in.
uip/Makefile.in was missing the KRB4_INCLUDES stuff in my original
patch.
client() in zotnet/mts/client.c tries to extract the kerberos service
name out of the service arg, but that got changed from "pop" to "pop3"
between MH and nmh, so that doesn't work any more. I just hardcoded in
"pop". Perhaps it should be defined somewhere.
inc and msgcheck were changed to default to -norpop in nmh, but if you
don't set -rpop, it will prompt for a password. In the patches I sent
before, I'd just hacked inc and msgcheck to default to -rpop again
#ifdef KPOP, but maybe a better solution would be to add -kpop and
-nokpop options and have it default to -kpop #ifdef KPOP, and fix the
logic so ruserpass only gets called if both rpop and kpop are 0.
*** configure.in.orig Sat Aug 22 19:33:25 1998
--- configure.in Tue Aug 25 18:16:26 1998
***************
*** 308,314 ****
fi
AC_CHECK_FUNC(res_send, ,
AC_CHECK_LIB(resolv, res_send))
! AC_CHECK_LIB(hesiod, hes_resolv, [HESIOD_LIBS="HESIOD_LIBS -lhesiod"],
[AC_MSG_ERROR(Hesiod library not found)], $HESIOD_LIBS)
fi
AC_SUBST(HESIOD_INCLUDES)dnl
--- 308,314 ----
fi
AC_CHECK_FUNC(res_send, ,
AC_CHECK_LIB(resolv, res_send))
! AC_CHECK_LIB(hesiod, hes_resolve, [HESIOD_LIBS="$HESIOD_LIBS -lhesiod"],
[AC_MSG_ERROR(Hesiod library not found)], $HESIOD_LIBS)
fi
AC_SUBST(HESIOD_INCLUDES)dnl
***************
*** 321,327 ****
if test x$with_krb4 != xyes; then
KRB4_INCLUDES="-I$with_krb4/include"
if test -d "$with_krb4/include/kerberosIV"; then
! KRB4_INCLUDES="KRB4_INCLUDES -I$with_krb4/include/kerberosIV"
fi
KRB4_LIBS="-L$with_krb4/lib"
elif test -d /usr/include/kerberosIV; then
--- 321,327 ----
if test x$with_krb4 != xyes; then
KRB4_INCLUDES="-I$with_krb4/include"
if test -d "$with_krb4/include/kerberosIV"; then
! KRB4_INCLUDES="$KRB4_INCLUDES -I$with_krb4/include/kerberosIV"
fi
KRB4_LIBS="-L$with_krb4/lib"
elif test -d /usr/include/kerberosIV; then
*** Makefile.in.orig Sat Aug 22 19:28:49 1998
--- Makefile.in Tue Aug 25 18:16:53 1998
***************
*** 19,26 ****
CC = @CC@
CFLAGS = @CFLAGS@
DEFS = @DEFS@
HESIOD_INCLUDES = @HESIOD_INCLUDES@
! INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) $(HESIOD_INCLUDES)
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
--- 19,27 ----
CC = @CC@
CFLAGS = @CFLAGS@
DEFS = @DEFS@
+ KRB4_INCLUDES = @KRB4_INCLUDES@
HESIOD_INCLUDES = @HESIOD_INCLUDES@
! INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) $(HESIOD_INCLUDES)
$(KRB4_INCLUDES)
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
*** inc.c.orig Tue Aug 25 13:53:43 1998
--- inc.c Tue Aug 25 18:16:41 1998
***************
*** 222,227 ****
--- 222,231 ----
snoop++;
#endif /* POP */
+ #ifdef KPOP
+ rpop = 1;
+ #endif
+
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch (++cp, switches)) {
*** msgchk.c.orig Sun Aug 23 19:14:07 1998
--- msgchk.c Tue Aug 25 18:16:48 1998
***************
*** 133,138 ****
--- 133,142 ----
snoop++;
#endif
+ #ifdef KPOP
+ rpop = 1;
+ #endif
+
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch (++cp, switches)) {
*** client.c.orig Sat Aug 22 18:04:43 1998
--- client.c Tue Aug 25 18:16:35 1998
***************
*** 254,260 ****
return OOPS2;
}
ticket = (KTEXT) malloc (sizeof(KTEXT_ST));
! rem = krb_sendauth (0L, sd, ticket, kservice, instance,
(char *) krb_realmofhost (instance),
(unsigned long) 0, &msg_data, &cred, schedule,
(struct sockaddr_in *) NULL,
--- 254,260 ----
return OOPS2;
}
ticket = (KTEXT) malloc (sizeof(KTEXT_ST));
! rem = krb_sendauth (0L, sd, ticket, "pop", instance,
(char *) krb_realmofhost (instance),
(unsigned long) 0, &msg_data, &cred, schedule,
(struct sockaddr_in *) NULL,