Update of back-bdb2 to KDZ's new entry lock schema.

[openldap] / servers / slapd / back-shell / unbind.c

diff --git a/servers/slapd/back-shell/unbind.c b/servers/slapd/back-shell/unbind.c
index df836f3e8f0143a782cf7fde5ebe5d703d977ce8..6e8d1009c1bc4c8c1520d91dbdeed7c23b9c2492 100644 (file)
--- a/servers/slapd/back-shell/unbind.c
+++ b/servers/slapd/back-shell/unbind.c
@@ -3,20 +3,18 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+
+#include <ac/socket.h>
+#include <ac/string.h>
+
 #include "slap.h"
 #include "shell.h"
 
-void
+int
 shell_back_unbind(
     Backend            *be,
     Connection         *conn,
-    Operation          *op,
-    char               *dn,
-    int                        method,
-    struct berval      *cred
+    Operation          *op
 )
 {
        struct shellinfo        *si = (struct shellinfo *) be->be_private;
@@ -25,23 +23,25 @@ shell_back_unbind(
        if ( si->si_unbind == NULL ) {
                send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
                    "unbind not implemented" );
-               return;
+               return 0;
        }
 
-       if ( (op->o_private = forkandexec( si->si_unbind, &rfp, &wfp ))
-           == -1 ) {
+       if ( (op->o_private = (void *) forkandexec( si->si_unbind, &rfp, &wfp ))
+           == (void *) -1 ) {
                send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
                    "could not fork/exec" );
-               return;
+               return 0;
        }
 
        /* write out the request to the unbind process */
        fprintf( wfp, "UNBIND\n" );
-       fprintf( wfp, "msgid: %d\n", op->o_msgid );
+       fprintf( wfp, "msgid: %ld\n", op->o_msgid );
        print_suffixes( wfp, be );
-       fprintf( wfp, "dn: %s\n", dn );
+       fprintf( wfp, "dn: %s\n", (conn->c_dn ? conn->c_dn : "") );
        fclose( wfp );
 
        /* no response to unbind */
        fclose( rfp );
+
+       return 0;
 }