X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fserv_func.c;h=88af2024f5c8d6dcc6d4324c2f6af25b0ec01c22;hb=5d2d3f4eea91c74af93c735bff7ad9955b466181;hp=71d5d57daa6eafd1ab2fdf2c7560381e40aea209;hpb=cc1ac05448414ebbdfb65a7f7e1d3081a5618570;p=citadel.git

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 71d5d57da..88af2024f 100644
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -1,16 +1,17 @@
+// Functions which handle communication with the Citadel server.
+//
+// Copyright (c) 1996-2021 by the citadel.org team
+//
+// This program is open source software.  You can redistribute it and/or
+// modify it under the terms of the GNU General Public License, version 3.
 
 #include "webcit.h"
 #include "webserver.h"
 
-int is_uds = 0;
-char serv_sock_name[PATH_MAX] = "";
-
 HashList *EmbeddableMimes = NULL;
 StrBuf *EmbeddableMimeStrs = NULL;
 
-
-void SetInlinMimeRenderers(void)
-{
+void SetInlinMimeRenderers(void) {
 	StrBuf *Buf;
 
 	Buf = NewStrBuf();
@@ -23,8 +24,7 @@ void SetInlinMimeRenderers(void)
 }
 
 
-void DeleteServInfo(ServInfo **FreeMe)
-{
+void DeleteServInfo(ServInfo **FreeMe) {
 	if (*FreeMe == NULL)
 		return;
 	FreeStrBuf(&(*FreeMe)->serv_nodename);
@@ -45,8 +45,7 @@ void DeleteServInfo(ServInfo **FreeMe)
  * browser_host		the citadel we want to connect to
  * user_agent		which browser uses our client?
  */
-ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
-{
+ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent) {
 	ServInfo *info;
 	StrBuf *Buf;
 	int a;
@@ -64,7 +63,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
 	);
 	StrBuf_ServGetln(Buf);
 	if (GetServerStatus(Buf, NULL) != 2) {
-		syslog(0, "get_serv_info(IDEN): unexpected answer [%s]\n",
+		syslog(LOG_WARNING, "get_serv_info(IDEN): unexpected answer [%s]\n",
 			ChrPtr(Buf));
 		FreeStrBuf(&Buf);
 		return NULL;
@@ -78,7 +77,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
 	serv_puts("ICAL sgi|1");
 	StrBuf_ServGetln(Buf);
 	if (GetServerStatus(Buf, NULL) != 2) {
-		syslog(0, "get_serv_info(ICAL sgi|1): unexpected answer [%s]\n",
+		syslog(LOG_WARNING, "get_serv_info(ICAL sgi|1): unexpected answer [%s]\n",
 			ChrPtr(Buf));
 		FreeStrBuf(&Buf);
 		return NULL;
@@ -88,7 +87,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
 	serv_puts("INFO");
 	StrBuf_ServGetln(Buf);
 	if (GetServerStatus(Buf, NULL) != 1) {
-		syslog(0, "get_serv_info(INFO sgi|1): unexpected answer [%s]\n",
+		syslog(LOG_WARNING, "get_serv_info(INFO sgi|1): unexpected answer [%s]\n",
 			ChrPtr(Buf));
 		FreeStrBuf(&Buf);
 		return NULL;
@@ -159,34 +158,36 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
 	return info;
 }
 
-int GetConnected (void)
-{
+int GetConnected (void) {
 	StrBuf *Buf;
-	wcsession *WCC = WC;
-
-	if (WCC->ReadBuf == NULL)
-		WCC->ReadBuf = NewStrBufPlain(NULL, SIZ * 4);
-	if (is_uds) /* unix domain socket */
-		WCC->serv_sock = uds_connectsock(serv_sock_name);
-	else        /* tcp socket */
-		WCC->serv_sock = tcp_connectsock(ctdlhost, ctdlport);
+
+	if (WC->ReadBuf == NULL) {
+		WC->ReadBuf = NewStrBufPlain(NULL, SIZ * 4);
+	}
+
+	static char serv_sock_name[PATH_MAX] = "";
+	if (IsEmptyStr(serv_sock_name)) {
+		snprintf(serv_sock_name, sizeof serv_sock_name, "%s/citadel.socket", ctdl_dir);
+	}
+	WC->serv_sock = connect_to_citadel(serv_sock_name);
 	
-	if (WCC->serv_sock < 0) {
-		FreeStrBuf(&WCC->ReadBuf);
+	if (WC->serv_sock < 0) {
+		WC->connected = 0;
+		FreeStrBuf(&WC->ReadBuf);
 		return 1;
 	}
 	else {
 		long Status;
 		int short_status;
 		Buf = NewStrBuf();
-		WCC->connected = 1;
+		WC->connected = 1;
 		StrBuf_ServGetln(Buf);	/* get the server greeting */
 		short_status = GetServerStatus(Buf, &Status);
 		FreeStrBuf(&Buf);
 
 		/* Server isn't ready for us? */
 		if (short_status != 2) {
-			if (Status == 571) {
+			if (Status == 551) {
 				hprintf("HTTP/1.1 503 Service Unavailable\r\n");
 				hprintf("Content-type: text/plain; charset=utf-8\r\n");
 				wc_printf(_("This server is already serving its maximum number of users and cannot accept any additional logins at this time.  Please try again later or contact your system administrator."));
@@ -210,18 +211,18 @@ int GetConnected (void)
 		 * unless we are following X-Forwarded-For: headers
 		 * and such a header has already turned up something.
 		 */
-		if ( (!follow_xff) || (StrLength(WCC->Hdr->HR.browser_host) == 0) ) {
-			if (WCC->Hdr->HR.browser_host == NULL) {
-				WCC->Hdr->HR.browser_host = NewStrBuf();
-				Put(WCC->Hdr->HTTPHeaders, HKEY("FreeMeWithTheOtherHeaders"), 
-				    WCC->Hdr->HR.browser_host, HFreeStrBuf);
+		if ( (!follow_xff) || (StrLength(WC->Hdr->HR.browser_host) == 0) ) {
+			if (WC->Hdr->HR.browser_host == NULL) {
+				WC->Hdr->HR.browser_host = NewStrBuf();
+				Put(WC->Hdr->HTTPHeaders, HKEY("FreeMeWithTheOtherHeaders"), 
+				    WC->Hdr->HR.browser_host, HFreeStrBuf);
 			}
-			locate_host(WCC->Hdr->HR.browser_host, WCC->Hdr->http_sock);
+			locate_host(WC->Hdr->HR.browser_host, WC->Hdr->http_sock);
 		}
-		if (WCC->serv_info == NULL) {
-			WCC->serv_info = get_serv_info(WCC->Hdr->HR.browser_host, WCC->Hdr->HR.user_agent);
+		if (WC->serv_info == NULL) {
+			WC->serv_info = get_serv_info(WC->Hdr->HR.browser_host, WC->Hdr->HR.user_agent);
 		}
-		if (WCC->serv_info == NULL){
+		if (WC->serv_info == NULL){
 			begin_burst();
 			wc_printf(_("Received unexpected answer from Citadel server; bailing out."));
 			hprintf("HTTP/1.1 502 Bad Gateway\r\n");
@@ -230,17 +231,17 @@ int GetConnected (void)
 			end_webcit_session();
 			return 1;
 		}
-		if (WCC->serv_info->serv_rev_level < MINIMUM_CIT_VERSION) {
+		if (WC->serv_info->serv_rev_level < MINIMUM_CIT_VERSION) {
 			begin_burst();
 			wc_printf(_("You are connected to a Citadel "
 				  "server running Citadel %d.%02d. \n"
 				  "In order to run this version of WebCit "
 				  "you must also have Citadel %d.%02d or"
 				  " newer.\n\n\n"),
-				WCC->serv_info->serv_rev_level / 100,
-				WCC->serv_info->serv_rev_level % 100,
-				MINIMUM_CIT_VERSION / 100,
-				MINIMUM_CIT_VERSION % 100
+				WC->serv_info->serv_rev_level,
+				0,
+				MINIMUM_CIT_VERSION,
+				0
 				);
 			hprintf("HTTP/1.1 200 OK\r\n");
 			hprintf("Content-type: text/plain; charset=utf-8\r\n");
@@ -253,58 +254,8 @@ int GetConnected (void)
 	return 0;
 }
 
-/*
- *  Read Citadel variformat text and spit it out as HTML.
- *  align html align string
- */
-inline void fmout(const char *align)
-{
-	_fmout(WC->WBuf, align);
-}
-
-void _fmout(StrBuf *Target, const char *align)
-{
-	int intext = 0;
-	int bq = 0;
-	char buf[SIZ];
-
-	StrBufAppendPrintf(Target, "<div align=%s>\n", align);
-	while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-
-		if ((intext == 1) && (isspace(buf[0]))) {
-			wc_printf("<br>");
-		}
-		intext = 1;
-
-		/*
-		 * Quoted text should be displayed in italics and in a
-		 * different colour.  This code understands Citadel-style
-		 * " >" quotes and will convert to <BLOCKQUOTE> tags.
-		 */
-		if ((bq == 0) && (!strncmp(buf, " >", 2))) {
-			StrBufAppendBufPlain(Target, HKEY("<BLOCKQUOTE>"), 0);
-			bq = 1;
-		} else if ((bq == 1) && (strncmp(buf, " >", 2))) {
-			StrBufAppendBufPlain(Target, HKEY("</BLOCKQUOTE>"), 0);
-			bq = 0;
-		}
-		if ((bq == 1) && (!strncmp(buf, " >", 2))) {
-			strcpy(buf, &buf[2]);
-		}
-		/* Activate embedded URL's */
-		url(buf, sizeof(buf));
-
-		escputs(buf);
-		StrBufAppendBufPlain(Target, HKEY("\n"), 0);
-	}
-	if (bq == 1) {
-		wc_printf("</I>");
-	}
-	wc_printf("</div><br>\n");
-}
 
-void FmOut(StrBuf *Target, const char *align, const StrBuf *Source)
-{
+void FmOut(StrBuf *Target, const char *align, const StrBuf *Source) {
 	const char *ptr, *pte;
 	const char *BufPtr = NULL;
 	StrBuf *Line = NewStrBufPlain(NULL, SIZ);
@@ -383,8 +334,7 @@ void FmOut(StrBuf *Target, const char *align, const StrBuf *Source)
 /*
  *  Transmit message text (in memory) to the server.
  */
-void text_to_server(char *ptr)
-{
+void text_to_server(char *ptr) {
 	char buf[256];
 	int ch, a, pos, len;
 
@@ -393,7 +343,10 @@ void text_to_server(char *ptr)
 
 	while (ptr[pos] != 0) {
 		ch = ptr[pos++];
-		if (ch == 10) {
+		if (ch == 13) {
+			// ignore CR characters
+		}
+		else if (ch == 10) {
 			len = strlen(buf);
 			while ( (isspace(buf[len - 1]))
 				&& (buf[0] !=  '\0') 
@@ -424,71 +377,12 @@ void text_to_server(char *ptr)
 /*
  * Transmit message text (in memory) to the server, converting to Quoted-Printable encoding as we go.
  */
-void text_to_server_qp(char *ptr)
-{
-	unsigned char ch, buf[256];
-	int pos;
-	int output_len = 0;
+void text_to_server_qp(const StrBuf *SendMeEncoded) {
+	StrBuf *ServBuf;
 
-	pos = 0;
-	buf[0] = 0;
-	output_len = 0;
-
-	while (ptr[pos] != 0) {
-		ch = (unsigned char)(ptr[pos++]);
-
-		if (ch == 13) {
-			/* ignore carriage returns */
-		}
-		else if (ch == 10) {
-			/* hard line break */
-			if (output_len > 0) {
-				if (isspace(buf[output_len-1])) {
-					sprintf((char *)&buf[output_len-1], "=%02X", buf[output_len-1]);
-					output_len += 2;
-				}
-			}
-			buf[output_len++] = 0;
-			serv_puts((char *)buf);
-			output_len = 0;
-		}
-		else if (ch == 9) {
-			buf[output_len++] = ch;
-		}
-		else if ( (ch >= 32) && (ch <= 60) ) {
-			buf[output_len++] = ch;
-		}
-		else if ( (ch >= 62) && (ch <= 126) ) {
-			buf[output_len++] = ch;
-		}
-		else {
-			sprintf((char *)&buf[output_len], "=%02X", ch);
-			output_len += 3;
-		}
-		
-		if (output_len > 72) {
-			/* soft line break */
-			if (isspace(buf[output_len-1])) {
-				sprintf((char *)&buf[output_len-1], "=%02X", buf[output_len-1]);
-				output_len += 2;
-			}
-			buf[output_len++] = '=';
-			buf[output_len++] = 0;
-			serv_puts((char *)buf);
-			output_len = 0;
-		}
-	}
-
-	/* end of data - transmit anything that's left */
-	if (output_len > 0) {
-		if (isspace(buf[output_len-1])) {
-			sprintf((char *)&buf[output_len-1], "=%02X", buf[output_len-1]);
-			output_len += 2;
-		}
-		buf[output_len++] = 0;
-		serv_puts((char *)buf);
-		output_len = 0;
-	}
+	ServBuf = StrBufRFC2047encodeMessage(SendMeEncoded);
+	serv_putbuf(ServBuf);
+	FreeStrBuf(&ServBuf);
 }
 
 
@@ -497,8 +391,7 @@ void text_to_server_qp(char *ptr)
 /*
  * translate server message output to text (used for editing room info files and such)
  */
-void server_to_text()
-{
+void server_to_text() {
 	char buf[SIZ];
 
 	int count = 0;
@@ -520,32 +413,30 @@ void server_to_text()
  * usual 000 terminator is found.  Caller is responsible for freeing
  * the returned pointer.
  */
-int read_server_text(StrBuf *Buf, long *nLines)
-{
-	wcsession *WCC = WC;
+int read_server_text(StrBuf *Buf, long *nLines) {
+	StrBuf *ReadBuf;
 	long nRead;
 	long nTotal = 0;
 	long nlines;
 	
 	nlines = 0;
-	while ((WCC->serv_sock!=-1) &&
-	       (nRead = StrBuf_ServGetln(Buf), (nRead >= 0) ))
+	ReadBuf = NewStrBuf();
+	while ((WC->serv_sock!=-1) &&
+	       (nRead = StrBuf_ServGetln(ReadBuf), (nRead >= 0) &&
+		((nRead != 3)||(strcmp(ChrPtr(ReadBuf), "000") != 0))))
 	{
-		if (strcmp(ChrPtr(Buf) + nTotal, "000") != 0) {
-			StrBufCutRight(Buf, nRead);
-			break;
-		}
+		StrBufAppendBuf(Buf, ReadBuf, 0);
+		StrBufAppendBufPlain(Buf, HKEY("\n"), 0);
 		nTotal += nRead;
 		nlines ++;
 	}
-
+	FreeStrBuf(&ReadBuf);
 	*nLines = nlines;
 	return nTotal;
 }
 
 
-int GetServerStatusMsg(StrBuf *Line, long* FullState, int PutImportantMessage, int MajorOK)
-{
+int GetServerStatusMsg(StrBuf *Line, long* FullState, int PutImportantMessage, int MajorOK) {
 	int rc;
 	if (FullState != NULL)
 		*FullState = StrTol(Line);
@@ -560,102 +451,81 @@ int GetServerStatusMsg(StrBuf *Line, long* FullState, int PutImportantMessage, i
 }
 
 
-void tmplput_serv_ip(StrBuf *Target, WCTemplputParams *TP)
-{
+void tmplput_serv_ip(StrBuf *Target, WCTemplputParams *TP) {
 	StrBufAppendPrintf(Target, "%d", WC->ctdl_pid);
 }
 
-void tmplput_serv_admin(StrBuf *Target, WCTemplputParams *TP)
-{
-	wcsession *WCC = WC;
-	if (WCC->serv_info == NULL)
+void tmplput_serv_admin(StrBuf *Target, WCTemplputParams *TP) {
+	if (WC->serv_info == NULL)
 		return;
-	StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_sysadm, 0);
+	StrBufAppendTemplate(Target, TP, WC->serv_info->serv_sysadm, 0);
 }
 
-void tmplput_serv_nodename(StrBuf *Target, WCTemplputParams *TP)
-{
-	wcsession *WCC = WC;
-	if (WCC->serv_info == NULL)
+void tmplput_serv_nodename(StrBuf *Target, WCTemplputParams *TP) {
+	if (WC->serv_info == NULL)
 		return;
-	StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_nodename, 0);
+	StrBufAppendTemplate(Target, TP, WC->serv_info->serv_nodename, 0);
 }
 
-void tmplput_serv_humannode(StrBuf *Target, WCTemplputParams *TP)
-{
-	wcsession *WCC = WC;
-	if (WCC->serv_info == NULL)
+void tmplput_serv_humannode(StrBuf *Target, WCTemplputParams *TP) {
+	if (WC->serv_info == NULL)
 		return;
-	StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_humannode, 0);
+	StrBufAppendTemplate(Target, TP, WC->serv_info->serv_humannode, 0);
 }
 
-void tmplput_serv_fqdn(StrBuf *Target, WCTemplputParams *TP)
-{
-	wcsession *WCC = WC;
-	if (WCC->serv_info == NULL)
+void tmplput_serv_fqdn(StrBuf *Target, WCTemplputParams *TP) {
+	if (WC->serv_info == NULL)
 		return;
-	StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_fqdn, 0);
+	StrBufAppendTemplate(Target, TP, WC->serv_info->serv_fqdn, 0);
 }
 
-void tmplput_serv_software(StrBuf *Target, WCTemplputParams *TP)
-{
-	wcsession *WCC = WC;
-	if (WCC->serv_info == NULL)
+void tmplput_serv_software(StrBuf *Target, WCTemplputParams *TP) {
+	if (WC->serv_info == NULL)
 		return;
-	StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_software, 0);
+	StrBufAppendTemplate(Target, TP, WC->serv_info->serv_software, 0);
 }
 
-void tmplput_serv_rev_level(StrBuf *Target, WCTemplputParams *TP)
-{
-	wcsession *WCC = WC;
-	if (WCC->serv_info == NULL)
-		return;
-	StrBufAppendPrintf(Target, "%d.%02d",
-			    WCC->serv_info->serv_rev_level / 100,
-			    WCC->serv_info->serv_rev_level % 100);
+void tmplput_serv_rev_level(StrBuf *Target, WCTemplputParams *TP) {
+	if (WC->serv_info == NULL) return;
+	StrBufAppendPrintf(Target, "%d", WC->serv_info->serv_rev_level);
 }
-int conditional_serv_newuser_disabled(StrBuf *Target, WCTemplputParams *TP)
-{
-	wcsession *WCC = WC;
-	if (WCC->serv_info == NULL)
+int conditional_serv_newuser_disabled(StrBuf *Target, WCTemplputParams *TP) {
+	if (WC->serv_info == NULL)
 		return 0;
-	return WCC->serv_info->serv_newuser_disabled != 0;
+	return WC->serv_info->serv_newuser_disabled != 0;
 }
 
-int conditional_serv_supports_openid(StrBuf *Target, WCTemplputParams *TP)
-{
-	wcsession *WCC = WC;
-	if (WCC->serv_info == NULL)
+int conditional_serv_supports_guest(StrBuf *Target, WCTemplputParams *TP) {
+        if (WC->serv_info == NULL)
 		return 0;
-	return WCC->serv_info->serv_supports_openid != 0;
+        return WC->serv_info->serv_supports_guest != 0;
 }
 
-int conditional_serv_fulltext_enabled(StrBuf *Target, WCTemplputParams *TP)
-{
-	wcsession *WCC = WC;
-	if (WCC->serv_info == NULL)
+int conditional_serv_supports_openid(StrBuf *Target, WCTemplputParams *TP) {
+	if (WC->serv_info == NULL)
 		return 0;
-	return WCC->serv_info->serv_fulltext_enabled != 0;
+	return WC->serv_info->serv_supports_openid != 0;
 }
 
-int conditional_serv_ldap_enabled(StrBuf *Target, WCTemplputParams *TP)
-{
-	wcsession *WCC = WC;
-	if (WCC->serv_info == NULL)
+int conditional_serv_fulltext_enabled(StrBuf *Target, WCTemplputParams *TP) {
+	if (WC->serv_info == NULL)
 		return 0;
-	return WCC->serv_info->serv_supports_ldap != 0;
+	return WC->serv_info->serv_fulltext_enabled != 0;
 }
 
-void tmplput_serv_bbs_city(StrBuf *Target, WCTemplputParams *TP)
-{
-	wcsession *WCC = WC;
-	if (WCC->serv_info == NULL)
+int conditional_serv_ldap_enabled(StrBuf *Target, WCTemplputParams *TP) {
+	if (WC->serv_info == NULL)
+		return 0;
+	return WC->serv_info->serv_supports_ldap != 0;
+}
+
+void tmplput_serv_bbs_city(StrBuf *Target, WCTemplputParams *TP) {
+	if (WC->serv_info == NULL)
 		return;
 	StrBufAppendTemplate(Target, TP, WC->serv_info->serv_bbs_city, 0);
 }
 
-void tmplput_mesg(StrBuf *Target, WCTemplputParams *TP)
-{
+void tmplput_mesg(StrBuf *Target, WCTemplputParams *TP) {
 	int n = 0;
 	int Done = 0;
 	StrBuf *Line;
@@ -688,16 +558,19 @@ void tmplput_mesg(StrBuf *Target, WCTemplputParams *TP)
 	FreeStrBuf(&Line);
 }
 
+void tmplput_site_prefix(StrBuf *Target, WCTemplputParams *TP) {
+	if ((WC != NULL) && (WC->Hdr->HostHeader != NULL)) {
+		StrBufAppendTemplate(Target, TP, WC->Hdr->HostHeader, 0);
+	}
+}
 
-void RegisterEmbeddableMimeType(const char *MimeType, long MTLen, int Priority)
-{
+void RegisterEmbeddableMimeType(const char *MimeType, long MTLen, int Priority) {
 	StrBuf *MT;
 	MT = NewStrBufPlain(MimeType, MTLen);
 	Put(EmbeddableMimes, IKEY(Priority), MT, HFreeStrBuf);
 }
 
-void CreateMimeStr(void)
-{
+void CreateMimeStr(void) {
 	HashPos  *it;
 	void *vMime;
 	long len = 0;
@@ -736,23 +609,25 @@ void
 InitModule_SERVFUNC
 (void)
 {
-	is_uds = strcasecmp(ctdlhost, "uds") == 0;
-	if (is_uds)
-		snprintf(serv_sock_name, PATH_MAX, "%s/citadel.socket", ctdlport);
-
-	RegisterConditional(HKEY("COND:SERV:OPENID"), 2, conditional_serv_supports_openid, CTX_NONE);
-	RegisterConditional(HKEY("COND:SERV:NEWU"), 2, conditional_serv_newuser_disabled, CTX_NONE);
-	RegisterConditional(HKEY("COND:SERV:FULLTEXT_ENABLED"), 2, conditional_serv_fulltext_enabled, CTX_NONE);
-	RegisterConditional(HKEY("COND:SERV:LDAP_ENABLED"), 2, conditional_serv_ldap_enabled, CTX_NONE);
+	RegisterConditional("COND:SERV:OPENID", 2, conditional_serv_supports_openid, CTX_NONE);
+	RegisterConditional("COND:SERV:NEWU", 2, conditional_serv_newuser_disabled, CTX_NONE);
+	RegisterConditional("COND:SERV:FULLTEXT_ENABLED", 2, conditional_serv_fulltext_enabled, CTX_NONE);
+	RegisterConditional("COND:SERV:LDAP_ENABLED", 2, conditional_serv_ldap_enabled, CTX_NONE);
+        RegisterConditional("COND:SERV:SUPPORTS_GUEST", 2, conditional_serv_supports_guest, CTX_NONE);
 	RegisterNamespace("SERV:PID", 0, 0, tmplput_serv_ip, NULL, CTX_NONE);
 	RegisterNamespace("SERV:NODENAME", 0, 1, tmplput_serv_nodename, NULL, CTX_NONE);
 	RegisterNamespace("SERV:HUMANNODE", 0, 1, tmplput_serv_humannode, NULL, CTX_NONE);
 	RegisterNamespace("SERV:FQDN", 0, 1, tmplput_serv_fqdn, NULL, CTX_NONE);
+	
 	RegisterNamespace("SERV:SOFTWARE", 0, 1, tmplput_serv_software, NULL, CTX_NONE);
 	RegisterNamespace("SERV:REV_LEVEL", 0, 0, tmplput_serv_rev_level, NULL, CTX_NONE);
 	RegisterNamespace("SERV:BBS_CITY", 0, 1, tmplput_serv_bbs_city, NULL, CTX_NONE);
 	RegisterNamespace("SERV:MESG", 1, 2, tmplput_mesg, NULL, CTX_NONE);
 	RegisterNamespace("SERV:ADMIN", 0, 1, tmplput_serv_admin, NULL, CTX_NONE);
+
+	RegisterNamespace("SERV:SITE:PREFIX", 0, 1, tmplput_site_prefix, NULL, CTX_NONE);
+
+
 }