X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=34e7406aa4dfba337f582b7325c38278b04ecb2f;hb=dc017c2fd1686d5a1bb5b04c45f11c69da60421a;hp=b1d14ef07b173bd82e1647cba523f6823ba403a3;hpb=f3fb9ca751f7bca28706c951df4ea9d22106c6a8;p=idzebra-moved-to-github.git

diff --git a/index/zserver.c b/index/zserver.c
index b1d14ef..34e7406 100644
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -4,7 +4,17 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.c,v $
- * Revision 1.58  1998-05-27 16:57:46  adam
+ * Revision 1.61  1998-06-24 12:16:15  adam
+ * Support for relations on text operands. Open range support in
+ * DFA module (i.e. [-j], [g-]).
+ *
+ * Revision 1.60  1998/06/22 11:36:49  adam
+ * Added authentication check facility to zebra.
+ *
+ * Revision 1.59  1998/06/12 12:22:13  adam
+ * Work on Zebra API.
+ *
+ * Revision 1.58  1998/05/27 16:57:46  adam
  * Zebra returns surrogate diagnostic for single records when
  * appropriate.
  *
@@ -235,6 +245,8 @@ bend_initresult *bend_init (bend_initrequest *q)
     bend_initresult *r = odr_malloc (q->stream, sizeof(*r));
     ZebraHandle zh;
     struct statserv_options_block *sob;
+    char *user = NULL;
+    char *passwd = NULL;
 
     r->errcode = 0;
     r->errstring = 0;
@@ -243,12 +255,34 @@ bend_initresult *bend_init (bend_initrequest *q)
     logf (LOG_DEBUG, "bend_init");
 
     sob = statserv_getcontrol ();
-    if (!(zh = zebra_open (NULL, sob->configname)))
+    if (!(zh = zebra_open (sob->configname)))
     {
 	logf (LOG_FATAL, "Failed to open Zebra `%s'", sob->configname);
 	r->errcode = 1;
 	return r;
     }
+    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);
+	}
+    }
+    if (zebra_auth (zh, user, passwd))
+    {
+	r->errcode = 222;
+	r->errstring = user;
+	zebra_close (zh);
+	return r;
+    }
     r->handle = zh;
     return r;
 }
@@ -356,7 +390,8 @@ int bend_sort (void *handle, bend_sort_rr *rr)
 {
     ZebraHandle zh = handle;
 
-    zebra_sort (zh, rr->stream, rr->num_input_setnames, rr->input_setnames,
+    zebra_sort (zh, rr->stream,
+                rr->num_input_setnames, (const char **) rr->input_setnames,
 		rr->output_setname, rr->sort_sequence, &rr->sort_status);
     rr->errcode = zh->errCode;
     rr->errstring = zh->errString;