Commit 7087a8f5 authored by Jong Hyuk Choi's avatar Jong Hyuk Choi
Browse files

ITS#2618 fix

parent a231098e
......@@ -328,7 +328,7 @@ do_add( Operation *op, SlapReply *rs )
#ifdef LDAP_SYNCREPL
if ( op->o_bd->syncinfo ) {
defref = op->o_bd->syncinfo->masteruri;
defref = op->o_bd->syncinfo->masteruri_bv;
} else
#endif
{
......
......@@ -2854,6 +2854,10 @@ parse_syncrepl_line(
sizeof( PROVIDERSTR ) - 1 )) {
val = cargv[ i ] + sizeof( PROVIDERSTR );
si->masteruri = ch_strdup( val );
si->masteruri_bv = (BerVarray) ch_calloc( 2, sizeof( struct berval ));
ber_str2bv( si->masteruri, strlen( si->masteruri ), 0, &si->masteruri_bv[0] );
si->masteruri_bv[1].bv_len = 0;
si->masteruri_bv[1].bv_val = NULL;
gots |= GOT_HOST;
} else if ( !strncasecmp( cargv[ i ], STARTTLSSTR,
sizeof(STARTTLSSTR) - 1 ) )
......
......@@ -211,7 +211,7 @@ do_delete(
BerVarray defref = NULL;
#ifdef LDAP_SYNCREPL
if ( op->o_bd->syncinfo ) {
defref = op->o_bd->syncinfo->masteruri;
defref = op->o_bd->syncinfo->masteruri_bv;
} else
#endif
{
......
......@@ -448,7 +448,7 @@ do_modify(
BerVarray defref = NULL;
#ifdef LDAP_SYNCREPL
if ( op->o_bd->syncinfo ) {
defref = op->o_bd->syncinfo->masteruri;
defref = op->o_bd->syncinfo->masteruri_bv;
} else
#endif
{
......
......@@ -375,7 +375,7 @@ do_modrdn(
BerVarray defref = NULL;
#ifdef LDAP_SYNCREPL
if ( op->o_bd->syncinfo ) {
defref = op->o_bd->syncinfo->masteruri;
defref = op->o_bd->syncinfo->masteruri_bv;
} else
#endif
{
......
......@@ -59,7 +59,7 @@ int passwd_extop(
BerVarray defref = NULL;
#ifdef LDAP_SYNCREPL
if ( op->o_bd->syncinfo ) {
defref = op->o_bd->syncinfo->masteruri;
defref = op->o_bd->syncinfo->masteruri_bv;
} else
#endif
{
......
......@@ -1298,44 +1298,45 @@ typedef struct syncinfo_s {
struct slap_conn *conn;
struct slap_backend_db *be;
struct slap_entry *e;
void *ctx;
int id;
char *masteruri;
int type;
void *ctx;
int id;
char *masteruri;
BerVarray masteruri_bv;
int type;
struct berval updatedn;
char *binddn;
int bindmethod;
char *passwd;
char *secprops;
char *realm;
char *authcId;
char *authzId;
char *srvtab;
char *saslmech;
char *binddn;
int bindmethod;
char *passwd;
char *secprops;
char *realm;
char *authcId;
char *authzId;
char *srvtab;
char *saslmech;
time_t interval;
char *base;
int scope;
int deref;
int slimit;
char *base;
int scope;
int deref;
int slimit;
int tlimit;
Filter *filter;
char *filterstr;
char **attrs;
int attrsonly;
Filter *filter;
char *filterstr;
char **attrs;
int attrsonly;
#define LASTMOD_REQ 0
#define LASTMOD_GEN 1
#define LASTMOD_NO 2
int lastmod;
int lastmod;
/* TLS flags */
#define TLS_OFF 0
#define TLS_ON 1
#define TLS_CRITICAL 2
int tls;
int found;
struct berval *syncUUID;
#define TLS_OFF 0
#define TLS_ON 1
#define TLS_CRITICAL 2
int tls;
int found;
struct berval *syncUUID;
struct berval *syncUUID_ndn;
struct berval *syncCookie;
Avlnode *presentlist;
struct berval *syncCookie;
Avlnode *presentlist;
LDAP_LIST_HEAD(np, nonpresent_entry) nonpresentlist;
} syncinfo_t;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment