how come ; is no longer a valid noop?`huh..?

CHANGESTODO

@@ -21,6 +21,14 @@ ________________________________________________________________________
 ________________________________________________________________________
 == currently being inspected ===========================================
 ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+? /ve/TODO/leave-from-user
+
+- newbies are allowed to open new owned rooms
+  fippo sagt: ergo brauchst du nen exit-hook der owner löscht wenn der n00b-owner aus dem raum geht
+
+- double _link does produce an _unlink to the old client, but not the proper
+  place enter events..?
+
 - jabber logout isn't announced or offline avail isn't processed
   ... apparently other side did not logout properly, as it doesn't happen always
 

config/psyced.settings

@@ -34,7 +34,10 @@ exit
 enable_use_json=yes
 
 # compile expat xml & xmpp parser in, if available
-enable_use_expat=yes
+enable_use_expat=no
+
+# compile iksemel parser in, if available
+enable_use_iksemel=no
 
 # enable this if you want use http://about.psyc.eu/psyclpc#Authlocal
 enable_use_authlocal=yes

install.sh

@@ -1079,7 +1079,7 @@ then
 	echo "Creating $BASE_DIR..."
 	if mkdir -m $BASE_PERM -p $BASE_DIR 2> /dev/null
 	then
-		;
+		echo "";    # nop?
 	else
 		if test "x$userid" = "xroot"
 		then

world/drivers/ldmud/include/interface.h

@@ -153,7 +153,7 @@
 #endif
 
 // some ldmud versions previous to 610 have a problem with digest-md5
-#if __VERSION_MAJOR__ < 4 && __VERSION_MICRO__ < 611
+//#if __VERSION_MAJOR__ < 4 && __VERSION_MICRO__ < 611
-# echo Warning: Your driver is so old, it cannot do DIGEST-MD5
+//# echo Warning: Your driver is so old, it cannot do DIGEST-MD5
-# define _flag_disable_authentication_digest_MD5
+//# define _flag_disable_authentication_digest_MD5
-#endif
+//#endif

world/net/include/peers.h

@@ -23,6 +23,27 @@
 
 #define PPL_NOTIFY	1
 
+// this model does not handle the "None + Pending Out/In" state in
+// http://xmpp.org/rfcs/rfc3921.html#substates - in psyc, if two
+// people intend to subscribe to each other, they are either upgraded
+// to friendship aka "Both," or rather - the actual subscription state
+// on the other side is not stored here, except for the special case
+// of PPL_NOTIFY_OFFERED.
+//
+// if a full implementation of XMPP requires local storage of whether the
+// other side intends to send us presence (even though she can actually do
+// whatever she wants, so the information doesn't seem very useful and is
+// in fact very likely to go out of sync), we'd have to add a new flag class.
+// something like PPL_SUBSCRIBED or PPL_FOLLOW.
+//
+// this all clashes with the PSYC model of context subscriptions - we should
+// throw away all of these PPL_ subscription flags, and model all xmpp
+// friendship states with generic context subscriptions - no matter if we
+// are dealing with people, places or other pubsub apps. seen from this
+// perspective, "None + Pending Out/In" is equivalent to a pair of
+// _request_context_subscribe's which haven't been answered yet. we need
+// a generic per-entity way to store these states, below user level.
+//
 #define PPL_NOTIFY_IMMEDIATE	'8'
 #define PPL_NOTIFY_DEFAULT	PPL_NOTIFY_IMMEDIATE
 #define PPL_NOTIFY_DELAYED	'6'

world/net/psyc/library.i

@@ -187,7 +187,7 @@ int psyc_sendmsg(mixed target, string mc, mixed data, mapping vars,
 		 int showingLog, mixed source, array(mixed) u) {
 	string sname, host, buf, room;
 	int port, usesrv = 1;
-	object o;
+	object ob;
 	mixed t;
 
 	unless (u[UHost]) {
@@ -246,15 +246,15 @@ int psyc_sendmsg(mixed target, string mc, mixed data, mapping vars,
 	if (query_udp_port() == port && is_localhost(host)) {
 	    // this happens when a psyc client sends to a local
 	    // target that hasn't been incarnated yet...
-	    o = find_psyc_object(u);
+	    ob = find_psyc_object(u);
 	    // cache the resulting object for the url
-	    if (o) {
+	    if (ob) {
 	P2(("psyc_sendmsg registering %O for %O found by parsing uniform\n",
-                        target, o))
+                        target, ob))
-                    register_target(target, o);
+                    register_target(target, ob);
             }
 #ifndef __PIKE__ // TPD
-	    return sendmsg(o, mc, data, vars, source);
+	    return sendmsg(ob, mc, data, vars, source);
 #endif
 	    // or deliver directly?
 	}