--- ./jsm/authreg.c Fri Oct 20 22:34:58 2000 +++ ../jabber-1.4.1/./jsm/authreg.c Mon Oct 15 10:34:14 2001 @@ -86,7 +86,12 @@ { jutil_error(p->x, TERROR_NOTACCEPTABLE); }else if(js_user(si,p->to,NULL) != NULL){ +#if defined(__sgi) && defined(_COMPILER_VERSION) + terror err = {409,"Username Not Available"}; + jutil_error(p->x, err ); +#else jutil_error(p->x, (terror){409,"Username Not Available"}); +#endif }else if(!js_mapi_call(si, e_REGISTER, p, NULL, NULL)){ jutil_error(p->x, TERROR_NOTIMPL); } --- ./jsm/modules/mod_auth_0k.c Mon Mar 12 12:44:50 2001 +++ ../jabber-1.4.1/./jsm/modules/mod_auth_0k.c Mon Oct 15 10:31:21 2001 @@ -148,7 +148,12 @@ if(mod_auth_0k_reset(m,m->packet->to,xmlnode_get_tag(m->packet->iq,"password"))) { +#if defined(__sgi) && defined(_COMPILER_VERSION) + terror err = {500,"Password Storage Failed"}; + jutil_error(m->packet->x, err); +#else jutil_error(m->packet->x,(terror){500,"Password Storage Failed"}); +#endif return M_HANDLED; } @@ -168,7 +173,12 @@ if(mod_auth_0k_reset(m,m->user->id,pass)) { +#if defined(__sgi) && defined(_COMPILER_VERSION) + terror err = {500,"Password Storage Failed"}; + js_bounce(m->si,m->packet->x,err); +#else js_bounce(m->si,m->packet->x,(terror){500,"Password Storage Failed"}); +#endif return M_HANDLED; } return M_PASS; --- ./jsm/modules/mod_auth_plain.c Mon Mar 12 12:44:50 2001 +++ ../jabber-1.4.1/./jsm/modules/mod_auth_plain.c Mon Oct 15 10:29:19 2001 @@ -81,7 +81,12 @@ if(mod_auth_plain_reset(m,m->packet->to,xmlnode_get_tag(m->packet->iq,"password"))) { +#if defined(__sgi) && defined(_COMPILER_VERSION) + terror err = {500,"Password Storage Failed"}; + jutil_error(m->packet->x, err); +#else jutil_error(m->packet->x,(terror){500,"Password Storage Failed"}); +#endif return M_HANDLED; } @@ -101,7 +106,12 @@ if(mod_auth_plain_reset(m,m->user->id,pass)) { +#if defined(__sgi) && defined(_COMPILER_VERSION) + terror err = {500,"Password Storage Failed"}; + js_bounce(m->si,m->packet->x, err); +#else js_bounce(m->si,m->packet->x,(terror){500,"Password Storage Failed"}); +#endif return M_HANDLED; } return M_PASS; --- ./jabberd/lib/lib.h Wed Apr 4 23:33:35 2001 +++ ../jabber-1.4.1/./jabberd/lib/lib.h Mon Oct 15 14:14:53 2001 @@ -586,6 +586,25 @@ char msg[64]; } terror; +#if defined(__sgi) && defined(_COMPILER_VERSION) +extern terror TERROR_BAD; +extern terror TERROR_AUTH; +extern terror TERROR_PAY; +extern terror TERROR_FORBIDDEN; +extern terror TERROR_NOTFOUND; +extern terror TERROR_NOTALLOWED; +extern terror TERROR_NOTACCEPTABLE; +extern terror TERROR_REGISTER; +extern terror TERROR_REQTIMEOUT; +extern terror TERROR_CONFLICT; + +extern terror TERROR_INTERNAL; +extern terror TERROR_NOTIMPL; +extern terror TERROR_EXTERNAL; +extern terror TERROR_UNAVAIL; +extern terror TERROR_EXTTIMEOUT; +extern terror TERROR_DISCONNECTED; +#else #define TERROR_BAD (terror){400,"Bad Request"} #define TERROR_AUTH (terror){401,"Unauthorized"} #define TERROR_PAY (terror){402,"Payment Required"} @@ -603,6 +622,7 @@ #define TERROR_UNAVAIL (terror){503,"Service Unavailable"} #define TERROR_EXTTIMEOUT (terror){504,"Remote Server Timeout"} #define TERROR_DISCONNECTED (terror){510,"Disconnected"} +#endif /* sgi */ /* --------------------------------------------------------- */ /* */ --- ./jabberd/deliver.c Sat Feb 3 14:46:57 2001 +++ ../jabber-1.4.1/./jabberd/deliver.c Mon Oct 15 14:10:51 2001 @@ -440,8 +440,10 @@ return; /* catch the @-internal xdb crap */ - if(p->type == p_XDB && *(p->host) == '-') - return deliver_internal(p, i); + if(p->type == p_XDB && *(p->host) == '-') { + deliver_internal(p, i); + return; + } if(deliver__flag == 0) { /* postpone delivery till later */ --- ./jabberd/jabberd.c Thu Feb 1 12:46:49 2001 +++ ../jabber-1.4.1/./jabberd/jabberd.c Mon Oct 15 14:14:51 2001 @@ -56,6 +56,26 @@ int instance_startup(xmlnode x, int exec); void instance_shutdown(instance i); +#if defined(__sgi) && defined(_COMPILER_VERSION) +terror TERROR_BAD = {400,"Bad Request"}; +terror TERROR_AUTH ={401,"Unauthorized"}; +terror TERROR_PAY = {402,"Payment Required"}; +terror TERROR_FORBIDDEN = {403,"Forbidden"}; +terror TERROR_NOTFOUND = {404,"Not Found"}; +terror TERROR_NOTALLOWED = {405,"Not Allowed"}; +terror TERROR_NOTACCEPTABLE = {406,"Not Acceptable"}; +terror TERROR_REGISTER = {407,"Registration Required"}; +terror TERROR_REQTIMEOUT = {408,"Request Timeout"}; +terror TERROR_CONFLICT = {409,"Conflict"}; + +terror TERROR_INTERNAL = {500,"Internal Server Error"}; +terror TERROR_NOTIMPL = {501,"Not Implemented"}; +terror TERROR_EXTERNAL = {502,"Remote Server Error"}; +terror TERROR_UNAVAIL = {503,"Service Unavailable"}; +terror TERROR_EXTTIMEOUT = {504,"Remote Server Timeout"}; +terror TERROR_DISCONNECTED = {510,"Disconnected"}; +#endif + int main (int argc, char** argv) { sigset_t set; /* a set of signals to trap */ --- ./jabberd/mio_ssl.c Thu Feb 1 12:46:49 2001 +++ ../jabber-1.4.1/./jabberd/mio_ssl.c Mon Oct 15 14:09:49 2001 @@ -3,6 +3,7 @@ #ifdef HAVE_SSL HASHTABLE ssl__ctxs; +#include #ifndef NO_RSA /* This function will generate a temporary key for us */ --- ./jabberd/single.h Sun Feb 4 21:25:57 2001 +++ ../jabber-1.4.1/./jabberd/single.h Mon Oct 15 12:49:54 2001 @@ -3,7 +3,7 @@ if(ghash_get(cmd__line,"h") == NULL || (home == NULL && (ghash_get(cmd__line,"s") == NULL || ghash_get(cmd__line,"l") == NULL))) \ { /* require hostname, and either a HOME or the spool and logs specifically */ \ fprintf(stderr, "\ -Usage: +Usage:\ jabberd -h hostname -s /var/spool/jabber -l /var/log/jabber.log &\n\ Required Parameters:\n\ -h \t\t A valid hostname that this server is accessible via\n\ --- ./jabberd/mio.c Tue Mar 27 20:33:38 2001 +++ ../jabber-1.4.1/./jabberd/mio.c Mon Oct 15 12:59:13 2001 @@ -292,7 +292,7 @@ else if(len < cur->len) { - cur->cur += len; + cur->cur = ((char * ) cur->cur) + len; cur->len -= len; return 1; } --- ./jabberd/mio_xml.c Mon Apr 2 23:30:42 2001 +++ ../jabber-1.4.1/./jabberd/mio_xml.c Mon Oct 15 13:00:32 2001 @@ -142,13 +142,13 @@ nul += 4; bufsz = bufsz - (nul - buf); buf = nul; - mio_write(m,NULL,"HTTP/1.0 200 Ok -Server: jabber/xmlstream-hack-0.1 -Expires: Fri, 10 Oct 1997 10:10:10 GMT -Pragma: no-cache -Cache-control: private -Connection: close - + mio_write(m,NULL,"HTTP/1.0 200 Ok\n\ +Server: jabber/xmlstream-hack-0.1\n\ +Expires: Fri, 10 Oct 1997 10:10:10 GMT\n\ +Pragma: no-cache\n\ +Cache-control: private\n\ +Connection: close\n\ +\n\ ",-1); m->type = type_NORMAL; } --- ./dnsrv/dnsrv.c Tue Feb 20 02:09:48 2001 +++ ../jabber-1.4.1/./dnsrv/dnsrv.c Mon Oct 15 10:21:33 2001 @@ -205,7 +205,12 @@ xmlnode_put_attrib(pkt, "to", to); xmlnode_put_attrib(pkt, "ip", ip); }else{ +#if defined(__sgi) && defined(_COMPILER_VERSION) + terror err= {502,"Unable to resolve hostname."}; + jutil_error(pkt, err); +#else jutil_error(pkt, (terror){502, "Unable to resolve hostname."}); +#endif xmlnode_put_attrib(pkt, "iperror", ""); } deliver(dpacket_new(pkt),NULL); --- ./Makefile Sat Jan 20 21:32:48 2001 +++ ../jabber-1.4.1/./Makefile Fri Oct 19 09:47:37 2001 @@ -3,7 +3,7 @@ # include platform-settings -SUBDIRS=pthsock xdb_file dnsrv jsm dialback jabberd +SUBDIRS=pthsock xdb_file dnsrv jsm dialback jabberd conference-0.4.1 all: all-recursive --- ./configure Fri Feb 2 21:06:24 2001 +++ ../jabber-1.4.1/./configure Mon Oct 15 16:02:32 2001 @@ -27,12 +27,12 @@ else CC="gcc"; fi; -CFLAGS="$CFLAGS -g -Wall -fPIC -I. -I.." +CFLAGS="$CFLAGS -I. -I.." MCFLAGS="$MCFLAGS -shared" LDFLAGS="$LDFLAGS" LIBS="$LIBS" XLDFLAGS="$XLDFLAGS " -JHOME=`pwd` +JHOME=/usr/freeware/jabber ## # Print a cool header @@ -45,7 +45,7 @@ ## if [ $WANT_SSL -eq 1 ]; then printf "Searching for SSL..."; - for dir in ${prefix} /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do + for dir in ${prefix} /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr ${ROOT}/usr/freeware ; do ssldir="$dir" if test -f "$dir/include/openssl/ssl.h"; then found_ssl="yes"; @@ -52,7 +52,7 @@ printf " Found.\n"; CFLAGS="$CFLAGS -I$ssldir/include/openssl -DHAVE_SSL"; LIBS="$LIBS -lssl -lcrypto"; - LDFLAGS="$LDFLAGS -L$ssldir/lib"; + LDFLAGS="$LDFLAGS -L$ssldir/${ABILIB}"; break; fi if test -f "$dir/include/ssl.h"; then @@ -60,7 +60,7 @@ printf " Found.\n"; CFLAGS="$CFLAGS -I$ssldir/include/ -DHAVE_SSL"; LIBS="$LIBS -lssl -lcrypto"; - LDFLAGS="$LDFLAGS -L$ssldir/lib"; + LDFLAGS="$LDFLAGS -L$ssldir/${ABILIB}"; break fi done