X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=e3e08be4020d33aae9bb8ca751f906f64d0be9fa;hp=b233e6950a75ef3fa3578e7bee3ee9a3b455d1d6;hb=547a71c5acc223963abc973d8b5045469378a14c;hpb=e1b6b500a91f4b57549f74d21ac335fdc9c7309b

diff --git a/SimpleServer.xs b/SimpleServer.xs
index b233e69..e3e08be 100644
--- a/SimpleServer.xs
+++ b/SimpleServer.xs
@@ -25,7 +25,13 @@
  */
 
 /*$Log: SimpleServer.xs,v $
-/*Revision 1.15  2002-09-16 13:55:53  sondberg
+/*Revision 1.18  2003-01-03 09:05:41  sondberg
+/*Applied Dave's GRS-1 patch - actually this was already done in revision 1.17.
+/*
+/*Revision 1.16  2002/11/26 17:09:18  mike
+/*basic support for idPass authentication
+/*
+/*Revision 1.15  2002/09/16 13:55:53  sondberg
 /*Added support for authentication into SimpleServer.
 /*
 /*Revision 1.14  2002/03/05 00:34:13  mike
@@ -103,26 +109,37 @@ SV *delete_ref = NULL;
 SV *scan_ref = NULL;
 int MAX_OID = 15;
 
+#define GRS_BUF_SIZE 512
 
 Z_GenericRecord *read_grs1(char *str, ODR o)
 {
 	int type, ivalue;
-	char line[512], *buf, *ptr, *original;
-	char value[512];
+	char line[GRS_BUF_SIZE+1], *buf, *ptr, *original;
+	char value[GRS_BUF_SIZE+1];
  	Z_GenericRecord *r = 0;
 
 	original = str;
+	r = (Z_GenericRecord *)odr_malloc(o, sizeof(*r));
+	r->elements = (Z_TaggedElement **) odr_malloc(o, sizeof(Z_TaggedElement*) * GRS_MAX_FIELDS);
+	r->num_elements = 0;
+	
 	for (;;)
 	{
 		Z_TaggedElement *t;
 		Z_ElementData *c;
+		int len;
 	
 		ptr = strchr(str, '\n');
 		if (!ptr) {
 			return r;
 		}
-		strncpy(line, str, ptr - str);
-		line[ptr - str] = 0;
+		len = ptr - str;
+		if (len > GRS_BUF_SIZE) {
+		    yaz_log(LOG_WARN, "GRS string too long - truncating (%d > %d)", len, GRS_BUF_SIZE);
+		    len = GRS_BUF_SIZE;
+		}
+		strncpy(line, str, len);
+		line[len] = 0;
 		buf = line;
 		str = ptr + 1;
 		while (*buf && isspace(*buf))
@@ -134,25 +151,16 @@ Z_GenericRecord *read_grs1(char *str, ODR o)
 		if (sscanf(buf, "(%d,%[^)])", &type, value) != 2)
 		{
 			yaz_log(LOG_WARN, "Bad data in '%s'", buf);
-			return 0;
+			return r;
 		}
 		if (!type && *value == '0')
 			return r;
 		if (!(buf = strchr(buf, ')')))
-			return 0;
+			return r;
 		buf++;
 		while (*buf && isspace(*buf))
 			buf++;
-		if (!*buf)
-			return 0;
-		if (!r)
-		{
-			r = (Z_GenericRecord *)odr_malloc(o, sizeof(*r));
-			r->elements = (Z_TaggedElement **)
-			odr_malloc(o, sizeof(Z_TaggedElement*) * GRS_MAX_FIELDS);
-			r->num_elements = 0;
-		}
-		if (r->num_elements > GRS_MAX_FIELDS)
+		if (r->num_elements >= GRS_MAX_FIELDS)
 		{
 			yaz_log(LOG_WARN, "Max number of GRS-1 elements exceeded [GRS_MAX_FIELDS=%d]", GRS_MAX_FIELDS);
 			exit(0);
@@ -186,8 +194,6 @@ Z_GenericRecord *read_grs1(char *str, ODR o)
 		else
 		{
 			c->which = Z_ElementData_string;
-/*			buf[strlen(buf)-1] = '\0';*/
-			buf[strlen(buf)] = '\0';
 			c->u.string = odr_strdup(o, buf);
 		}
 		r->num_elements++;
@@ -1158,7 +1164,11 @@ bend_initresult *bend_init(bend_initrequest *q)
 		    passwd = nmem_strdup (odr_getmem (q->stream), cp + 1);
 		}
 		xfree(openpass);
+	    } else if (q->auth->which == Z_IdAuthentication_idPass) {
+		user = q->auth->u.idPass->userId;
+		passwd = q->auth->u.idPass->password;
 	    }
+	    /* ### some code paths have user/password unassigned here */
 	    hv_store(href, "USER", 4, newSVpv(user, 0), 0);
 	    hv_store(href, "PASS", 4, newSVpv(passwd, 0), 0);
 	}