X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=471a59da63a61a6325395c1ed0f209d19dcf7e9c;hp=5fe2cfa0399331bdb642db891b12e8265fcc999e;hb=6728e7a37d48a87c46abbade29d7d48eae84ea23;hpb=657bd74a4d71b1125a3bff1fe99631591ddf1873

diff --git a/SimpleServer.xs b/SimpleServer.xs
index 5fe2cfa..471a59d 100644
--- a/SimpleServer.xs
+++ b/SimpleServer.xs
@@ -25,7 +25,17 @@
  */
 
 /*$Log: SimpleServer.xs,v $
-/*Revision 1.13  2002-02-28 11:21:57  mike
+/*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
+/*Support for implementation_id (commented out until it's
+/*in mainstream Yaz)
+/*
+/*Revision 1.13  2002/02/28 11:21:57  mike
 /*Add RPN structure to search-handler argument hash.
 /*
 /*Revision 1.12  2001/08/30 14:02:10  sondberg
@@ -1095,6 +1105,7 @@ bend_initresult *bend_init(bend_initrequest *q)
 	bend_initresult *r = (bend_initresult *) odr_malloc (q->stream, sizeof(*r));
 	HV *href;
 	SV **temp;
+	SV *id;
 	SV *name;
 	SV *ver;
 	SV *err_str;
@@ -1106,6 +1117,8 @@ bend_initresult *bend_init(bend_initrequest *q)
 	/*char *name_ptr;
 	char *ver_ptr;*/
 	char *ptr;
+	char *user = NULL;
+	char *passwd = NULL;
 
 	dSP;
 	ENTER;
@@ -1131,12 +1144,31 @@ bend_initresult *bend_init(bend_initrequest *q)
 		q->bend_scan = bend_scan;
 	}
        	href = newHV();	
+	hv_store(href, "IMP_ID", 6, newSVpv("", 0), 0);
 	hv_store(href, "IMP_NAME", 8, newSVpv("", 0), 0);
 	hv_store(href, "IMP_VER", 7, newSVpv("", 0), 0);
 	hv_store(href, "ERR_CODE", 8, newSViv(0), 0);
 	hv_store(href, "PEER_NAME", 9, newSVpv(q->peer_name, 0), 0);
 	hv_store(href, "HANDLE", 6, newSVsv(&sv_undef), 0);
 	hv_store(href, "PID", 3, newSViv(getpid()), 0);
+	if (q->auth) {
+	    if (q->auth->which == Z_IdAuthentication_open) {
+		char *openpass = xstrdup (q->auth->u.open);
+		char *cp = strchr (openpass, '/');
+		if (cp) {
+		    *cp = '\0';
+		    user = nmem_strdup (odr_getmem (q->stream), openpass);
+		    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);
+	}
 
 	PUSHMARK(sp);	
 
@@ -1151,6 +1183,9 @@ bend_initresult *bend_init(bend_initrequest *q)
 
 	SPAGAIN;
 
+	temp = hv_fetch(href, "IMP_ID", 6, 1);
+	id = newSVsv(*temp);
+
 	temp = hv_fetch(href, "IMP_NAME", 8, 1);
 	name = newSVsv(*temp);
 
@@ -1170,6 +1205,11 @@ bend_initresult *bend_init(bend_initrequest *q)
 	zhandle->handle = handle;
 	r->errcode = SvIV(status);
 	r->handle = zhandle;
+#if 0 /* implementation_id support is not yet in mainstream Yaz */
+	ptr = SvPV(id, len);
+	q->implementation_id = (char *)xmalloc(len + 1);
+	strcpy(q->implementation_id, ptr);
+#endif
 	ptr = SvPV(name, len);
 	q->implementation_name = (char *)xmalloc(len + 1);
 	strcpy(q->implementation_name, ptr);