/* strings found in replog/LDIF entries (mostly lifted from slurpd/slurp.h) */
#define T_VERSION_STR "version"
#define T_REPLICA_STR "replica"
-#define T_DN_STR "dn"
+#define T_DN_STR "dn"
#define T_CONTROL_STR "control"
-#define T_CHANGETYPESTR "changetype"
-#define T_ADDCTSTR "add"
+#define T_CHANGETYPESTR "changetype"
+#define T_ADDCTSTR "add"
#define T_MODIFYCTSTR "modify"
#define T_DELETECTSTR "delete"
#define T_MODRDNCTSTR "modrdn"
#define T_MODOPREPLACESTR "replace"
#define T_MODOPDELETESTR "delete"
#define T_MODOPINCREMENTSTR "increment"
-#define T_MODSEPSTR "-"
-#define T_NEWRDNSTR "newrdn"
+#define T_MODSEPSTR "-"
+#define T_NEWRDNSTR "newrdn"
#define T_DELETEOLDRDNSTR "deleteoldrdn"
-#define T_NEWSUPSTR "newsuperior"
+#define T_NEWSUPSTR "newsuperior"
static int process_ldif_rec LDAP_P(( char *rbuf, int count ));
static int domodify LDAP_P((
const char *dn,
LDAPMod **pmods,
- LDAPControl **pctrls,
+ LDAPControl **pctrls,
int newentry ));
static int dodelete LDAP_P((
const char *dn,
- LDAPControl **pctrls ));
+ LDAPControl **pctrls ));
static int dorename LDAP_P((
const char *dn,
const char *newrdn,
const char *newsup,
int deleteoldrdn,
- LDAPControl **pctrls ));
+ LDAPControl **pctrls ));
static char *read_one_record LDAP_P(( FILE *fp ));
+#ifdef LDAP_GROUP_TRANSACTION
+static int txn = 0;
+static int txnabort = 0;
+#endif
+
void
usage( void )
{
- fprintf( stderr, _("Add or modify entries from an LDAP server\n\n"));
- fprintf( stderr, _("usage: %s [options]\n"), prog);
- fprintf( stderr, _(" The list of desired operations are read from stdin or from the file\n"));
- fprintf( stderr, _(" specified by \"-f file\".\n"));
- fprintf( stderr, _("Add or modify options:\n"));
- fprintf( stderr, _(" -a add values (%s)\n"),
+ fprintf( stderr, _("Add or modify entries from an LDAP server\n\n"));
+ fprintf( stderr, _("usage: %s [options]\n"), prog);
+ fprintf( stderr, _(" The list of desired operations are read from stdin"
+ " or from the file\n"));
+ fprintf( stderr, _(" specified by \"-f file\".\n"));
+ fprintf( stderr, _("Add or modify options:\n"));
+ fprintf( stderr, _(" -a add values (%s)\n"),
(ldapadd ? _("default") : _("default is to replace")));
- fprintf( stderr, _(" -F force all changes records to be used\n"));
- fprintf( stderr, _(" -S file write skipped modifications to `file'\n"));
- tool_common_usage();
- exit( EXIT_FAILURE );
+ fprintf( stderr, _(" -E [!]ext=extparam modify extensions"
+ " (! indicate s criticality)\n"));
+#ifdef LDAP_GROUP_TRANSACTION
+ fprintf( stderr,
+ _(" [!]txn (transaction)\n"));
+#endif
+ fprintf( stderr, _(" -F force all changes records to be used\n"));
+ fprintf( stderr, _(" -S file write skipped modifications to `file'\n"));
+
+ tool_common_usage();
+ exit( EXIT_FAILURE );
}
-const char options[] = "aFrS:"
+const char options[] = "aE:FrS:"
"cd:D:e:f:h:H:IkKMnO:p:P:QR:U:vVw:WxX:y:Y:Z";
int
handle_private_option( int i )
{
+ char *control, *cvalue;
+ int crit;
+
switch ( i ) {
-#if 0
- char *control, *cvalue;
- int crit;
case 'E': /* modify extensions */
if( protocol == LDAP_VERSION2 ) {
fprintf( stderr, _("%s: -E incompatible with LDAPv%d\n"),
*cvalue++ = '\0';
}
- fprintf( stderr, _("Invalid modify extension name: %s\n"), control );
- usage();
+#ifdef LDAP_GROUP_TRANSACTION
+ if( strcasecmp( control, "txn" ) == 0 ) {
+ /* Transaction */
+ if( txn ) {
+ fprintf( stderr,
+ _("txn control previously specified\n"));
+ exit( EXIT_FAILURE );
+ }
+ if( cvalue != NULL ) {
+ if( strcasecmp( cvalue, "abort" ) == 0 ) {
+ txnabort=1;
+ } else if( strcasecmp( cvalue, "commit" ) != 0 ) {
+ fprintf( stderr, _("Invalid value for txn control, %s\n"),
+ cvalue );
+ exit( EXIT_FAILURE );
+ }
+ }
+
+ txn = 1 + crit;
+ } else
#endif
+ {
+ fprintf( stderr, _("Invalid modify extension name: %s\n"),
+ control );
+ usage();
+ }
case 'a': /* add */
- ldapadd = 1;
- break;
+ ldapadd = 1;
+ break;
case 'F': /* force all changes records to be used */
- force = 1;
- break;
+ force = 1;
+ break;
case 'r': /* replace (obsolete) */
break;
int
main( int argc, char **argv )
{
+#ifdef LDAP_GROUP_TRANSACTION
+ BerElement *txnber;
+ struct berval txnCookie = { 0, NULL };
+#endif
char *rbuf, *start, *rejbuf = NULL;
FILE *fp, *rejfp;
char *matched_msg, *error_msg;
tool_bind( ld );
}
- rc = 0;
+#ifdef LDAP_GROUP_TRANSACTION
+ if( txn ) {
+ struct berval *txnCookiep = &txnCookie;
+
+ /* create transaction */
+ rc = ldap_txn_create_s( ld, &txnCookiep, NULL, NULL );
+ if( rc != LDAP_SUCCESS ) {
+ ldap_perror( ld, "ldap_txn_create_s" );
+ if( txn > 2 ) return EXIT_FAILURE;
+ txn = 0;
+ }
+ }
+#endif
+
+ if ( assertion || authzid || manageDSAit || noop || preread || postread
+#ifdef LDAP_GROUP_TRANSACTION
+ || txn
+#endif
+ )
+ {
+ int err;
+ int i;
+ LDAPControl c[1];
+
+#ifdef LDAP_GROUP_TRANSACTION
+ if( txn ) {
+ txnber = ber_alloc_t( LBER_USE_DER );
+ if( txnber == NULL ) return EXIT_FAILURE;
+
+ err = ber_printf( txnber, "{o}", &txnCookie );
+ if( err == -1 ) {
+ ber_free( txnber, 1 );
+ fprintf( stderr, _("txn grouping control encoding error!\n") );
+ return EXIT_FAILURE;
+ }
+
+ err = ber_flatten2( txnber, &c[i].ldctl_value, 0 );
+ if( err == -1 ) return EXIT_FAILURE;
+
+ c[i].ldctl_oid = LDAP_CONTROL_GROUPING;
+ c[i].ldctl_iscritical = 1;
+ i++;
+ }
+#endif
- if ( assertion || authzid || manageDSAit || noop || preread || postread ) {
- tool_server_controls( ld, NULL, 0 );
+ tool_server_controls( ld, c, i );
}
+ rc = 0;
count = 0;
retval = 0;
while (( rc == 0 || contoper ) &&
free( rbuf );
}
+#ifdef LDAP_GROUP_TRANSACTION
+ if( txn ) {
+ /* create transaction */
+ rc = ldap_txn_end_s( ld, &txnCookie, !txnabort, NULL, NULL );
+ if( rc != LDAP_SUCCESS ) {
+ ldap_perror( ld, "ldap_txn_create_s" );
+ if( txn > 2 ) return EXIT_FAILURE;
+ txn = 0;
+ }
+ }
+#endif
+
if ( !not ) {
ldap_unbind_ext( ld, NULL, NULL );
}
static int
process_ldif_rec( char *rbuf, int count )
{
- char *line, *dn, *type, *newrdn, *newsup, *p;
- int rc, linenum, modop, replicaport;
- int expect_modop, expect_sep, expect_ct, expect_newrdn, expect_newsup;
- int expect_deleteoldrdn, deleteoldrdn;
- int saw_replica, use_record, new_entry, delete_entry, got_all;
- LDAPMod **pmods;
+ char *line, *dn, *type, *newrdn, *newsup, *p;
+ int rc, linenum, modop, replicaport;
+ int expect_modop, expect_sep, expect_ct, expect_newrdn, expect_newsup;
+ int expect_deleteoldrdn, deleteoldrdn;
+ int saw_replica, use_record, new_entry, delete_entry, got_all;
+ LDAPMod **pmods;
int version;
struct berval val;
- LDAPControl **pctrls;
+ LDAPControl **pctrls;
- new_entry = ldapadd;
+ new_entry = ldapadd;
- rc = got_all = saw_replica = delete_entry = modop = expect_modop = 0;
- expect_deleteoldrdn = expect_newrdn = expect_newsup = 0;
+ rc = got_all = saw_replica = delete_entry = modop = expect_modop = 0;
+ expect_deleteoldrdn = expect_newrdn = expect_newsup = 0;
expect_sep = expect_ct = 0;
- linenum = 0;
+ linenum = 0;
version = 0;
- deleteoldrdn = 1;
- use_record = force;
- pmods = NULL;
- pctrls = NULL;
- dn = newrdn = newsup = NULL;
-
- while ( rc == 0 && ( line = ldif_getline( &rbuf )) != NULL ) {
- ++linenum;
-
- if ( expect_sep && strcasecmp( line, T_MODSEPSTR ) == 0 ) {
- expect_sep = 0;
- expect_ct = 1;
- continue;
- }
+ deleteoldrdn = 1;
+ use_record = force;
+ pmods = NULL;
+ pctrls = NULL;
+ dn = newrdn = newsup = NULL;
+
+ while ( rc == 0 && ( line = ldif_getline( &rbuf )) != NULL ) {
+ ++linenum;
+
+ if ( expect_sep && strcasecmp( line, T_MODSEPSTR ) == 0 ) {
+ expect_sep = 0;
+ expect_ct = 1;
+ continue;
+ }
- if ( ldif_parse_line( line, &type, &val.bv_val, &val.bv_len ) < 0 ) {
- fprintf( stderr, _("%s: invalid format (line %d) entry: \"%s\"\n"),
- prog, linenum, dn == NULL ? "" : dn );
- rc = LDAP_PARAM_ERROR;
- break;
- }
-
- if ( dn == NULL ) {
- if ( !use_record && strcasecmp( type, T_REPLICA_STR ) == 0 ) {
- ++saw_replica;
- if (( p = strchr( val.bv_val, ':' )) == NULL ) {
- replicaport = 0;
- } else {
- *p++ = '\0';
- replicaport = atoi( p );
+ if ( ldif_parse_line( line, &type, &val.bv_val, &val.bv_len ) < 0 ) {
+ fprintf( stderr, _("%s: invalid format (line %d) entry: \"%s\"\n"),
+ prog, linenum, dn == NULL ? "" : dn );
+ rc = LDAP_PARAM_ERROR;
+ break;
}
- if ( ldaphost != NULL && strcasecmp( val.bv_val, ldaphost ) == 0 &&
- replicaport == ldapport ) {
- use_record = 1;
+
+ if ( dn == NULL ) {
+ if ( !use_record && strcasecmp( type, T_REPLICA_STR ) == 0 ) {
+ ++saw_replica;
+ if (( p = strchr( val.bv_val, ':' )) == NULL ) {
+ replicaport = 0;
+ } else {
+ *p++ = '\0';
+ replicaport = atoi( p );
+ }
+ if ( ldaphost != NULL &&
+ strcasecmp( val.bv_val, ldaphost ) == 0 &&
+ replicaport == ldapport )
+ {
+ use_record = 1;
+ }
+ } else if ( count == 1 && linenum == 1 &&
+ strcasecmp( type, T_VERSION_STR ) == 0 )
+ {
+ if( val.bv_len == 0 || atoi(val.bv_val) != 1 ) {
+ fprintf( stderr,
+ _("%s: invalid version %s, line %d (ignored)\n"),
+ prog, val.bv_val, linenum );
+ }
+ version++;
+
+ } else if ( strcasecmp( type, T_DN_STR ) == 0 ) {
+ if (( dn = ber_strdup( val.bv_val )) == NULL ) {
+ perror( "strdup" );
+ exit( EXIT_FAILURE );
+ }
+ expect_ct = 1;
+ }
+ goto end_line; /* skip all lines until we see "dn:" */
}
- } else if ( count == 1 && linenum == 1 &&
- strcasecmp( type, T_VERSION_STR ) == 0 )
- {
- if( val.bv_len == 0 || atoi(val.bv_val) != 1 ) {
- fprintf( stderr, _("%s: invalid version %s, line %d (ignored)\n"),
- prog, val.bv_val, linenum );
+
+ if ( expect_ct ) {
+ /* Check for "control" tag after dn and before changetype. */
+ if (strcasecmp(type, T_CONTROL_STR) == 0) {
+ /* Parse and add it to the list of controls */
+ rc = parse_ldif_control( line, &pctrls );
+ if (rc != 0) {
+ fprintf( stderr,
+ _("%s: Error processing %s line, line %d: %s\n"),
+ prog, T_CONTROL_STR, linenum, ldap_err2string(rc) );
+ }
+ goto end_line;
}
- version++;
-
- } else if ( strcasecmp( type, T_DN_STR ) == 0 ) {
- if (( dn = ber_strdup( val.bv_val )) == NULL ) {
- perror( "strdup" );
- exit( EXIT_FAILURE );
- }
- expect_ct = 1;
- }
- goto end_line; /* skip all lines until we see "dn:" */
- }
-
- if ( expect_ct ) {
-
- /* Check for "control" tag after dn and before changetype. */
- if (strcasecmp(type, T_CONTROL_STR) == 0) {
- /* Parse and add it to the list of controls */
- rc = parse_ldif_control( line, &pctrls );
- if (rc != 0) {
- fprintf( stderr, _("%s: Error processing %s line, line %d: %s\n"),
- prog, T_CONTROL_STR, linenum, ldap_err2string(rc) );
- }
- goto end_line;
- }
-
- expect_ct = 0;
- if ( !use_record && saw_replica ) {
- printf(_("%s: skipping change record for entry: %s\n"), prog, dn);
- printf(_("\t(LDAP host/port does not match replica: lines)\n"));
- free( dn );
- ber_memfree( type );
- ber_memfree( val.bv_val );
- return( 0 );
- }
- if ( strcasecmp( type, T_CHANGETYPESTR ) == 0 ) {
-#ifdef LIBERAL_CHANGETYPE_MODOP
- /* trim trailing spaces (and log warning ...) */
+ expect_ct = 0;
+ if ( !use_record && saw_replica ) {
+ printf(_("%s: skipping change record for entry: %s\n"),
+ prog, dn);
+ printf(_("\t(LDAP host/port does not match replica: lines)\n"));
+ free( dn );
+ ber_memfree( type );
+ ber_memfree( val.bv_val );
+ return( 0 );
+ }
- int icnt;
- for ( icnt = val.bv_len; --icnt > 0; ) {
- if ( !isspace( (unsigned char) val.bv_val[icnt] ) ) {
- break;
- }
- }
+ if ( strcasecmp( type, T_CHANGETYPESTR ) == 0 ) {
+#ifdef LIBERAL_CHANGETYPE_MODOP
+ /* trim trailing spaces (and log warning ...) */
+ int icnt;
+ for ( icnt = val.bv_len; --icnt > 0; ) {
+ if ( !isspace( (unsigned char) val.bv_val[icnt] ) ) {
+ break;
+ }
+ }
- if ( ++icnt != val.bv_len ) {
- fprintf( stderr, _("%s: illegal trailing space after \"%s: %s\" trimmed (line %d of entry \"%s\")\n"),
- prog, T_CHANGETYPESTR, val.bv_val, linenum, dn );
- val.bv_val[icnt] = '\0';
- }
+ if ( ++icnt != val.bv_len ) {
+ fprintf( stderr, _("%s: illegal trailing space after"
+ " \"%s: %s\" trimmed (line %d of entry \"%s\")\n"),
+ prog, T_CHANGETYPESTR, val.bv_val, linenum, dn );
+ val.bv_val[icnt] = '\0';
+ }
#endif /* LIBERAL_CHANGETYPE_MODOP */
- if ( strcasecmp( val.bv_val, T_MODIFYCTSTR ) == 0 ) {
- new_entry = 0;
- expect_modop = 1;
- } else if ( strcasecmp( val.bv_val, T_ADDCTSTR ) == 0 ) {
- new_entry = 1;
- } else if ( strcasecmp( val.bv_val, T_MODRDNCTSTR ) == 0
- || strcasecmp( val.bv_val, T_MODDNCTSTR ) == 0
- || strcasecmp( val.bv_val, T_RENAMECTSTR ) == 0)
- {
- expect_newrdn = 1;
- } else if ( strcasecmp( val.bv_val, T_DELETECTSTR ) == 0 ) {
- got_all = delete_entry = 1;
- } else {
- fprintf( stderr,
- _("%s: unknown %s \"%s\" (line %d of entry \"%s\")\n"),
- prog, T_CHANGETYPESTR, val.bv_val, linenum, dn );
- rc = LDAP_PARAM_ERROR;
+ if ( strcasecmp( val.bv_val, T_MODIFYCTSTR ) == 0 ) {
+ new_entry = 0;
+ expect_modop = 1;
+ } else if ( strcasecmp( val.bv_val, T_ADDCTSTR ) == 0 ) {
+ new_entry = 1;
+ } else if ( strcasecmp( val.bv_val, T_MODRDNCTSTR ) == 0
+ || strcasecmp( val.bv_val, T_MODDNCTSTR ) == 0
+ || strcasecmp( val.bv_val, T_RENAMECTSTR ) == 0)
+ {
+ expect_newrdn = 1;
+ } else if ( strcasecmp( val.bv_val, T_DELETECTSTR ) == 0 ) {
+ got_all = delete_entry = 1;
+ } else {
+ fprintf( stderr,
+ _("%s: unknown %s \"%s\" (line %d of entry \"%s\")\n"),
+ prog, T_CHANGETYPESTR, val.bv_val, linenum, dn );
+ rc = LDAP_PARAM_ERROR;
+ }
+ goto end_line;
+ } else if ( ldapadd ) { /* missing changetype => add */
+ new_entry = 1;
+ modop = LDAP_MOD_ADD;
+ } else {
+ expect_modop = 1; /* missing changetype => modify */
+ }
}
- goto end_line;
- } else if ( ldapadd ) { /* missing changetype => add */
- new_entry = 1;
- modop = LDAP_MOD_ADD;
- } else {
- expect_modop = 1; /* missing changetype => modify */
- }
- }
- if ( expect_modop ) {
+ if ( expect_modop ) {
#ifdef LIBERAL_CHANGETYPE_MODOP
- /* trim trailing spaces (and log warning ...) */
-
- int icnt;
- for ( icnt = val.bv_len; --icnt > 0; ) {
- if ( !isspace( (unsigned char) val.bv_val[icnt] ) ) {
- break;
- }
- }
-
- if ( ++icnt != val.bv_len ) {
- fprintf( stderr, _("%s: illegal trailing space after \"%s: %s\" trimmed (line %d of entry \"%s\")\n"),
- prog, type, val.bv_val, linenum, dn );
- val.bv_val[icnt] = '\0';
- }
+ /* trim trailing spaces (and log warning ...) */
+ int icnt;
+ for ( icnt = val.bv_len; --icnt > 0; ) {
+ if ( !isspace( (unsigned char) val.bv_val[icnt] ) ) break;
+ }
+
+ if ( ++icnt != val.bv_len ) {
+ fprintf( stderr, _("%s: illegal trailing space after"
+ " \"%s: %s\" trimmed (line %d of entry \"%s\")\n"),
+ prog, type, val.bv_val, linenum, dn );
+ val.bv_val[icnt] = '\0';
+ }
#endif /* LIBERAL_CHANGETYPE_MODOP */
- expect_modop = 0;
- expect_sep = 1;
- if ( strcasecmp( type, T_MODOPADDSTR ) == 0 ) {
- modop = LDAP_MOD_ADD;
- goto end_line;
- } else if ( strcasecmp( type, T_MODOPREPLACESTR ) == 0 ) {
- modop = LDAP_MOD_REPLACE;
- addmodifyop( &pmods, modop, val.bv_val, NULL );
- goto end_line;
- } else if ( strcasecmp( type, T_MODOPDELETESTR ) == 0 ) {
- modop = LDAP_MOD_DELETE;
- addmodifyop( &pmods, modop, val.bv_val, NULL );
- goto end_line;
- } else if ( strcasecmp( type, T_MODOPINCREMENTSTR ) == 0 ) {
- modop = LDAP_MOD_INCREMENT;
- addmodifyop( &pmods, modop, val.bv_val, NULL );
- goto end_line;
- } else { /* no modify op: use default */
- modop = ldapadd ? LDAP_MOD_ADD : LDAP_MOD_REPLACE;
- }
- }
-
- if ( expect_newrdn ) {
- if ( strcasecmp( type, T_NEWRDNSTR ) == 0 ) {
- if (( newrdn = ber_strdup( val.bv_val )) == NULL ) {
- perror( "strdup" );
- exit( EXIT_FAILURE );
- }
- expect_deleteoldrdn = 1;
- expect_newrdn = 0;
- } else {
- fprintf( stderr, _("%s: expecting \"%s:\" but saw \"%s:\" (line %d of entry \"%s\")\n"),
- prog, T_NEWRDNSTR, type, linenum, dn );
- rc = LDAP_PARAM_ERROR;
- }
- } else if ( expect_deleteoldrdn ) {
- if ( strcasecmp( type, T_DELETEOLDRDNSTR ) == 0 ) {
- deleteoldrdn = ( *val.bv_val == '0' ) ? 0 : 1;
- expect_deleteoldrdn = 0;
- expect_newsup = 1;
- got_all = 1;
- } else {
- fprintf( stderr, _("%s: expecting \"%s:\" but saw \"%s:\" (line %d of entry \"%s\")\n"),
- prog, T_DELETEOLDRDNSTR, type, linenum, dn );
- rc = LDAP_PARAM_ERROR;
- }
- } else if ( expect_newsup ) {
- if ( strcasecmp( type, T_NEWSUPSTR ) == 0 ) {
- if (( newsup = ber_strdup( val.bv_val )) == NULL ) {
- perror( "strdup" );
- exit( EXIT_FAILURE );
- }
- expect_newsup = 0;
- } else {
- fprintf( stderr, _("%s: expecting \"%s:\" but saw \"%s:\" (line %d of entry \"%s\")\n"),
- prog, T_NEWSUPSTR, type, linenum, dn );
- rc = LDAP_PARAM_ERROR;
- }
- } else if ( got_all ) {
- fprintf( stderr,
- _("%s: extra lines at end (line %d of entry \"%s\")\n"),
- prog, linenum, dn );
- rc = LDAP_PARAM_ERROR;
- } else {
- addmodifyop( &pmods, modop, type, &val );
- }
+ expect_modop = 0;
+ expect_sep = 1;
+ if ( strcasecmp( type, T_MODOPADDSTR ) == 0 ) {
+ modop = LDAP_MOD_ADD;
+ goto end_line;
+ } else if ( strcasecmp( type, T_MODOPREPLACESTR ) == 0 ) {
+ modop = LDAP_MOD_REPLACE;
+ addmodifyop( &pmods, modop, val.bv_val, NULL );
+ goto end_line;
+ } else if ( strcasecmp( type, T_MODOPDELETESTR ) == 0 ) {
+ modop = LDAP_MOD_DELETE;
+ addmodifyop( &pmods, modop, val.bv_val, NULL );
+ goto end_line;
+ } else if ( strcasecmp( type, T_MODOPINCREMENTSTR ) == 0 ) {
+ modop = LDAP_MOD_INCREMENT;
+ addmodifyop( &pmods, modop, val.bv_val, NULL );
+ goto end_line;
+ } else { /* no modify op: use default */
+ modop = ldapadd ? LDAP_MOD_ADD : LDAP_MOD_REPLACE;
+ }
+ }
+
+ if ( expect_newrdn ) {
+ if ( strcasecmp( type, T_NEWRDNSTR ) == 0 ) {
+ if (( newrdn = ber_strdup( val.bv_val )) == NULL ) {
+ perror( "strdup" );
+ exit( EXIT_FAILURE );
+ }
+ expect_deleteoldrdn = 1;
+ expect_newrdn = 0;
+ } else {
+ fprintf( stderr, _("%s: expecting \"%s:\" but saw"
+ " \"%s:\" (line %d of entry \"%s\")\n"),
+ prog, T_NEWRDNSTR, type, linenum, dn );
+ rc = LDAP_PARAM_ERROR;
+ }
+ } else if ( expect_deleteoldrdn ) {
+ if ( strcasecmp( type, T_DELETEOLDRDNSTR ) == 0 ) {
+ deleteoldrdn = ( *val.bv_val == '0' ) ? 0 : 1;
+ expect_deleteoldrdn = 0;
+ expect_newsup = 1;
+ got_all = 1;
+ } else {
+ fprintf( stderr, _("%s: expecting \"%s:\" but saw"
+ " \"%s:\" (line %d of entry \"%s\")\n"),
+ prog, T_DELETEOLDRDNSTR, type, linenum, dn );
+ rc = LDAP_PARAM_ERROR;
+ }
+ } else if ( expect_newsup ) {
+ if ( strcasecmp( type, T_NEWSUPSTR ) == 0 ) {
+ if (( newsup = ber_strdup( val.bv_val )) == NULL ) {
+ perror( "strdup" );
+ exit( EXIT_FAILURE );
+ }
+ expect_newsup = 0;
+ } else {
+ fprintf( stderr, _("%s: expecting \"%s:\" but saw"
+ " \"%s:\" (line %d of entry \"%s\")\n"),
+ prog, T_NEWSUPSTR, type, linenum, dn );
+ rc = LDAP_PARAM_ERROR;
+ }
+ } else if ( got_all ) {
+ fprintf( stderr,
+ _("%s: extra lines at end (line %d of entry \"%s\")\n"),
+ prog, linenum, dn );
+ rc = LDAP_PARAM_ERROR;
+ } else {
+ addmodifyop( &pmods, modop, type, &val );
+ }
end_line:
- ber_memfree( type );
- ber_memfree( val.bv_val );
- }
+ ber_memfree( type );
+ ber_memfree( val.bv_val );
+ }
if( linenum == 0 ) {
return 0;
return 0;
}
- /* If default controls are set (as with -M option) and controls are
- specified in the LDIF file, we must add the default controls to
- the list of controls sent with the ldap operation.
- */
- if ( rc == 0 ) {
- if (pctrls) {
- LDAPControl **defctrls = NULL; /* Default server controls */
- LDAPControl **newctrls = NULL;
- ldap_get_option(ld, LDAP_OPT_SERVER_CONTROLS, &defctrls);
- if (defctrls) {
- int npc=0; /* Number of LDIF controls */
- int ndefc=0; /* Number of default controls */
- while (pctrls[npc]) /* Count LDIF controls */
- npc++;
- while (defctrls[ndefc]) /* Count default controls */
- ndefc++;
- newctrls = ber_memrealloc(pctrls, (npc+ndefc+1)*sizeof(LDAPControl*));
- if (newctrls == NULL)
- rc = LDAP_NO_MEMORY;
- else {
- int i;
- pctrls = newctrls;
- for (i=npc; i<npc+ndefc; i++) {
- pctrls[i] = ldap_control_dup(defctrls[i-npc]);
- if (pctrls[i] == NULL) {
- rc = LDAP_NO_MEMORY;
- break;
- }
- }
- pctrls[npc+ndefc] = NULL;
- }
- ldap_controls_free(defctrls); /* Must be freed by library */
- }
- }
- }
+ /* If default controls are set (as with -M option) and controls are
+ specified in the LDIF file, we must add the default controls to
+ the list of controls sent with the ldap operation.
+ */
+ if ( rc == 0 ) {
+ if (pctrls) {
+ LDAPControl **defctrls = NULL; /* Default server controls */
+ LDAPControl **newctrls = NULL;
+ ldap_get_option(ld, LDAP_OPT_SERVER_CONTROLS, &defctrls);
+ if (defctrls) {
+ int npc=0; /* Num of LDIF controls */
+ int ndefc=0; /* Num of default controls */
+ while (pctrls[npc]) npc++; /* Count LDIF controls */
+ while (defctrls[ndefc]) ndefc++; /* Count default controls */
+ newctrls = ber_memrealloc(pctrls,
+ (npc+ndefc+1)*sizeof(LDAPControl*));
+
+ if (newctrls == NULL) {
+ rc = LDAP_NO_MEMORY;
+ } else {
+ int i;
+ pctrls = newctrls;
+ for (i=npc; i<npc+ndefc; i++) {
+ pctrls[i] = ldap_control_dup(defctrls[i-npc]);
+ if (pctrls[i] == NULL) {
+ rc = LDAP_NO_MEMORY;
+ break;
+ }
+ }
+ pctrls[npc+ndefc] = NULL;
+ }
+ ldap_controls_free(defctrls); /* Must be freed by library */
+ }
+ }
+ }
- if ( rc == 0 ) {
- if ( delete_entry ) {
- rc = dodelete( dn, pctrls );
- } else if ( newrdn != NULL ) {
- rc = dorename( dn, newrdn, newsup, deleteoldrdn, pctrls );
- } else {
- rc = domodify( dn, pmods, pctrls, new_entry );
- }
+ if ( rc == 0 ) {
+ if ( delete_entry ) {
+ rc = dodelete( dn, pctrls );
+ } else if ( newrdn != NULL ) {
+ rc = dorename( dn, newrdn, newsup, deleteoldrdn, pctrls );
+ } else {
+ rc = domodify( dn, pmods, pctrls, new_entry );
+ }
- if ( rc == LDAP_SUCCESS ) {
- rc = 0;
+ if ( rc == LDAP_SUCCESS ) {
+ rc = 0;
+ }
}
- }
-
- if ( dn != NULL ) {
- free( dn );
- }
- if ( newrdn != NULL ) {
- free( newrdn );
- }
- if ( pmods != NULL ) {
- ldap_mods_free( pmods, 1 );
- }
+ if ( dn != NULL ) {
+ free( dn );
+ }
+ if ( newrdn != NULL ) {
+ free( newrdn );
+ }
+ if ( pmods != NULL ) {
+ ldap_mods_free( pmods, 1 );
+ }
if (pctrls != NULL) {
- ldap_controls_free( pctrls );
- }
+ ldap_controls_free( pctrls );
+ }
- return( rc );
+ return( rc );
}
/* Parse an LDIF control line of the form
The control is added to the list of controls in *ppctrls.
*/
static int
-parse_ldif_control( char *line,
- LDAPControl ***ppctrls )
+parse_ldif_control(
+ char *line,
+ LDAPControl ***ppctrls )
{
- char *oid = NULL;
- int criticality = 0; /* Default is false if not present */
- char *type=NULL;
- char *val = NULL;
- ber_len_t value_len = 0;
- int i, rc=0;
- char *s, *oidStart, *pcolon;
- LDAPControl *newctrl = NULL;
- LDAPControl **pctrls = NULL;
-
- if (ppctrls) {
- pctrls = *ppctrls;
- }
- s = line + strlen(T_CONTROL_STR); /* Skip over "control" */
- pcolon = s; /* Save this position for later */
- if (*s++ != ':') /* Make sure colon follows */
- return ( LDAP_PARAM_ERROR );
- while (*s && isspace((unsigned char)*s))
+ char *oid = NULL;
+ int criticality = 0; /* Default is false if not present */
+ char *type=NULL;
+ char *val = NULL;
+ ber_len_t value_len = 0;
+ int i, rc=0;
+ char *s, *oidStart, *pcolon;
+ LDAPControl *newctrl = NULL;
+ LDAPControl **pctrls = NULL;
+
+ if (ppctrls) pctrls = *ppctrls;
+ s = line + strlen(T_CONTROL_STR); /* Skip over "control" */
+ pcolon = s; /* Save this position for later */
+ if (*s++ != ':') { /* Make sure colon follows */
+ return ( LDAP_PARAM_ERROR );
+ }
+ while (*s && isspace((unsigned char)*s)) {
s++; /* Skip white space before OID */
+ }
- /* OID should come next. Validate and extract it. */
- if (*s == 0)
- return ( LDAP_PARAM_ERROR );
- oidStart = s;
- while (isdigit((unsigned char)*s) || *s == '.')
+ /* OID should come next. Validate and extract it. */
+ if (*s == 0) return ( LDAP_PARAM_ERROR );
+ oidStart = s;
+ while (isdigit((unsigned char)*s) || *s == '.') {
s++; /* OID should be digits or . */
- if (s == oidStart)
- return ( LDAP_PARAM_ERROR ); /* OID was not present */
- if (*s) { /* End of OID should be space or NULL */
- if (!isspace((unsigned char)*s))
- return ( LDAP_PARAM_ERROR ); /* else OID contained invalid chars */
- *s++ = 0; /* Replace space with null to terminate */
- }
+ }
+ if (s == oidStart) {
+ return ( LDAP_PARAM_ERROR ); /* OID was not present */
+ }
+ if (*s) { /* End of OID should be space or NULL */
+ if (!isspace((unsigned char)*s)) {
+ return ( LDAP_PARAM_ERROR ); /* else OID contained invalid chars */
+ }
+ *s++ = 0; /* Replace space with null to terminate */
+ }
-
- oid = ber_strdup(oidStart);
- if (oid == NULL)
- return ( LDAP_NO_MEMORY );
+ oid = ber_strdup(oidStart);
+ if (oid == NULL) return ( LDAP_NO_MEMORY );
- /* Optional Criticality field is next. */
- while (*s && isspace((unsigned char)*s))
+ /* Optional Criticality field is next. */
+ while (*s && isspace((unsigned char)*s)) {
s++; /* Skip white space before criticality */
- if (strncasecmp(s, "true", 4) == 0) {
- criticality = 1;
- s += 4;
- }
- else if (strncasecmp(s, "false", 5) == 0) {
- criticality = 0;
- s += 5;
- }
+ }
+ if (strncasecmp(s, "true", 4) == 0) {
+ criticality = 1;
+ s += 4;
+ }
+ else if (strncasecmp(s, "false", 5) == 0) {
+ criticality = 0;
+ s += 5;
+ }
- /* Optional value field is next */
- while (*s && isspace((unsigned char)*s))
+ /* Optional value field is next */
+ while (*s && isspace((unsigned char)*s)) {
s++; /* Skip white space before value */
- if (*s) {
- if (*s != ':') { /* If value is present, must start with : */
- rc = LDAP_PARAM_ERROR;
- goto cleanup;
- }
-
- /* Shift value down over OID and criticality so it's in the form
- control: value
- control:: base64-value
- control:< url
- Then we can use ldif_parse_line to extract and decode the value
- */
- while ( (*pcolon++ = *s++) != 0) /* Shift value */
- ;
- rc = ldif_parse_line(line, &type, &val, &value_len);
- if (type) ber_memfree(type); /* Don't need this field*/
- if (rc < 0) {
- rc = LDAP_PARAM_ERROR;
- goto cleanup;
- }
- }
+ }
+ if (*s) {
+ if (*s != ':') { /* If value is present, must start with : */
+ rc = LDAP_PARAM_ERROR;
+ goto cleanup;
+ }
- /* Create a new LDAPControl structure. */
- newctrl = (LDAPControl *)ber_memalloc(sizeof(LDAPControl));
- if ( newctrl == NULL ) {
- rc = LDAP_NO_MEMORY;
- goto cleanup;
- }
- newctrl->ldctl_oid = oid;
- oid = NULL;
- newctrl->ldctl_iscritical = criticality;
- newctrl->ldctl_value.bv_len = value_len;
- newctrl->ldctl_value.bv_val = val;
- val = NULL;
-
- /* Add the new control to the passed-in list of controls. */
- i = 0;
- if (pctrls) {
- while ( pctrls[i] ) /* Count the # of controls passed in */
- i++;
- }
- /* Allocate 1 more slot for the new control and 1 for the NULL. */
- pctrls = (LDAPControl **)ber_memrealloc(pctrls, (i+2)*(sizeof(LDAPControl *)));
- if (pctrls == NULL) {
- rc = LDAP_NO_MEMORY;
- goto cleanup;
+ /* Shift value down over OID and criticality so it's in the form
+ control: value
+ control:: base64-value
+ control:< url
+ Then we can use ldif_parse_line to extract and decode the value
+ */
+ while ( (*pcolon++ = *s++) != 0) { /* Shift value */
+ /* EMPTY */;
+ }
+ rc = ldif_parse_line(line, &type, &val, &value_len);
+ if (type) ber_memfree(type); /* Don't need this field*/
+ if (rc < 0) {
+ rc = LDAP_PARAM_ERROR;
+ goto cleanup;
+ }
}
- pctrls[i] = newctrl;
- newctrl = NULL;
- pctrls[i+1] = NULL;
- *ppctrls = pctrls;
+
+ /* Create a new LDAPControl structure. */
+ newctrl = (LDAPControl *)ber_memalloc(sizeof(LDAPControl));
+ if ( newctrl == NULL ) {
+ rc = LDAP_NO_MEMORY;
+ goto cleanup;
+ }
+ newctrl->ldctl_oid = oid;
+ oid = NULL;
+ newctrl->ldctl_iscritical = criticality;
+ newctrl->ldctl_value.bv_len = value_len;
+ newctrl->ldctl_value.bv_val = val;
+ val = NULL;
+
+ /* Add the new control to the passed-in list of controls. */
+ i = 0;
+ if (pctrls) {
+ while ( pctrls[i] ) { /* Count the # of controls passed in */
+ i++;
+ }
+ }
+ /* Allocate 1 more slot for the new control and 1 for the NULL. */
+ pctrls = (LDAPControl **) ber_memrealloc(pctrls,
+ (i+2)*(sizeof(LDAPControl *)));
+ if (pctrls == NULL) {
+ rc = LDAP_NO_MEMORY;
+ goto cleanup;
+ }
+ pctrls[i] = newctrl;
+ newctrl = NULL;
+ pctrls[i+1] = NULL;
+ *ppctrls = pctrls;
cleanup:
- if (newctrl) {
- if (newctrl->ldctl_oid)
- ber_memfree(newctrl->ldctl_oid);
- if (newctrl->ldctl_value.bv_val)
- ber_memfree(newctrl->ldctl_value.bv_val);
- ber_memfree(newctrl);
- }
- if (val)
- ber_memfree(val);
- if (oid)
- ber_memfree(oid);
+ if (newctrl) {
+ if (newctrl->ldctl_oid) ber_memfree(newctrl->ldctl_oid);
+ if (newctrl->ldctl_value.bv_val) {
+ ber_memfree(newctrl->ldctl_value.bv_val);
+ }
+ ber_memfree(newctrl);
+ }
+ if (val) ber_memfree(val);
+ if (oid) ber_memfree(oid);
- return( rc );
+ return( rc );
}
domodify(
const char *dn,
LDAPMod **pmods,
- LDAPControl **pctrls,
+ LDAPControl **pctrls,
int newentry )
{
- int i, j, k, notascii, op;
- struct berval *bvp;
+ int i, j, k, notascii, op;
+ struct berval *bvp;
if ( dn == NULL ) {
- fprintf( stderr, _("%s: no DN specified\n"), prog );
- return( LDAP_PARAM_ERROR );
+ fprintf( stderr, _("%s: no DN specified\n"), prog );
+ return( LDAP_PARAM_ERROR );
}
- if ( pmods == NULL ) {
- fprintf( stderr, _("%s: no attributes to change or add (entry=\"%s\")\n"),
- prog, dn );
- return( LDAP_PARAM_ERROR );
- }
-
- for ( i = 0; pmods[ i ] != NULL; ++i ) {
- op = pmods[ i ]->mod_op & ~LDAP_MOD_BVALUES;
- if( op == LDAP_MOD_ADD && ( pmods[i]->mod_bvalues == NULL )) {
+ if ( pmods == NULL ) {
fprintf( stderr,
- _("%s: attribute \"%s\" has no values (entry=\"%s\")\n"),
- prog, pmods[i]->mod_type, dn );
- return LDAP_PARAM_ERROR;
- }
- }
+ _("%s: no attributes to change or add (entry=\"%s\")\n"),
+ prog, dn );
+ return( LDAP_PARAM_ERROR );
+ }
- if ( verbose ) {
for ( i = 0; pmods[ i ] != NULL; ++i ) {
- op = pmods[ i ]->mod_op & ~LDAP_MOD_BVALUES;
- printf( "%s %s:\n",
- op == LDAP_MOD_REPLACE ? _("replace") :
- op == LDAP_MOD_ADD ? _("add") :
- op == LDAP_MOD_INCREMENT ? _("increment") :
- op == LDAP_MOD_DELETE ? _("delete") :
- _("unknown"),
- pmods[ i ]->mod_type );
- if ( pmods[ i ]->mod_bvalues != NULL ) {
- for ( j = 0; pmods[ i ]->mod_bvalues[ j ] != NULL; ++j ) {
- bvp = pmods[ i ]->mod_bvalues[ j ];
- notascii = 0;
- for ( k = 0; (unsigned long) k < bvp->bv_len; ++k ) {
- if ( !isascii( bvp->bv_val[ k ] )) {
- notascii = 1;
- break;
- }
- }
- if ( notascii ) {
- printf( _("\tNOT ASCII (%ld bytes)\n"), bvp->bv_len );
- } else {
- printf( "\t%s\n", bvp->bv_val );
- }
+ op = pmods[ i ]->mod_op & ~LDAP_MOD_BVALUES;
+ if( op == LDAP_MOD_ADD && ( pmods[i]->mod_bvalues == NULL )) {
+ fprintf( stderr,
+ _("%s: attribute \"%s\" has no values (entry=\"%s\")\n"),
+ prog, pmods[i]->mod_type, dn );
+ return LDAP_PARAM_ERROR;
}
- }
}
- }
- if ( newentry ) {
- printf( "%sadding new entry \"%s\"\n", not ? "!" : "", dn );
- } else {
- printf( "%smodifying entry \"%s\"\n", not ? "!" : "", dn );
- }
+ if ( verbose ) {
+ for ( i = 0; pmods[ i ] != NULL; ++i ) {
+ op = pmods[ i ]->mod_op & ~LDAP_MOD_BVALUES;
+ printf( "%s %s:\n",
+ op == LDAP_MOD_REPLACE ? _("replace") :
+ op == LDAP_MOD_ADD ? _("add") :
+ op == LDAP_MOD_INCREMENT ? _("increment") :
+ op == LDAP_MOD_DELETE ? _("delete") :
+ _("unknown"),
+ pmods[ i ]->mod_type );
+
+ if ( pmods[ i ]->mod_bvalues != NULL ) {
+ for ( j = 0; pmods[ i ]->mod_bvalues[ j ] != NULL; ++j ) {
+ bvp = pmods[ i ]->mod_bvalues[ j ];
+ notascii = 0;
+ for ( k = 0; (unsigned long) k < bvp->bv_len; ++k ) {
+ if ( !isascii( bvp->bv_val[ k ] )) {
+ notascii = 1;
+ break;
+ }
+ }
+ if ( notascii ) {
+ printf( _("\tNOT ASCII (%ld bytes)\n"), bvp->bv_len );
+ } else {
+ printf( "\t%s\n", bvp->bv_val );
+ }
+ }
+ }
+ }
+ }
- if ( !not ) {
if ( newentry ) {
- i = ldap_add_ext_s( ld, dn, pmods, pctrls, NULL );
+ printf( "%sadding new entry \"%s\"\n", not ? "!" : "", dn );
} else {
- i = ldap_modify_ext_s( ld, dn, pmods, pctrls, NULL );
+ printf( "%smodifying entry \"%s\"\n", not ? "!" : "", dn );
}
- if ( i != LDAP_SUCCESS ) {
- /* print error message about failed update including DN */
- fprintf( stderr, _("%s: update failed: %s\n"), prog, dn );
- ldap_perror( ld, newentry ? "ldap_add" : "ldap_modify" );
- } else if ( verbose ) {
- printf( _("modify complete\n") );
- }
- } else {
- i = LDAP_SUCCESS;
- }
- putchar( '\n' );
+ if ( !not ) {
+ if ( newentry ) {
+ i = ldap_add_ext_s( ld, dn, pmods, pctrls, NULL );
+ } else {
+ i = ldap_modify_ext_s( ld, dn, pmods, pctrls, NULL );
+ }
+ if ( i != LDAP_SUCCESS ) {
+ /* print error message about failed update including DN */
+ fprintf( stderr, _("%s: update failed: %s\n"), prog, dn );
+ ldap_perror( ld, newentry ? "ldap_add" : "ldap_modify" );
+ } else if ( verbose ) {
+ printf( _("modify complete\n") );
+ }
+ } else {
+ i = LDAP_SUCCESS;
+ }
- return( i );
+ putchar( '\n' );
+ return( i );
}
static int
dodelete(
const char *dn,
- LDAPControl **pctrls )
+ LDAPControl **pctrls )
{
- int rc;
-
- printf( _("%sdeleting entry \"%s\"\n"), not ? "!" : "", dn );
- if ( !not ) {
- if (( rc = ldap_delete_ext_s( ld, dn, pctrls, NULL )) != LDAP_SUCCESS ) {
- fprintf( stderr, _("%s: delete failed: %s\n"), prog, dn );
- ldap_perror( ld, "ldap_delete" );
- } else if ( verbose ) {
- printf( _("delete complete") );
- }
- } else {
- rc = LDAP_SUCCESS;
- }
+ int rc;
- putchar( '\n' );
+ printf( _("%sdeleting entry \"%s\"\n"), not ? "!" : "", dn );
+ if ( !not ) {
+ rc = ldap_delete_ext_s( ld, dn, pctrls, NULL );
+ if ( rc != LDAP_SUCCESS ) {
+ fprintf( stderr, _("%s: delete failed: %s\n"), prog, dn );
+ ldap_perror( ld, "ldap_delete" );
+ } else if ( verbose ) {
+ printf( _("delete complete") );
+ }
+ } else {
+ rc = LDAP_SUCCESS;
+ }
- return( rc );
+ putchar( '\n' );
+ return( rc );
}
const char *newrdn,
const char* newsup,
int deleteoldrdn,
- LDAPControl **pctrls )
+ LDAPControl **pctrls )
{
- int rc;
+ int rc;
-
- printf( _("%smodifying rdn of entry \"%s\"\n"), not ? "!" : "", dn );
- if ( verbose ) {
- printf( _("\tnew RDN: \"%s\" (%skeep existing values)\n"),
- newrdn, deleteoldrdn ? _("do not ") : "" );
- }
- if ( !not ) {
- if (( rc = ldap_rename_s( ld, dn, newrdn, newsup, deleteoldrdn, pctrls, NULL ))
- != LDAP_SUCCESS ) {
- fprintf( stderr, _("%s: rename failed: %s\n"), prog, dn );
- ldap_perror( ld, "ldap_modrdn" );
+ printf( _("%smodifying rdn of entry \"%s\"\n"), not ? "!" : "", dn );
+ if ( verbose ) {
+ printf( _("\tnew RDN: \"%s\" (%skeep existing values)\n"),
+ newrdn, deleteoldrdn ? _("do not ") : "" );
+ }
+ if ( !not ) {
+ rc = ldap_rename_s( ld, dn, newrdn, newsup, deleteoldrdn,
+ pctrls, NULL );
+ if ( rc != LDAP_SUCCESS ) {
+ fprintf( stderr, _("%s: rename failed: %s\n"), prog, dn );
+ ldap_perror( ld, "ldap_modrdn" );
+ } else {
+ printf( _("modrdn completed\n") );
+ }
} else {
- printf( _("modrdn completed\n") );
+ rc = LDAP_SUCCESS;
}
- } else {
- rc = LDAP_SUCCESS;
- }
-
- putchar( '\n' );
- return( rc );
+ putchar( '\n' );
+ return( rc );
}
static char *
read_one_record( FILE *fp )
{
- char *buf, line[ LDAPMOD_MAXLINE ];
- int lcur, lmax;
+ char *buf, line[ LDAPMOD_MAXLINE ];
+ int lcur, lmax;
- lcur = lmax = 0;
- buf = NULL;
+ lcur = lmax = 0;
+ buf = NULL;
- while ( fgets( line, sizeof(line), fp ) != NULL ) {
- int len = strlen( line );
+ while ( fgets( line, sizeof(line), fp ) != NULL ) {
+ int len = strlen( line );
if( len < 2 || ( len == 2 && *line == '\r' )) {
if( buf == NULL ) {
strcpy( buf + lcur, line );
lcur += len;
- }
+ }
- return( buf );
+ return( buf );
}
projects / openldap / commitdiff