From eba0982e033d1ba646dec55fb6fecdbada7952cf Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Fri, 18 Dec 2009 19:32:54 +0100
Subject: [PATCH] don't panic about idn

---
 bin/psyconf                    | 3 ++-
 run/md5.pl                     | 2 ++
 run/sha1.pl                    | 2 ++
 world/net/include/net.h        | 1 -
 world/net/jabber/mixin_parse.c | 4 ++++
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/bin/psyconf b/bin/psyconf
index e84a32b..8322fd2 100755
--- a/bin/psyconf
+++ b/bin/psyconf
@@ -16,7 +16,8 @@ psyconf - a configuration tool for PSYCED
 
 Usage: psyconf [ <file> ]
 
-The default configuration file used is /etc/psyced.ini
+The default configuration file used is either ./psyced.ini
+or /etc/psyc/psyced.ini
 
 =cut
 
diff --git a/run/md5.pl b/run/md5.pl
index d19b0f8..cca1319 100755
--- a/run/md5.pl
+++ b/run/md5.pl
@@ -4,6 +4,8 @@
 # (sort of like cgi) with LDMUD. but by now LDMUD knows how
 # to do MD5 and SHA1 itself, so they are not being used.
 #
+# consult http://about.psyc.eu/spawn for instructions
+#
 use Digest::MD5 qw(md5 md5_hex);
 
 $| = 1;
diff --git a/run/sha1.pl b/run/sha1.pl
index 308c3fd..a1940e0 100755
--- a/run/sha1.pl
+++ b/run/sha1.pl
@@ -4,6 +4,8 @@
 # (sort of like cgi) with LDMUD. but by now LDMUD knows how
 # to do MD5 and SHA1 itself, so they are not being used.
 #
+# consult http://about.psyc.eu/spawn for instructions
+#
 use Digest::SHA1 qw(sha1 sha1_hex);
 
 $| = 1;
diff --git a/world/net/include/net.h b/world/net/include/net.h
index a627c1b..39379b0 100644
--- a/world/net/include/net.h
+++ b/world/net/include/net.h
@@ -64,7 +64,6 @@
 # define NAMEPREP(s) FROM_UTF8(idna_stringprep(TO_UTF8(s), STRINGPREP_NAMEPREP))
 # define RESOURCEPREP(s) FROM_UTF8(idna_stringprep(TO_UTF8(s), STRINGPREP_XMPP_RESOURCEPREP))
 #else
-# echo Warning: using lower_case instead of idna_stringprep!
 # define NODEPREP(s) lower_case(s)
 # define NAMEPREP(s) lower_case(s)
 # define RESOURCEPREP(s) (s)
diff --git a/world/net/jabber/mixin_parse.c b/world/net/jabber/mixin_parse.c
index fc561d6..1bb6d4f 100644
--- a/world/net/jabber/mixin_parse.c
+++ b/world/net/jabber/mixin_parse.c
@@ -4,6 +4,10 @@
 #include "presence.h"
 #include <time.h>
 
+#if !__EFUN_DEFINED__(idna_stringprep)
+# echo Warning: idn support as recommended for XMPP is missing from LPC driver. will try lower_case() instead. usually works.
+#endif
+
 // necessary to implement a minimum set of commands for remote jabber users
 // #undef USER_PROGRAM
 // #undef MYNICK