[24322] in Source-Commits
/svn/athena r23920 - in trunk/athena/bin/discuss: debian libds mclient server
daemon@ATHENA.MIT.EDU (Evan Broder)
Wed Jul 22 22:30:27 2009
Date: Wed, 22 Jul 2009 22:30:13 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200907230230.n6N2UD6C032048@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-07-22 22:30:12 -0400 (Wed, 22 Jul 2009)
New Revision: 23920
Modified:
trunk/athena/bin/discuss/debian/changelog
trunk/athena/bin/discuss/libds/Makefile.in
trunk/athena/bin/discuss/libds/res_module.c
trunk/athena/bin/discuss/libds/rpcall.c
trunk/athena/bin/discuss/mclient/Makefile.in
trunk/athena/bin/discuss/server/Makefile.in
trunk/athena/bin/discuss/server/rpproc.c
Log:
In discuss:
* Fix local/dumb authentication needed for mail delivery and local
client usage. Patch by Mitch Berger. (Trac: #274)
Modified: trunk/athena/bin/discuss/debian/changelog
===================================================================
--- trunk/athena/bin/discuss/debian/changelog 2009-07-22 17:23:33 UTC (rev 23919)
+++ trunk/athena/bin/discuss/debian/changelog 2009-07-23 02:30:12 UTC (rev 23920)
@@ -1,3 +1,10 @@
+debathena-discuss (10.0.9-0debathena1) unstable; urgency=low
+
+ * Fix local/dumb authentication needed for mail delivery and local
+ client usage. Patch by Mitch Berger. (Trac: #274)
+
+ -- Evan Broder <broder@mit.edu> Wed, 22 Jul 2009 22:29:33 -0400
+
debathena-discuss (10.0.8-0debathena1) unstable; urgency=low
* Add one-character aliases to discuss. Patch by Ben Kaduk. (Trac: #238)
Modified: trunk/athena/bin/discuss/libds/Makefile.in
===================================================================
--- trunk/athena/bin/discuss/libds/Makefile.in 2009-07-22 17:23:33 UTC (rev 23919)
+++ trunk/athena/bin/discuss/libds/Makefile.in 2009-07-23 02:30:12 UTC (rev 23920)
@@ -60,7 +60,7 @@
mv res_module.o res_module.k.o
res_module.nk.o: res_module.c
- ${CC} ${ALL_CFLAGS} -c res_module.c
+ ${CC} ${ALL_CFLAGS} -DNOKERBEROS -c res_module.c
mv res_module.o res_module.nk.o
auth_krb.o:
@@ -71,6 +71,6 @@
mv rpcall.o rpcall.k.o
rpcall.nk.o:
- ${CC} ${ALL_CFLAGS} -c rpcall.c
+ ${CC} ${ALL_CFLAGS} -DNOKERBEROS -c rpcall.c
mv rpcall.o rpcall.nk.o
Modified: trunk/athena/bin/discuss/libds/res_module.c
===================================================================
--- trunk/athena/bin/discuss/libds/res_module.c 2009-07-22 17:23:33 UTC (rev 23919)
+++ trunk/athena/bin/discuss/libds/res_module.c 2009-07-23 02:30:12 UTC (rev 23920)
@@ -33,6 +33,11 @@
#include <string.h>
#include <ctype.h>
+#ifdef NOKERBEROS
+#undef HAVE_KRB4
+#undef HAVE_KRB5
+#endif /* NOKERBEROS */
+
#ifdef HAVE_KRB4
#include <krb.h>
#ifndef MAX_K_NAME_SZ
@@ -289,10 +294,10 @@
retval = krb5_init_context(&context);
if (!retval)
- krb5_get_host_realm(context, primary_name, &hrealms);
- if (!retval && !hrealms[0])
+ retval = krb5_get_host_realm(context, primary_name, &hrealms);
+ if (!retval && hrealms && hrealms[0] && *(hrealms[0]))
strcpy(krb_realm, hrealms[0]);
- if (retval)
+ else
strcpy(krb_realm, local_realm());
if (hrealms)
Modified: trunk/athena/bin/discuss/libds/rpcall.c
===================================================================
--- trunk/athena/bin/discuss/libds/rpcall.c 2009-07-22 17:23:33 UTC (rev 23919)
+++ trunk/athena/bin/discuss/libds/rpcall.c 2009-07-23 02:30:12 UTC (rev 23920)
@@ -38,6 +38,12 @@
#include <discuss/tfile.h>
#include "rpc.h"
#include "config.h"
+
+#ifdef NOKERBEROS
+#undef HAVE_KRB4
+#undef HAVE_KRB5
+#endif /* NOKERBEROS */
+
#ifdef HAVE_KRB5
#include "krb5.h"
#endif /* HAVE_KRB5 */
Modified: trunk/athena/bin/discuss/mclient/Makefile.in
===================================================================
--- trunk/athena/bin/discuss/mclient/Makefile.in 2009-07-22 17:23:33 UTC (rev 23919)
+++ trunk/athena/bin/discuss/mclient/Makefile.in 2009-07-23 02:30:12 UTC (rev 23920)
@@ -61,7 +61,7 @@
${CC} ${LDFLAGS} -o pmtg pmtg.o ../ets/dsc_et.o ${KLIBS}
dsmail: dsmail.o ../ets/dsc_et.o
- ${CC} ${LDFLAGS} -o dsmail dsmail.o ../ets/dsc_et.o ${KLIBS}
+ ${CC} ${LDFLAGS} -o dsmail dsmail.o ../ets/dsc_et.o ${NKLIBS}
dspipe: dspipe.o ../ets/dsc_et.o
${CC} ${LDFLAGS} -o dspipe dspipe.o ../ets/dsc_et.o ${KLIBS}
Modified: trunk/athena/bin/discuss/server/Makefile.in
===================================================================
--- trunk/athena/bin/discuss/server/Makefile.in 2009-07-22 17:23:33 UTC (rev 23919)
+++ trunk/athena/bin/discuss/server/Makefile.in 2009-07-23 02:30:12 UTC (rev 23920)
@@ -78,7 +78,7 @@
mv rpproc.o rpproc.k.o
rpproc.nk.o: rpproc.c
- ${CC} ${ALL_CFLAGS} -DSUBPROC -c rpproc.c
+ ${CC} ${ALL_CFLAGS} -DSUBPROC -DNOKERBEROS -c rpproc.c
mv rpproc.o rpproc.nk.o
rpproc.debug.o: rpproc.c
Modified: trunk/athena/bin/discuss/server/rpproc.c
===================================================================
--- trunk/athena/bin/discuss/server/rpproc.c 2009-07-22 17:23:33 UTC (rev 23919)
+++ trunk/athena/bin/discuss/server/rpproc.c 2009-07-23 02:30:12 UTC (rev 23920)
@@ -20,6 +20,11 @@
*/
+#ifdef NOKERBEROS
+#undef HAVE_KRB4
+#undef HAVE_KRB5
+#endif /* NOKERBEROS */
+
#ifdef INETD
#define ASSOC 1
#endif
