Fix IRIX sc_mask conflict

[openldap] / servers / slapd / unbind.c

diff --git a/servers/slapd/unbind.c b/servers/slapd/unbind.c
index 500006c34f0a76218346a570a99fb6d992198863..c4c4f18542368b2dd8a69e9da4827b9c4e21db87 100644 (file)
--- a/servers/slapd/unbind.c
+++ b/servers/slapd/unbind.c
@@ -1,4 +1,9 @@
 /* unbind.c - decode an ldap unbind operation and pass it to a backend db */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
@@ -13,24 +18,27 @@
  *
  */
 
+#include "portable.h"
+
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include "slap.h"
 
-extern Backend *select_backend();
-extern void      be_unbind();
+#include <ac/socket.h>
 
-extern char            *default_referral;
-extern pthread_mutex_t new_conn_mutex;
+#include "slap.h"
 
-void
+int
 do_unbind(
     Connection *conn,
     Operation  *op
 )
 {
+#ifdef NEW_LOGGING
+       LDAP_LOG( OPERATION, ENTRY, 
+               "do_unbind: conn %d\n", conn ? conn->c_connid : -1, 0, 0 );
+#else
        Debug( LDAP_DEBUG_TRACE, "do_unbind\n", 0, 0, 0 );
+#endif
+
 
        /*
         * Parse the unbind request.  It looks like this:
@@ -38,12 +46,11 @@ do_unbind(
         *      UnBindRequest ::= NULL
         */
 
-       Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d UNBIND\n", conn->c_connid,
+       Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu UNBIND\n", op->o_connid,
            op->o_opid, 0, 0, 0 );
 
        /* pass the unbind to all backends */
-       be_unbind( conn, op );
-       
-       /* close the connection to the client */
-       close_connection( conn, op->o_connid, op->o_opid );
+       backend_unbind( conn, op );
+
+       return 0;
 }