Remove cldap cruft

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 7ccce7fd77c3645abf4c3adcd63108434be07c83..415ad86979ca76cf1adf9255a5201e401701a77d 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -99,9 +99,6 @@ usage( char *name )
        fprintf( stderr,
                "usage: %s options\n", name );
        fprintf( stderr,
-#if LDAP_CONNECTIONLESS
-               "\t-c\t\tEnable (experimental) Connectionless LDAP\n"
-#endif
                "\t-d level\tDebug Level" "\n"
                "\t-f filename\tConfiguration File\n"
 #if defined(HAVE_SETUID) && defined(HAVE_SETGID)
@@ -217,9 +214,6 @@ int main( int argc, char **argv )
 #endif
 #if defined(HAVE_SETUID) && defined(HAVE_SETGID)
                             "u:g:"
-#endif
-#ifdef LDAP_CONNECTIONLESS
-                                "c"
 #endif
                             )) != EOF ) {
                switch ( i ) {
@@ -254,14 +248,6 @@ int main( int argc, char **argv )
                        break;
 #endif
 
-#ifdef LDAP_CONNECTIONLESS
-               case 'c':       /* do connectionless (udp) */
-                       /* udp = 1; */
-                       fprintf( stderr, "connectionless support not supported");
-                       exit( EXIT_FAILURE );
-                       break;
-#endif
-
 #ifdef SLAPD_BDB2
                case 't':  /* timed server */
                        serverMode |= SLAP_TIMED_MODE;

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index d6c3bd4b52cee69619b284e5d7f52f0d0e34add9..b22b235ec18f0cb5f7768bcec8816aab6ec7db73 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -274,12 +274,6 @@ send_ldap_response(
                return;
        }
 
-#ifdef LDAP_CONNECTIONLESS
-       if ( op->o_cldap ) {
-               rc = ber_printf( ber, "{is{t{essN}N}N}", msgid, "", tag,
-                   err, matched ? matched : "", text ? text : "" );
-       } else
-#endif
        {
                rc = ber_printf( ber, "{it{ess",
                        msgid, tag, err,
@@ -375,18 +369,6 @@ send_ldap_disconnect(
                msgid = 0;
        }
 
-#ifdef LDAP_CONNECTIONLESS
-       if ( op->o_cldap ) {
-               ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_UDP_SET_DST,
-                   (void *)&op->o_clientaddr );
-               Debug( LDAP_DEBUG_TRACE, "UDP response to %s port %d\n", 
-                   inet_ntoa(((struct sockaddr_in *)
-                   &op->o_clientaddr)->sin_addr ),
-                   ((struct sockaddr_in *) &op->o_clientaddr)->sin_port,
-                   0 );
-       }
-#endif
-
        send_ldap_response( conn, op, tag, msgid,
                err, NULL, text, NULL,
                reqoid, NULL, NULL, NULL );
@@ -447,18 +429,6 @@ send_ldap_result(
        tag = req2res( op->o_tag );
        msgid = (tag != LBER_SEQUENCE) ? op->o_msgid : 0;
 
-#ifdef LDAP_CONNECTIONLESS
-       if ( op->o_cldap ) {
-               ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_UDP_SET_DST,
-                   (void *)&op->o_clientaddr );
-               Debug( LDAP_DEBUG_TRACE, "UDP response to %s port %d\n", 
-                   inet_ntoa(((struct sockaddr_in *)
-                   &op->o_clientaddr)->sin_addr ),
-                   ((struct sockaddr_in *) &op->o_clientaddr)->sin_port,
-                   0 );
-       }
-#endif
-
        send_ldap_response( conn, op, tag, msgid,
                err, matched, text, ref,
                NULL, NULL, NULL, ctrls );
@@ -494,18 +464,6 @@ send_ldap_sasl(
        tag = req2res( op->o_tag );
        msgid = (tag != LBER_SEQUENCE) ? op->o_msgid : 0;
 
-#ifdef LDAP_CONNECTIONLESS
-       if ( op->o_cldap ) {
-               ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_UDP_SET_DST,
-                   (void *)&op->o_clientaddr );
-               Debug( LDAP_DEBUG_TRACE, "UDP response to %s port %d\n", 
-                   inet_ntoa(((struct sockaddr_in *)
-                   &op->o_clientaddr)->sin_addr ),
-                   ((struct sockaddr_in *) &op->o_clientaddr)->sin_port,
-                   0 );
-       }
-#endif
-
        send_ldap_response( conn, op, tag, msgid,
                err, matched, text, ref,
                NULL, NULL, cred, ctrls  );
@@ -536,18 +494,6 @@ send_ldap_extended(
        tag = req2res( op->o_tag );
        msgid = (tag != LBER_SEQUENCE) ? op->o_msgid : 0;
 
-#ifdef LDAP_CONNECTIONLESS
-       if ( op->o_cldap ) {
-               ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_UDP_SET_DST,
-                   (void *)&op->o_clientaddr );
-               Debug( LDAP_DEBUG_TRACE, "UDP response to %s port %d\n", 
-                   inet_ntoa(((struct sockaddr_in *)
-                   &op->o_clientaddr)->sin_addr ),
-                   ((struct sockaddr_in *) &op->o_clientaddr)->sin_port,
-                   0 );
-       }
-#endif
-
        send_ldap_response( conn, op, tag, msgid,
                err, matched, text, refs,
                rspoid, rspdata, NULL, ctrls );
@@ -600,18 +546,6 @@ send_search_result(
        tag = req2res( op->o_tag );
        msgid = (tag != LBER_SEQUENCE) ? op->o_msgid : 0;
 
-#ifdef LDAP_CONNECTIONLESS
-       if ( op->o_cldap ) {
-               ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_UDP_SET_DST,
-                   (void *)&op->o_clientaddr );
-               Debug( LDAP_DEBUG_TRACE, "UDP response to %s port %d\n", 
-                   inet_ntoa(((struct sockaddr_in *)
-                   &op->o_clientaddr)->sin_addr ),
-                   ((struct sockaddr_in *) &op->o_clientaddr)->sin_port,
-                   0 );
-       }
-#endif
-
        send_ldap_response( conn, op, tag, msgid,
                err, matched, text, refs,
                NULL, NULL, NULL, ctrls );

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index d85493a321b911b448eac6d64c9caaebe18a266a..48e1b5d99b7a258288927d46fafa1ae1aba24a3d 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1013,12 +1013,6 @@ typedef struct slap_op {
 
        unsigned long   o_connid; /* id of conn initiating this op  */
 
-#ifdef LDAP_CONNECTIONLESS
-       int             o_cldap;        /* != 0 if this came in via CLDAP */
-       struct sockaddr o_clientaddr;   /* client address if via CLDAP    */
-       char            o_searchbase;   /* search base if via CLDAP       */
-#endif
-
        ldap_pvt_thread_mutex_t o_abandonmutex; /* protects o_abandon  */
        int             o_abandon;      /* abandon flag */