Diff for /servers/slapd/back-ldap/chain.c between versions 1.69 and 1.70

version 1.69, 2008/01/07 23:20:11 version 1.70, 2008/10/12 18:20:46
Line 1 Line 1
 /* chain.c - chain LDAP operations */  /* chain.c - chain LDAP operations */
 /* $OpenLDAP: pkg/ldap/servers/slapd/back-ldap/chain.c,v 1.68 2007/09/14 21:58:00 ando Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/back-ldap/chain.c,v 1.69 2008/01/07 23:20:11 kurt Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *   *
  * Copyright 2003-2008 The OpenLDAP Foundation.   * Copyright 2003-2008 The OpenLDAP Foundation.
Line 63  typedef enum { Line 63  typedef enum {
         LDAP_CH_RES,          LDAP_CH_RES,
         LDAP_CH_ERR          LDAP_CH_ERR
 } ldap_chain_status_t;  } ldap_chain_status_t;
   
 static BackendInfo      *lback;  static BackendInfo      *lback;
   
 typedef struct ldap_chain_t {  typedef struct ldap_chain_t {
Line 1096  static ConfigOCs chainocs[] = { Line 1097  static ConfigOCs chainocs[] = {
                 "NAME 'olcChainDatabase' "                  "NAME 'olcChainDatabase' "
                 "DESC 'Chain remote server configuration' "                  "DESC 'Chain remote server configuration' "
                 "AUXILIARY )",                  "AUXILIARY )",
                 Cft_Misc, chaincfg, chain_ldadd },                  Cft_Misc, olcDatabaseDummy, chain_ldadd },
         { NULL, 0, NULL }          { NULL, 0, NULL }
 };  };
   
Line 1187  chain_ldadd( CfEntryInfo *p, Entry *e, C Line 1188  chain_ldadd( CfEntryInfo *p, Entry *e, C
                 }                  }
         }          }
   
           ca->ca_private = on;
   
 done:;  done:;
         if ( rc != LDAP_SUCCESS ) {          if ( rc != LDAP_SUCCESS ) {
                 (void)ldap_chain_db_destroy_one( ca->be, NULL );                  (void)ldap_chain_db_destroy_one( ca->be, NULL );
Line 1510  ldap_chain_db_init( Line 1513  ldap_chain_db_init(
         ldap_chain_t    *lc = NULL;          ldap_chain_t    *lc = NULL;
   
         if ( lback == NULL ) {          if ( lback == NULL ) {
                 static BackendInfo      lback2;  
   
                 lback = backend_info( "ldap" );                  lback = backend_info( "ldap" );
   
                 if ( lback == NULL ) {                  if ( lback == NULL ) {
                         return 1;                          return 1;
                 }                  }
   
                 lback2 = *lback;  
                 lback2.bi_type = ldapchain.on_bi.bi_type;  
                 lback = &lback2;  
         }          }
   
         lc = ch_malloc( sizeof( ldap_chain_t ) );          lc = ch_malloc( sizeof( ldap_chain_t ) );
Line 2062  ldap_chain_parse_ctrl( Line 2059  ldap_chain_parse_ctrl(
 int  int
 chain_initialize( void )  chain_initialize( void )
 {  {
         int     rc;          int rc;
           const char *text;
   
         /* Make sure we don't exceed the bits reserved for userland */          /* Make sure we don't exceed the bits reserved for userland */
         config_check_userland( CH_LAST );          config_check_userland( CH_LAST );

Removed from v.1.69  
changed lines
  Added in v.1.70


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org