Remove obsolete 7th arg (opatts) from send_search_entry() calls.

Add missing arg (refs or ctrls) to send_ldap_result() calls.
NOTE: Did not implement referral/ldapcontrol support in back-tcl.

diff --git a/servers/slapd/back-tcl/tcl_add.c b/servers/slapd/back-tcl/tcl_add.c
index d341c22317b2a20aaad7f8143af88c05804e129a..f91bbc5f8c3edcb9d336151a19a0b46db1c7defe 100644 (file)
--- a/servers/slapd/back-tcl/tcl_add.c
+++ b/servers/slapd/back-tcl/tcl_add.c
@@ -1,6 +1,6 @@
 /* add.c - tcl add routine
  *
- * $Id: tcl_add.c,v 1.5.6.1 1999/07/09 18:02:59 kdz Exp $
+ * $Id: tcl_add.c,v 1.6 1999/07/16 00:45:52 kdz Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
@@ -31,7 +31,7 @@ tcl_back_add (
 
        if (ti->ti_add == NULL) {
                send_ldap_result (conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                       "add not implemented", NULL );
+                       "add not implemented", NULL, NULL );
                return (-1);
        }
 
@@ -63,7 +63,7 @@ tcl_back_add (
 
        if (err != LDAP_SUCCESS)
                send_ldap_result (conn, op, err, NULL,
-                       "internal backend error", NULL );
+                       "internal backend error", NULL, NULL );
 
        free (results);
        return (err);

diff --git a/servers/slapd/back-tcl/tcl_bind.c b/servers/slapd/back-tcl/tcl_bind.c
index 7326d129a1f0834f5edfbf70de80e6869c4fe9a2..697b741fc8d181ae692e0f6880155f3a9fab2a66 100644 (file)
--- a/servers/slapd/back-tcl/tcl_bind.c
+++ b/servers/slapd/back-tcl/tcl_bind.c
@@ -1,6 +1,6 @@
 /* bind.c - tcl bind routines
  *
- * $Id: tcl_bind.c,v 1.6.2.1 1999/07/09 18:02:59 kdz Exp $
+ * $Id: tcl_bind.c,v 1.7 1999/07/16 00:45:52 kdz Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
@@ -37,7 +37,7 @@ tcl_back_bind (
 
        if (ti->ti_bind == NULL) {
                send_ldap_result (conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                       "bind not implemented", NULL );
+                       "bind not implemented", NULL, NULL );
                return (-1);
        }
 
@@ -67,7 +67,7 @@ tcl_back_bind (
 
        if (err != LDAP_SUCCESS)
                send_ldap_result (conn, op, err, NULL,
-                       "internal backend error", NULL );
+                       "internal backend error", NULL, NULL );
 
        free (results);
        return (err);

diff --git a/servers/slapd/back-tcl/tcl_compare.c b/servers/slapd/back-tcl/tcl_compare.c
index 2982abe69d2b5949d4d2d7cc42e96f7341ed02b6..3184b5fa582e0ef631e174c0437f3550a1875f47 100644 (file)
--- a/servers/slapd/back-tcl/tcl_compare.c
+++ b/servers/slapd/back-tcl/tcl_compare.c
@@ -1,6 +1,6 @@
 /* compare.c - tcl compare routines
  *
- * $Id: tcl_compare.c,v 1.5.6.1 1999/07/09 18:02:59 kdz Exp $
+ * $Id: tcl_compare.c,v 1.6 1999/07/16 00:45:52 kdz Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
@@ -32,7 +32,7 @@ tcl_back_compare (
 
        if (ti->ti_compare == NULL) {
                send_ldap_result (conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                       "compare not implemented", NULL );
+                       "compare not implemented", NULL, NULL );
                return (-1);
        }
 
@@ -63,7 +63,7 @@ tcl_back_compare (
 
        if (err != LDAP_SUCCESS)
                send_ldap_result (conn, op, err, NULL,
-                       "internal backend error", NULL );
+                       "internal backend error", NULL, NULL );
 
        free (results);
        return (err);

diff --git a/servers/slapd/back-tcl/tcl_delete.c b/servers/slapd/back-tcl/tcl_delete.c
index 464292c720b671ada80aa7c67655dffbd1a17f12..d18234a0eadc5281dbf95c329dcd313aea35fbdb 100644 (file)
--- a/servers/slapd/back-tcl/tcl_delete.c
+++ b/servers/slapd/back-tcl/tcl_delete.c
@@ -1,6 +1,6 @@
 /* delete.c - tcl delete routines
  *
- * $Id: tcl_delete.c,v 1.5.6.1 1999/07/09 18:02:59 kdz Exp $
+ * $Id: tcl_delete.c,v 1.6 1999/07/16 00:45:52 kdz Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
@@ -30,7 +30,7 @@ tcl_back_delete (
 
        if (ti->ti_delete == NULL) {
                send_ldap_result (conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                       "delete not implemented", NULL );
+                       "delete not implemented", NULL, NULL );
                return (-1);
        }
 
@@ -59,7 +59,7 @@ tcl_back_delete (
 
        if (err != LDAP_SUCCESS)
                send_ldap_result (conn, op, err, NULL,
-                       "internal backend error", NULL );
+                       "internal backend error", NULL, NULL );
 
        free (results);
        return (err);

diff --git a/servers/slapd/back-tcl/tcl_modify.c b/servers/slapd/back-tcl/tcl_modify.c
index ac9a130c50f84e7a039b79718a0b71da3171b098..d82a4bbd2558fc58a72093965751ba4687977fbf 100644 (file)
--- a/servers/slapd/back-tcl/tcl_modify.c
+++ b/servers/slapd/back-tcl/tcl_modify.c
@@ -1,6 +1,6 @@
 /* modify.c - tcl modify routines
  *
- * $Id: tcl_modify.c,v 1.5.6.1 1999/07/09 18:02:59 kdz Exp $
+ * $Id: tcl_modify.c,v 1.6 1999/07/16 00:45:52 kdz Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
@@ -32,7 +32,7 @@ tcl_back_modify (
 
        if (ti->ti_modify == NULL) {
                send_ldap_result (conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                       "modify not implemented", NULL );
+                       "modify not implemented", NULL, NULL );
                return (-1);
        }
 
@@ -110,7 +110,7 @@ tcl_back_modify (
 
        if (err != LDAP_SUCCESS)
                send_ldap_result (conn, op, err, NULL,
-                       "internal backend error", NULL );
+                       "internal backend error", NULL, NULL );
 
        free (results);
        return (err);

diff --git a/servers/slapd/back-tcl/tcl_modrdn.c b/servers/slapd/back-tcl/tcl_modrdn.c
index ffe18f9bc464efa3726367c6ef0a5c09ef94d83c..3e2c2f7e4f103b4c81ec22518e6f9fb92788a7a5 100644 (file)
--- a/servers/slapd/back-tcl/tcl_modrdn.c
+++ b/servers/slapd/back-tcl/tcl_modrdn.c
@@ -1,6 +1,6 @@
 /* modrdn.c - tcl modify rdn routines
  *
- * $Id: tcl_modrdn.c,v 1.7.6.1 1999/07/09 18:02:59 kdz Exp $
+ * $Id: tcl_modrdn.c,v 1.8 1999/07/16 00:45:52 kdz Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
@@ -47,7 +47,7 @@ tcl_back_modrdn (
 
        if (ti->ti_modrdn == NULL) {
                send_ldap_result (conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                       "modrdn not implemented", NULL );
+                       "modrdn not implemented", NULL, NULL );
                return (-1);
        }
 
@@ -84,7 +84,7 @@ tcl_back_modrdn (
 
        if (err != LDAP_SUCCESS)
                send_ldap_result (conn, op, err, NULL,
-                       "internal backend error", NULL );
+                       "internal backend error", NULL, NULL );
 
        free (results);
        return (err);

diff --git a/servers/slapd/back-tcl/tcl_search.c b/servers/slapd/back-tcl/tcl_search.c
index 5058bdbc9a09a413f82f1c45af1d356fabc023bc..66d8663ed8856ba952f1582a9b2e5008d3fcd22c 100644 (file)
--- a/servers/slapd/back-tcl/tcl_search.c
+++ b/servers/slapd/back-tcl/tcl_search.c
@@ -1,6 +1,6 @@
 /* search.c - tcl search routines
  *
- * $Id: tcl_search.c,v 1.5.6.1 1999/07/09 18:02:59 kdz Exp $
+ * $Id: tcl_search.c,v 1.6 1999/07/16 00:45:52 kdz Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
@@ -40,7 +40,7 @@ tcl_back_search (
 
        if (ti->ti_search == NULL) {
                send_ldap_result (conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                       "search not implemented", NULL );
+                       "search not implemented", NULL, NULL );
                return (-1);
        }
 
@@ -80,7 +80,7 @@ tcl_back_search (
 
        if (err != LDAP_SUCCESS)
                send_ldap_result (conn, op, err, NULL,
-                       "internal backend error", NULL );
+                       "internal backend error", NULL, NULL );
 
        free (results);
        return (err);

diff --git a/servers/slapd/back-tcl/tcl_util.c b/servers/slapd/back-tcl/tcl_util.c
index 634009aa4bb6d2710e48897352cdd0ff4d46edfe..879c9c34f80ca2279b2badca4cdab5101cd5d0ae 100644 (file)
--- a/servers/slapd/back-tcl/tcl_util.c
+++ b/servers/slapd/back-tcl/tcl_util.c
@@ -1,6 +1,6 @@
 /* result.c - tcl backend utility functions
  *
- * $Id: tcl_util.c,v 1.6.2.2 1999/07/14 00:54:37 kdz Exp $
+ * $Id: tcl_util.c,v 1.7 1999/07/16 00:45:52 kdz Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
@@ -47,7 +47,7 @@ interp_send_results (
        if (code != TCL_OK) {
                argcPtr = 0;
                send_ldap_result (conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                       "internal backend error", NULL );
+                       "internal backend error", NULL, NULL );
                return -1;
        }
        for (i = 0; i < argcPtr; i++) {
@@ -80,7 +80,7 @@ interp_send_results (
                                        buf, 0, 0);
                        } else {
                                send_search_entry (be, conn, op, e, attrs,
-                                       attrsonly, 0, NULL );
+                                       attrsonly, NULL );
                                entry_free (e);
                        }
 
@@ -94,7 +94,7 @@ interp_send_results (
         * otherwise, front end will send this result 
         */
        if (err != 0 || op->o_tag != LDAP_REQ_BIND) {
-               send_ldap_result (conn, op, err, matched, info, NULL );
+               send_ldap_result (conn, op, err, matched, info, NULL, NULL );
        }
 
        free (buf);