Branch: Tag:

2005-11-14

2005-11-14 09:08:08 by Martin Stjernholm <mast@lysator.liu.se>

Map either Protocols.LDAP or _NewLDAP to NewLDAP, depending on pike
version.

Rev: server/base_server/roxen.pike:1.906

6:   // Per Hedbor, Henrik Grubbström, Pontus Hagland, David Hedbor and others.   // ABS and suicide systems contributed freely by Francesco Chemolli    - constant cvs_version="$Id: roxen.pike,v 1.905 2005/10/07 09:32:30 anders Exp $"; + constant cvs_version="$Id: roxen.pike,v 1.906 2005/11/14 09:08:08 mast Exp $";      //! @appears roxen   //!
2147:   {    if( what == "*" || lower_case(what) == "any" )    return ({ 0, - #if constant(__ROXEN_SUPPORTS_IPV6__) + #if 0 && constant(__ROXEN_SUPPORTS_IPV6__)    "::",   #endif /* __ROXEN_SUPPORTS_IPV6__ */    }); // ANY
2362:    // There is now no need to check for both open_ports[prot][0] and    // open_ports[prot][0][port], we can go directly to the latter    // test. -  m = open_ports[ protocol ] = ([ 0:([]), "::":([]) ]); +  m = open_ports[ protocol ] = ([ 0:([]), /* "::":([]) */ ]);       if (prot->supports_ipless ) {    // Check if the ANY port is already open for this port, since this
2376:    // We have a non-ANY IPv4 IP number.    ipv4 = ({ 0 });    } - #if constant(__ROXEN_SUPPORTS_IPV6__) + #if 0 && constant(__ROXEN_SUPPORTS_IPV6__)    if (m["::"][port] && sizeof(ipv6 - ({ "::" }))) {    // We have a non-ANY IPv6 IP number.    ipv6 = ({ "::" });
4137:       // for module encoding stuff    + #if constant (Protocols.LDAP.FilterError) +  // Pike 7.7 or later - we use the native LDAP module and link the +  // migration alias NewLDAP to it. +  add_constant ("NewLDAP", Protocols.LDAP); + #else +  // Older pike - use our own LDAP protocol as NewLDAP. +  add_constant ("NewLDAP", _NewLDAP); + #endif +     add_constant( "CFUserDBModule",config_userdb_module );       //add_constant( "ArgCache", ArgCache );