X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=4cfeb3a5180565b74a7dbd9380b9917f801b5c5e;hb=92bb4bdb37873f21cabe7b045e1a593ab648ae55;hp=193e6d91bddc31db249fe29591af480578d55a46;hpb=da822637709558b602b796afed937ef434209749;p=idzebra-moved-to-github.git

diff --git a/index/zserver.c b/index/zserver.c
index 193e6d9..4cfeb3a 100644
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -4,7 +4,18 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.c,v $
- * Revision 1.69  1999-06-10 09:20:03  adam
+ * Revision 1.72  1999-10-29 10:01:54  adam
+ * Minor fix in bend_init where handle wasn't set to NULL when
+ * zebra_init fails.
+ *
+ * Revision 1.71  1999/07/14 10:59:26  adam
+ * Changed functions isc_getmethod, isams_getmethod.
+ * Improved fatal error handling (such as missing EXPLAIN schema).
+ *
+ * Revision 1.70  1999/06/10 12:14:56  adam
+ * Fixed to use bend_start instead of pre_init.
+ *
+ * Revision 1.69  1999/06/10 09:20:03  adam
  * Minor change to pre_init handler.
  *
  * Revision 1.68  1999/05/26 07:49:13  adam
@@ -260,7 +271,6 @@
 #endif
 
 #include <data1.h>
-#include <dmalloc.h>
 
 #include "zserver.h"
 
@@ -282,6 +292,7 @@ bend_initresult *bend_init (bend_initrequest *q)
     char *user = NULL;
     char *passwd = NULL;
 
+    r->handle = 0;
     r->errcode = 0;
     r->errstring = 0;
     q->bend_sort = bend_sort;
@@ -436,7 +447,7 @@ int bend_sort (void *handle, bend_sort_rr *rr)
 }
 
 #ifndef WIN32
-static void pre_init (struct statserv_options_block *sob)
+static void bend_start (struct statserv_options_block *sob)
 {
     if (!sob->inetd) 
     {
@@ -463,7 +474,7 @@ int main (int argc, char **argv)
     sob = statserv_getcontrol ();
     strcpy (sob->configname, FNAME_CONFIG);
 #ifndef WIN32
-    sob->pre_init = pre_init;
+    sob->bend_start = bend_start;
 #endif
     statserv_setcontrol (sob);