X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=clients%2Ftools%2Fldapmodify.c;h=d30b3edc07d9086ed6623ce70afedc5936b57555;hb=58dff0848071470f9dcc19421afafb03b68ee2b0;hp=2bb835a64e024741955d2575287384b4f76a59a9;hpb=9e450558d89453bf5918b8a4e9265ad80063a2bc;p=openldap diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c index 2bb835a64e..d30b3edc07 100644 --- a/clients/tools/ldapmodify.c +++ b/clients/tools/ldapmodify.c @@ -1,20 +1,48 @@ +/* ldapmodify.c - generic program to modify or add entries using LDAP */ /* $OpenLDAP$ */ -/* - * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file +/* This work is part of OpenLDAP Software . + * + * Copyright 1998-2007 The OpenLDAP Foundation. + * Portions Copyright 1998-2003 Kurt D. Zeilenga. + * Portions Copyright 1998-2001 Net Boolean Incorporated. + * Portions Copyright 2001-2003 IBM Corporation. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. + * + * A copy of this license is available in the file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . + */ +/* Portions Copyright (c) 1992-1996 Regents of the University of Michigan. + * All rights reserved. + * + * Redistribution and use in source and binary forms are permitted + * provided that this notice is preserved and that due credit is given + * to the University of Michigan at Ann Arbor. The name of the + * University may not be used to endorse or promote products derived + * from this software without specific prior written permission. This + * software is provided ``as is'' without express or implied warranty. + */ +/* ACKNOWLEDGEMENTS: + * This work was originally developed by the University of Michigan + * (as part of U-MICH LDAP). Additional significant contributors + * include: + * Kurt D. Zeilenga + * Norbert Klasen */ -/* ldapmodify.c - generic program to modify or add entries using LDAP */ #include "portable.h" #include #include - #include -#include #include #include +#include #ifdef HAVE_SYS_STAT_H #include @@ -29,26 +57,18 @@ #include +#include "lutil.h" #include "lutil_ldap.h" #include "ldif.h" #include "ldap_defaults.h" +#include "ldap_log.h" +#include "ldap_pvt.h" -static char *prog; -static char *binddn = NULL; -static struct berval passwd = { 0, NULL }; -static char *ldapuri = NULL; -static char *ldaphost = NULL; -static int ldapport = 0; -#ifdef HAVE_CYRUS_SASL -static unsigned sasl_flags = LDAP_SASL_AUTOMATIC; -static char *sasl_realm = NULL; -static char *sasl_authc_id = NULL; -static char *sasl_authz_id = NULL; -static char *sasl_mech = NULL; -static char *sasl_secprops = NULL; -#endif -static int use_tls = 0; -static int ldapadd, replace, not, verbose, contoper, force; +#include "common.h" + + +static int ldapadd, force = 0; +static char *rejfile = NULL; static LDAP *ld = NULL; #define LDAPMOD_MAXLINE 4096 @@ -56,9 +76,10 @@ static LDAP *ld = NULL; /* 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_CHANGETYPESTR "changetype" -#define T_ADDCTSTR "add" +#define T_DN_STR "dn" +#define T_CONTROL_STR "control" +#define T_CHANGETYPESTR "changetype" +#define T_ADDCTSTR "add" #define T_MODIFYCTSTR "modify" #define T_DELETECTSTR "delete" #define T_MODRDNCTSTR "modrdn" @@ -67,14 +88,15 @@ static LDAP *ld = NULL; #define T_MODOPADDSTR "add" #define T_MODOPREPLACESTR "replace" #define T_MODOPDELETESTR "delete" -#define T_MODSEPSTR "-" -#define T_NEWRDNSTR "newrdn" +#define T_MODOPINCREMENTSTR "increment" +#define T_MODSEPSTR "-" +#define T_NEWRDNSTR "newrdn" #define T_DELETEOLDRDNSTR "deleteoldrdn" -#define T_NEWSUPSTR "newsuperior" +#define T_NEWSUPSTR "newsuperior" -static void usage LDAP_P(( const char *prog )) LDAP_GCCATTR((noreturn)); static int process_ldif_rec LDAP_P(( char *rbuf, int count )); +static int parse_ldif_control LDAP_P(( char *line, LDAPControl ***pctrls )); static void addmodifyop LDAP_P(( LDAPMod ***pmodsp, int modop, const char *attr, @@ -82,856 +104,781 @@ static void addmodifyop LDAP_P(( static int domodify LDAP_P(( const char *dn, LDAPMod **pmods, + LDAPControl **pctrls, int newentry )); static int dodelete LDAP_P(( - const char *dn )); + const char *dn, + LDAPControl **pctrls )); static int dorename LDAP_P(( const char *dn, const char *newrdn, const char *newsup, - int deleteoldrdn )); + int deleteoldrdn, + LDAPControl **pctrls )); +static int process_response( + LDAP *ld, + int msgid, + const char *opstr, + const char *dn ); static char *read_one_record LDAP_P(( FILE *fp )); -static void -usage( const char *prog ) +#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" -"usage: %s [options]\n" -" The list of desired operations are read from stdin or from the file\n" -" specified by \"-f file\".\n" -"Add or modify options:\n" -" -a add values (default%s)\n" -" -r replace values\n" -" -F force all changes records to be used\n" - -"Common options:\n" -" -d level set LDAP debugging level to `level'\n" -" -D binddn bind DN\n" -" -f file read operations from `file'\n" -" -h host LDAP server\n" -" -H URI LDAP Uniform Resource Indentifier(s)\n" -" -I use SASL Interactive mode\n" -" -k use Kerberos authentication\n" -" -K like -k, but do only step 1 of the Kerberos bind\n" -" -M enable Manage DSA IT control (-MM to make critical)\n" -" -n show what would be done but don't actually search\n" -" -O props SASL security properties\n" -" -p port port on LDAP server\n" -" -P version procotol version (default: 3)\n" -" -Q use SASL Quiet mode\n" -" -R realm SASL realm\n" -" -U user SASL authentication identity (username)\n" -" -v run in verbose mode (diagnostics to standard output)\n" -" -w passwd bind passwd (for simple authentication)\n" -" -W prompt for bind passwd\n" -" -x Simple authentication\n" -" -X id SASL authorization identity (\"dn:\" or \"u:\")\n" -" -Y mech SASL mechanism\n" -" -Z Start TLS request (-ZZ to require successful response)\n" - , prog, (strcmp( prog, "ldapadd" ) ? " is to replace" : "") ); - - exit( EXIT_FAILURE ); + 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, _(" -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[] = "aE:FrS:" + "cd:D:e:f:h:H:IkKMnO:p:P:QR:U:vVw:WxX:y:Y:Z"; + int -main( int argc, char **argv ) +handle_private_option( int i ) { - char *infile, *rbuf, *start; - FILE *fp; - int rc, i, authmethod, version, want_bindpw, debug, manageDSAit, referrals; - int count; - - if (( prog = strrchr( argv[ 0 ], *LDAP_DIRSEP )) == NULL ) { - prog = argv[ 0 ]; - } else { - ++prog; - } - - /* Print usage when no parameters */ - if( argc < 2 ) usage( prog ); - - ldapadd = ( strcmp( prog, "ldapadd" ) == 0 ); + char *control, *cvalue; + int crit; + + switch ( i ) { + case 'E': /* modify extensions */ + if( protocol == LDAP_VERSION2 ) { + fprintf( stderr, _("%s: -E incompatible with LDAPv%d\n"), + prog, protocol ); + exit( EXIT_FAILURE ); + } - infile = NULL; - not = verbose = want_bindpw = debug = manageDSAit = referrals = 0; - authmethod = -1; - version = -1; + /* should be extended to support comma separated list of + * [!]key[=value] parameters, e.g. -E !foo,bar=567 + */ - while (( i = getopt( argc, argv, "acrf:F" - "Cd:D:h:H:IkKMnO:p:P:QR:U:vw:WxX:Y:Z" )) != EOF ) - { - switch( i ) { - /* Modify Options */ - case 'a': /* add */ - ldapadd = 1; - break; - case 'c': /* continuous operation */ - contoper = 1; - break; - case 'f': /* read from file */ - if( infile != NULL ) { - fprintf( stderr, "%s: -f previously specified\n", prog ); - return EXIT_FAILURE; - } - infile = strdup( optarg ); - break; - case 'F': /* force all changes records to be used */ - force = 1; - break; - case 'r': /* default is to replace rather than add values */ - replace = 1; - break; - - /* Common Options */ - case 'C': - referrals++; - break; - case 'd': - debug |= atoi( optarg ); - break; - case 'D': /* bind DN */ - if( binddn != NULL ) { - fprintf( stderr, "%s: -D previously specified\n", prog ); - return EXIT_FAILURE; - } - binddn = strdup( optarg ); - break; - case 'h': /* ldap host */ - if( ldapuri != NULL ) { - fprintf( stderr, "%s: -h incompatible with -H\n", prog ); - return EXIT_FAILURE; - } - if( ldaphost != NULL ) { - fprintf( stderr, "%s: -h previously specified\n", prog ); - return EXIT_FAILURE; - } - ldaphost = strdup( optarg ); - break; - case 'H': /* ldap URI */ - if( ldaphost != NULL ) { - fprintf( stderr, "%s: -H incompatible with -h\n", prog ); - return EXIT_FAILURE; - } - if( ldapport ) { - fprintf( stderr, "%s: -H incompatible with -p\n", prog ); - return EXIT_FAILURE; - } - if( ldapuri != NULL ) { - fprintf( stderr, "%s: -H previously specified\n", prog ); - return EXIT_FAILURE; - } - ldapuri = strdup( optarg ); - break; - case 'I': -#ifdef HAVE_CYRUS_SASL - if( version == LDAP_VERSION2 ) { - fprintf( stderr, "%s: -I incompatible with version %d\n", - prog, version ); - return EXIT_FAILURE; - } - if( authmethod != -1 && authmethod != LDAP_AUTH_SASL ) { - fprintf( stderr, "%s: incompatible previous " - "authentication choice\n", - prog ); - return EXIT_FAILURE; - } - authmethod = LDAP_AUTH_SASL; - version = LDAP_VERSION3; - sasl_flags = LDAP_SASL_INTERACTIVE; - break; -#else - fprintf( stderr, "%s: was not compiled with SASL support\n", - prog ); - return( EXIT_FAILURE ); -#endif - case 'k': /* kerberos bind */ -#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND - if( version > LDAP_VERSION2 ) { - fprintf( stderr, "%s: -k incompatible with LDAPv%d\n", - prog, version ); - return EXIT_FAILURE; + crit = 0; + cvalue = NULL; + if( optarg[0] == '!' ) { + crit = 1; + optarg++; } - if( authmethod != -1 ) { - fprintf( stderr, "%s: -k incompatible with previous " - "authentication choice\n", prog ); - return EXIT_FAILURE; - } - - authmethod = LDAP_AUTH_KRBV4; -#else - fprintf( stderr, "%s: not compiled with Kerberos support\n", prog ); - return EXIT_FAILURE; -#endif - break; - case 'K': /* kerberos bind, part one only */ -#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND - if( version > LDAP_VERSION2 ) { - fprintf( stderr, "%s: -k incompatible with LDAPv%d\n", - prog, version ); - return EXIT_FAILURE; - } - if( authmethod != -1 ) { - fprintf( stderr, "%s: incompatible with previous " - "authentication choice\n", prog ); - return EXIT_FAILURE; + control = ber_strdup( optarg ); + if ( (cvalue = strchr( control, '=' )) != NULL ) { + *cvalue++ = '\0'; } - authmethod = LDAP_AUTH_KRBV41; -#else - fprintf( stderr, "%s: not compiled with Kerberos support\n", prog ); - return( EXIT_FAILURE ); -#endif - break; - case 'M': - /* enable Manage DSA IT */ - if( version == LDAP_VERSION2 ) { - fprintf( stderr, "%s: -M incompatible with LDAPv%d\n", - prog, version ); - return EXIT_FAILURE; - } - manageDSAit++; - version = LDAP_VERSION3; - break; - case 'n': /* print deletes, don't actually do them */ - ++not; - break; - case 'O': -#ifdef HAVE_CYRUS_SASL - if( sasl_secprops != NULL ) { - fprintf( stderr, "%s: -O previously specified\n", prog ); - return EXIT_FAILURE; - } - if( version == LDAP_VERSION2 ) { - fprintf( stderr, "%s: -O incompatible with LDAPv%d\n", - prog, version ); - return EXIT_FAILURE; - } - if( authmethod != -1 && authmethod != LDAP_AUTH_SASL ) { - fprintf( stderr, "%s: incompatible previous " - "authentication choice\n", prog ); - return EXIT_FAILURE; - } - authmethod = LDAP_AUTH_SASL; - version = LDAP_VERSION3; - sasl_secprops = strdup( optarg ); -#else - fprintf( stderr, "%s: not compiled with SASL support\n", - prog ); - return( EXIT_FAILURE ); -#endif - break; - case 'p': - if( ldapport ) { - fprintf( stderr, "%s: -p previously specified\n", prog ); - return EXIT_FAILURE; - } - ldapport = atoi( optarg ); - break; - case 'P': - switch( atoi(optarg) ) { - case 2: - if( version == LDAP_VERSION3 ) { - fprintf( stderr, "%s: -P 2 incompatible with version %d\n", - prog, version ); - return EXIT_FAILURE; +#ifdef LDAP_GROUP_TRANSACTION + if( strcasecmp( control, "txn" ) == 0 ) { + /* Transaction */ + if( txn ) { + fprintf( stderr, + _("txn control previously specified\n")); + exit( EXIT_FAILURE ); } - version = LDAP_VERSION2; - break; - case 3: - if( version == LDAP_VERSION2 ) { - fprintf( stderr, "%s: -P 2 incompatible with version %d\n", - prog, version ); - return 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 ); + } } - version = LDAP_VERSION3; - break; - default: - fprintf( stderr, "%s: protocol version should be 2 or 3\n", - prog ); - usage( prog ); - return( EXIT_FAILURE ); - } break; - case 'Q': -#ifdef HAVE_CYRUS_SASL - if( version == LDAP_VERSION2 ) { - fprintf( stderr, "%s: -Q incompatible with version %d\n", - prog, version ); - return EXIT_FAILURE; - } - if( authmethod != -1 && authmethod != LDAP_AUTH_SASL ) { - fprintf( stderr, "%s: incompatible previous " - "authentication choice\n", - prog ); - return EXIT_FAILURE; - } - authmethod = LDAP_AUTH_SASL; - version = LDAP_VERSION3; - sasl_flags = LDAP_SASL_QUIET; - break; -#else - fprintf( stderr, "%s: not compiled with SASL support\n", - prog ); - return( EXIT_FAILURE ); -#endif - case 'R': -#ifdef HAVE_CYRUS_SASL - if( sasl_realm != NULL ) { - fprintf( stderr, "%s: -R previously specified\n", prog ); - return EXIT_FAILURE; - } - if( version == LDAP_VERSION2 ) { - fprintf( stderr, "%s: -R incompatible with version %d\n", - prog, version ); - return EXIT_FAILURE; - } - if( authmethod != -1 && authmethod != LDAP_AUTH_SASL ) { - fprintf( stderr, "%s: incompatible previous " - "authentication choice\n", - prog ); - return EXIT_FAILURE; - } - authmethod = LDAP_AUTH_SASL; - version = LDAP_VERSION3; - sasl_realm = strdup( optarg ); -#else - fprintf( stderr, "%s: not compiled with SASL support\n", - prog ); - return( EXIT_FAILURE ); -#endif - break; - case 'U': -#ifdef HAVE_CYRUS_SASL - if( sasl_authc_id != NULL ) { - fprintf( stderr, "%s: -U previously specified\n", prog ); - return EXIT_FAILURE; - } - if( version == LDAP_VERSION2 ) { - fprintf( stderr, "%s: -U incompatible with version %d\n", - prog, version ); - return EXIT_FAILURE; - } - if( authmethod != -1 && authmethod != LDAP_AUTH_SASL ) { - fprintf( stderr, "%s: incompatible previous " - "authentication choice\n", - prog ); - return EXIT_FAILURE; - } - authmethod = LDAP_AUTH_SASL; - version = LDAP_VERSION3; - sasl_authc_id = strdup( optarg ); -#else - fprintf( stderr, "%s: not compiled with SASL support\n", - prog ); - return( EXIT_FAILURE ); + + txn = 1 + crit; + } else #endif - break; - case 'v': /* verbose mode */ - verbose++; - break; - case 'w': /* password */ - passwd.bv_val = strdup( optarg ); { - char* p; - - for( p = optarg; *p == '\0'; p++ ) { - *p = '\0'; - } + fprintf( stderr, _("Invalid modify extension name: %s\n"), + control ); + usage(); } - passwd.bv_len = strlen( passwd.bv_val ); - break; - case 'W': - want_bindpw++; - break; - case 'Y': -#ifdef HAVE_CYRUS_SASL - if( sasl_mech != NULL ) { - fprintf( stderr, "%s: -Y previously specified\n", prog ); - return EXIT_FAILURE; - } - if( version == LDAP_VERSION2 ) { - fprintf( stderr, "%s: -Y incompatible with version %d\n", - prog, version ); - return EXIT_FAILURE; - } - if( authmethod != -1 && authmethod != LDAP_AUTH_SASL ) { - fprintf( stderr, "%s: incompatible with authentication choice\n", prog ); - return EXIT_FAILURE; - } - authmethod = LDAP_AUTH_SASL; - version = LDAP_VERSION3; - sasl_mech = strdup( optarg ); -#else - fprintf( stderr, "%s: not compiled with SASL support\n", - prog ); - return( EXIT_FAILURE ); -#endif + + case 'a': /* add */ + ldapadd = 1; break; - case 'x': - if( authmethod != -1 && authmethod != LDAP_AUTH_SIMPLE ) { - fprintf( stderr, "%s: incompatible with previous " - "authentication choice\n", prog ); - return EXIT_FAILURE; - } - authmethod = LDAP_AUTH_SIMPLE; + + case 'F': /* force all changes records to be used */ + force = 1; break; - case 'X': -#ifdef HAVE_CYRUS_SASL - if( sasl_authz_id != NULL ) { - fprintf( stderr, "%s: -X previously specified\n", prog ); - return EXIT_FAILURE; - } - if( version == LDAP_VERSION2 ) { - fprintf( stderr, "%s: -X incompatible with LDAPv%d\n", - prog, version ); - return EXIT_FAILURE; - } - if( authmethod != -1 && authmethod != LDAP_AUTH_SASL ) { - fprintf( stderr, "%s: -X incompatible with " - "authentication choice\n", prog ); - return EXIT_FAILURE; - } - authmethod = LDAP_AUTH_SASL; - version = LDAP_VERSION3; - sasl_authz_id = strdup( optarg ); -#else - fprintf( stderr, "%s: not compiled with SASL support\n", - prog ); - return( EXIT_FAILURE ); -#endif + + case 'r': /* replace (obsolete) */ break; - case 'Z': -#ifdef HAVE_TLS - if( version == LDAP_VERSION2 ) { - fprintf( stderr, "%s: -Z incompatible with version %d\n", - prog, version ); - return EXIT_FAILURE; + + case 'S': /* skipped modifications to file */ + if( rejfile != NULL ) { + fprintf( stderr, _("%s: -S previously specified\n"), prog ); + exit( EXIT_FAILURE ); } - version = LDAP_VERSION3; - use_tls++; -#else - fprintf( stderr, "%s: not compiled with TLS support\n", - prog ); - return( EXIT_FAILURE ); -#endif + rejfile = ber_strdup( optarg ); break; + default: - fprintf( stderr, "%s: unrecognized option -%c\n", - prog, optopt ); - usage( prog ); + return 0; } - } + return 1; +} - if (version == -1) { - version = LDAP_VERSION3; - } - if (authmethod == -1 && version > LDAP_VERSION2) { -#ifdef HAVE_CYRUS_SASL - authmethod = LDAP_AUTH_SASL; -#else - authmethod = LDAP_AUTH_SIMPLE; + +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; + int rc, retval; + int count, len; - if ( argc != optind ) - usage( prog ); + tool_init(); + prog = lutil_progname( "ldapmodify", argc, argv ); - if ( infile != NULL ) { - if (( fp = fopen( infile, "r" )) == NULL ) { - perror( infile ); - return( EXIT_FAILURE ); - } - } else { - fp = stdin; - } + /* strncmp instead of strcmp since NT binaries carry .exe extension */ + ldapadd = ( strncasecmp( prog, "ldapadd", sizeof("ldapadd")-1 ) == 0 ); - if ( debug ) { - if( ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &debug ) != LBER_OPT_SUCCESS ) { - fprintf( stderr, "Could not set LBER_OPT_DEBUG_LEVEL %d\n", debug ); - } - if( ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &debug ) != LDAP_OPT_SUCCESS ) { - fprintf( stderr, "Could not set LDAP_OPT_DEBUG_LEVEL %d\n", debug ); - } - ldif_debug = debug; - } + tool_args( argc, argv ); -#ifdef SIGPIPE - (void) SIGNAL( SIGPIPE, SIG_IGN ); -#endif + if ( argc != optind ) usage(); - if ( !not ) { - if( ( ldaphost != NULL || ldapport ) && ( ldapuri == NULL ) ) { - if ( verbose ) { - fprintf( stderr, "ldap_init( %s, %d )\n", - ldaphost != NULL ? ldaphost : "", - ldapport ); - } - - ld = ldap_init( ldaphost, ldapport ); - if( ld == NULL ) { - perror("ldapsearch: ldap_init"); - return EXIT_FAILURE; + if ( rejfile != NULL ) { + if (( rejfp = fopen( rejfile, "w" )) == NULL ) { + perror( rejfile ); + return( EXIT_FAILURE ); } - } else { - if ( verbose ) { - fprintf( stderr, "ldap_initialize( %s )\n", - ldapuri != NULL ? ldapuri : "" ); - } - - rc = ldap_initialize( &ld, ldapuri ); - if( rc != LDAP_SUCCESS ) { - fprintf( stderr, "Could not create LDAP session handle (%d): %s\n", - rc, ldap_err2string(rc) ); - return EXIT_FAILURE; - } - } - - /* referrals */ - if( ldap_set_option( ld, LDAP_OPT_REFERRALS, - referrals ? LDAP_OPT_ON : LDAP_OPT_OFF ) != LDAP_OPT_SUCCESS ) - { - fprintf( stderr, "Could not set LDAP_OPT_REFERRALS %s\n", - referrals ? "on" : "off" ); - return EXIT_FAILURE; + rejfp = NULL; } - - if (version == -1 ) { - version = 3; - } - - if( ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version ) - != LDAP_OPT_SUCCESS ) - { - fprintf( stderr, "Could not set LDAP_OPT_PROTOCOL_VERSION %d\n", - version ); - return EXIT_FAILURE; - } - - if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) { - if ( use_tls > 1 ) { - ldap_perror( ld, "ldap_start_tls" ); + if ( infile != NULL ) { + if (( fp = fopen( infile, "r" )) == NULL ) { + perror( infile ); return( EXIT_FAILURE ); } - fprintf( stderr, "WARNING: could not start TLS\n" ); + } else { + fp = stdin; } - if (want_bindpw) { - passwd.bv_val = getpassphrase("Enter LDAP Password: "); - passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0; - } + if ( debug ) ldif_debug = debug; - if ( authmethod == LDAP_AUTH_SASL ) { -#ifdef HAVE_CYRUS_SASL - void *defaults; + ld = tool_conn_setup( not, 0 ); - if( sasl_secprops != NULL ) { - rc = ldap_set_option( ld, LDAP_OPT_X_SASL_SECPROPS, - (void *) sasl_secprops ); - - if( rc != LDAP_OPT_SUCCESS ) { - fprintf( stderr, - "Could not set LDAP_OPT_X_SASL_SECPROPS: %s\n", - sasl_secprops ); - return( EXIT_FAILURE ); + if ( !not ) { + if ( pw_file || want_bindpw ) { + if ( pw_file ) { + rc = lutil_get_filed_password( pw_file, &passwd ); + if( rc ) return EXIT_FAILURE; + } else { + passwd.bv_val = getpassphrase( _("Enter LDAP Password: ") ); + passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0; } } - - defaults = lutil_sasl_defaults( ld, - sasl_mech, - sasl_realm, - sasl_authc_id, - passwd.bv_val, - sasl_authz_id ); - - rc = ldap_sasl_interactive_bind_s( ld, binddn, - sasl_mech, NULL, NULL, - sasl_flags, lutil_sasl_interact, defaults ); + tool_bind( ld ); + } + +#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_sasl_interactive_bind_s" ); - return( EXIT_FAILURE ); - } -#else - fprintf( stderr, "%s: not compiled with SASL support\n", - argv[0] ); - return( EXIT_FAILURE ); -#endif - } - else { - if ( ldap_bind_s( ld, binddn, passwd.bv_val, authmethod ) - != LDAP_SUCCESS ) { - ldap_perror( ld, "ldap_bind" ); - return( EXIT_FAILURE ); + ldap_perror( ld, "ldap_txn_create_s" ); + if( txn > 2 ) return EXIT_FAILURE; + txn = 0; } } +#endif - } + if ( assertion || authzid || manageDIT || manageDSAit || noop +#ifdef LDAP_GROUP_TRANSACTION + || txn +#endif + || preread || postread ) + { + int i = 0; + LDAPControl c[1]; + +#ifdef LDAP_GROUP_TRANSACTION + if( txn ) { + int err; + 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; - rc = 0; + c[i].ldctl_oid = LDAP_CONTROL_GROUPING; + c[i].ldctl_iscritical = 1; + i++; + } +#endif - if ( manageDSAit ) { - int err; - LDAPControl c; - LDAPControl *ctrls[2]; - ctrls[0] = &c; - ctrls[1] = NULL; + tool_server_controls( ld, c, i ); + } - c.ldctl_oid = LDAP_CONTROL_MANAGEDSAIT; - c.ldctl_value.bv_val = NULL; - c.ldctl_value.bv_len = 0; - c.ldctl_iscritical = manageDSAit > 1; + rc = 0; + count = 0; + retval = 0; + while (( rc == 0 || contoper ) && + ( rbuf = read_one_record( fp )) != NULL ) + { + count++; - err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, ctrls ); + start = rbuf; - if( err != LDAP_OPT_SUCCESS ) { - fprintf( stderr, "Could not set ManageDSAit %scontrol\n", - c.ldctl_iscritical ? "critical " : "" ); - if( c.ldctl_iscritical ) { + if ( rejfp ) { + len = strlen( rbuf ); + if (( rejbuf = (char *)ber_memalloc( len+1 )) == NULL ) { + perror( "malloc" ); exit( EXIT_FAILURE ); } + memcpy( rejbuf, rbuf, len+1 ); } - } - count = 0; - while (( rc == 0 || contoper ) && - ( rbuf = read_one_record( fp )) != NULL ) { - count++; + rc = process_ldif_rec( start, count ); - start = rbuf; + if ( rc ) retval = rc; + if ( rc && rejfp ) { + fprintf(rejfp, _("# Error: %s (%d)"), ldap_err2string(rc), rc); - rc = process_ldif_rec( start, count ); + matched_msg = NULL; + ldap_get_option(ld, LDAP_OPT_MATCHED_DN, &matched_msg); + if ( matched_msg != NULL ) { + if ( *matched_msg != '\0' ) { + fprintf( rejfp, _(", matched DN: %s"), matched_msg ); + } + ldap_memfree( matched_msg ); + } - if( rc ) - fprintf( stderr, "ldif_record() = %d\n", rc ); + error_msg = NULL; + ldap_get_option(ld, LDAP_OPT_ERROR_STRING, &error_msg); + if ( error_msg != NULL ) { + if ( *error_msg != '\0' ) { + fprintf( rejfp, _(", additional info: %s"), error_msg ); + } + ldap_memfree( error_msg ); + } + fprintf( rejfp, "\n%s\n", rejbuf ); + } + + if (rejfp) free( rejbuf ); free( rbuf ); - } + } - if ( !not ) { - ldap_unbind( ld ); - } +#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 - return( rc ); + if ( !not ) { + tool_unbind( ld ); + } + + if ( rejfp != NULL ) { + fclose( rejfp ); + } + + tool_destroy(); + return( retval ); } 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; - 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; - 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 ( 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 ( 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'; + if ( lutil_atoi( &replicaport, p ) != 0 ) { + fprintf( stderr, _("%s: unable to parse replica port \"%s\" (line %d) entry: \"%s\"\n"), + prog, p, linenum, dn == NULL ? "" : dn ); + rc = LDAP_PARAM_ERROR; + break; + } + } + 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 ) + { + int v; + if( val.bv_len == 0 || lutil_atoi( &v, val.bv_val) != 0 || v != 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:" */ } - if ( ldaphost != NULL && strcasecmp( val.bv_val, ldaphost ) == 0 && - replicaport == ldapport ) { - use_record = 1; + + 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 ...) */ + 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'; + } +#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; + } + goto end_line; + } else if ( ldapadd ) { /* missing changetype => add */ + new_entry = 1; + modop = LDAP_MOD_ADD; + } else { + expect_modop = 1; /* missing changetype => modify */ + } } - } 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 == NULL ? "(null)" : val.bv_val, linenum ); + + 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'; } - version++; +#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; + } + } - } else if ( strcasecmp( type, T_DN_STR ) == 0 ) { - if (( dn = strdup( val.bv_val ? val.bv_val : "" )) == NULL ) { - perror( "strdup" ); - exit( EXIT_FAILURE ); + 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 { + if ( new_entry && strcasecmp( type, T_DN_STR ) == 0 ) { + fprintf( stderr, _("%s: attributeDescription \"%s\":" + " (possible missing newline" + " after line %d of entry \"%s\"?)\n"), + prog, type, linenum - 1, dn ); + } + addmodifyop( &pmods, modop, type, &val ); } - expect_ct = 1; - } - goto end_line; /* skip all lines until we see "dn:" */ - } - if ( expect_ct ) { - expect_ct = 0; - if ( !use_record && saw_replica ) { - printf( "%s: skipping change record for entry: %s\n" - "\t(LDAP host/port does not match replica: lines)\n", - prog, dn ); - free( dn ); +end_line: ber_memfree( type ); ber_memfree( val.bv_val ); - return( 0 ); - } - - if ( strcasecmp( type, T_CHANGETYPESTR ) == 0 ) { - 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 */ - } } - if ( expect_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 { /* no modify op: use default */ - modop = replace ? LDAP_MOD_REPLACE : LDAP_MOD_ADD; - } + if( linenum == 0 ) { + return 0; } - if ( expect_newrdn ) { - if ( strcasecmp( type, T_NEWRDNSTR ) == 0 ) { - if (( newrdn = strdup( val.bv_val ? val.bv_val : "" )) == NULL ) { - perror( "strdup" ); - exit( EXIT_FAILURE ); + if( version && linenum == 1 ) { + 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; /* 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; ildctl_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); + + return( rc ); } @@ -1013,100 +960,133 @@ static int domodify( const char *dn, LDAPMod **pmods, + LDAPControl **pctrls, int newentry ) { - int i, j, k, notascii, op; - struct berval *bvp; - - 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 )) { - fprintf( stderr, - "%s: attribute \"%s\" has no values (entry=\"%s\")\n", - prog, pmods[i]->mod_type, dn ); - return LDAP_PARAM_ERROR; + int rc, i, j, k, notascii, op; + struct berval *bvp; + + if ( dn == NULL ) { + fprintf( stderr, _("%s: no DN specified\n"), prog ); + 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" : "delete", 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 ( pmods == NULL ) { + /* implement "touch" (empty sequence) + * modify operation (note that there + * is no symmetry with the UNIX command, + * since \"touch\" on a non-existent entry + * will fail)*/ + printf( "warning: no attributes to %sadd (entry=\"%s\")\n", + newentry ? "" : "change or ", dn ); + + } else { + 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 )) { + fprintf( stderr, + _("%s: attribute \"%s\" has no values (entry=\"%s\")\n"), + prog, pmods[i]->mod_type, dn ); + return LDAP_PARAM_ERROR; } - } - if ( notascii ) { - printf( "\tNOT ASCII (%ld bytes)\n", bvp->bv_len ); - } else { - printf( "\t%s\n", bvp->bv_val ); - } } - } - } - } - 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_s( ld, dn, pmods ); + printf( "%sadding new entry \"%s\"\n", not ? "!" : "", dn ); } else { - i = ldap_modify_s( ld, dn, pmods ); + printf( "%smodifying entry \"%s\"\n", not ? "!" : "", dn ); } - if ( i != LDAP_SUCCESS ) { - ldap_perror( ld, newentry ? "ldap_add" : "ldap_modify" ); - } else if ( verbose ) { - printf( "modify complete\n" ); - } - } else { - i = LDAP_SUCCESS; - } - putchar( '\n' ); + if ( !not ) { + int msgid; + if ( newentry ) { + rc = ldap_add_ext( ld, dn, pmods, pctrls, NULL, &msgid ); + } else { + rc = ldap_modify_ext( ld, dn, pmods, pctrls, NULL, &msgid ); + } + + if ( rc != 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" ); + goto done; + } else if ( verbose ) { + printf( _("modify complete\n") ); + } + + rc = process_response( ld, msgid, + newentry ? "ldap_add" : "ldap_modify", dn ); + + } else { + rc = LDAP_SUCCESS; + } - return( i ); +done: + putchar( '\n' ); + return rc; } static int dodelete( - const char *dn ) + const char *dn, + LDAPControl **pctrls ) { - int rc; - - printf( "%sdeleting entry \"%s\"\n", not ? "!" : "", dn ); - if ( !not ) { - if (( rc = ldap_delete_s( ld, dn )) != LDAP_SUCCESS ) { - ldap_perror( ld, "ldap_delete" ); - } else if ( verbose ) { - printf( "delete complete" ); - } - } else { - rc = LDAP_SUCCESS; - } + int rc; + int msgid; + + printf( _("%sdeleting entry \"%s\"\n"), not ? "!" : "", dn ); + if ( !not ) { + rc = ldap_delete_ext( ld, dn, pctrls, NULL, &msgid ); + if ( rc != LDAP_SUCCESS ) { + fprintf( stderr, _("%s: delete failed: %s\n"), prog, dn ); + ldap_perror( ld, "ldap_delete" ); + goto done; + } else if ( verbose ) { + printf( _("delete complete") ); + } - putchar( '\n' ); + rc = process_response( ld, msgid, "ldap_delete", dn ); - return( rc ); + } else { + rc = LDAP_SUCCESS; + } + +done: + putchar( '\n' ); + return( rc ); } @@ -1115,46 +1095,104 @@ dorename( const char *dn, const char *newrdn, const char* newsup, - int deleteoldrdn ) + int deleteoldrdn, + LDAPControl **pctrls ) { - int rc; + int rc; + int msgid; + 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( ld, dn, newrdn, newsup, deleteoldrdn, + pctrls, NULL, &msgid ); + if ( rc != LDAP_SUCCESS ) { + fprintf( stderr, _("%s: rename failed: %s\n"), prog, dn ); + ldap_perror( ld, "ldap_rename" ); + goto done; + } else { + printf( _("rename completed\n") ); + } + + rc = process_response( ld, msgid, "ldap_rename", dn ); - 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_rename2_s( ld, dn, newrdn, newsup, deleteoldrdn )) - != LDAP_SUCCESS ) { - ldap_perror( ld, "ldap_modrdn" ); } else { - printf( "modrdn completed\n" ); + rc = LDAP_SUCCESS; } - } else { - rc = LDAP_SUCCESS; - } - - putchar( '\n' ); - return( rc ); +done: + putchar( '\n' ); + return( rc ); } +static int process_response( + LDAP *ld, + int msgid, + const char *opstr, + const char *dn ) +{ + LDAPMessage *res; + int rc = LDAP_OTHER; + struct timeval tv = { 0, 0 }; + + for ( ; ; ) { + tv.tv_sec = 0; + tv.tv_usec = 100000; + + rc = ldap_result( ld, msgid, +#ifdef LDAP_GROUP_TRANSACTION + txn ? 0 : 1, +#else + 1, +#endif + &tv, &res ); + if ( tool_check_abandon( ld, msgid ) ) { + return LDAP_CANCELLED; + } + + if ( rc == -1 ) { + ldap_get_option( ld, LDAP_OPT_ERROR_NUMBER, &rc ); + tool_perror( "ldap_result", rc, NULL, NULL, NULL, NULL ); + return rc; + } + + if ( rc != 0 ) { + break; + } + } + + if ( ldap_msgtype( res ) != LDAP_RES_INTERMEDIATE ) { + rc = ldap_result2error( ld, res, 1 ); + if( rc != LDAP_SUCCESS ) ldap_perror( ld, opstr ); + return rc; + } + +#ifdef LDAP_GROUP_TRANSACTION + /* assume (successful) transaction intermediate response */ + return LDAP_SUCCESS; + +#else + /* intermediate response? */ + return LDAP_DECODING_ERROR; +#endif +} 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 ) { + if( len < 2 || ( len == 2 && *line == '\r' )) { if( buf == NULL ) { continue; } else { @@ -1166,7 +1204,7 @@ read_one_record( FILE *fp ) lmax = LDAPMOD_MAXLINE * (( lcur + len + 1 ) / LDAPMOD_MAXLINE + 1 ); - if (( buf = (char *)realloc( buf, lmax )) == NULL ) { + if (( buf = (char *)ber_memrealloc( buf, lmax )) == NULL ) { perror( "realloc" ); exit( EXIT_FAILURE ); } @@ -1174,7 +1212,9 @@ read_one_record( FILE *fp ) strcpy( buf + lcur, line ); lcur += len; - } + } - return( buf ); + return( buf ); } + +