From 647df2b9cbf3002485de8f7c8cd3afdc18034139 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sun, 14 Mar 2004 23:32:00 +0000 Subject: [PATCH] Start of client-side LDAP tranactions (non-working) and lots of cleanup (hence the commit) (ldapmodify will need much more work for transactions) --- clients/tools/ldapmodify.c | 1133 +++++++++++++++++-------------- clients/tools/ldapsearch.c | 74 +- include/ldap.h | 41 ++ libraries/libldap/Makefile.in | 4 +- libraries/libldap/cancel.c | 4 + libraries/libldap/groupings.c | 30 + libraries/libldap/passwd.c | 4 + libraries/libldap/txn.c | 48 ++ libraries/libldap/whoami.c | 4 + libraries/libldap_r/Makefile.in | 4 +- 10 files changed, 798 insertions(+), 548 deletions(-) create mode 100644 libraries/libldap/groupings.c create mode 100644 libraries/libldap/txn.c diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c index 7ccd816c60..331c99a855 100644 --- a/clients/tools/ldapmodify.c +++ b/clients/tools/ldapmodify.c @@ -75,10 +75,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_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" @@ -88,10 +88,10 @@ static LDAP *ld = NULL; #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 )); @@ -103,46 +103,59 @@ static void addmodifyop LDAP_P(( 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"), @@ -166,17 +179,40 @@ handle_private_option( int i ) *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; @@ -199,6 +235,10 @@ handle_private_option( int i ) 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; @@ -250,12 +290,55 @@ main( int argc, char **argv ) 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 ) && @@ -304,6 +387,18 @@ main( int argc, char **argv ) 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 ); } @@ -319,234 +414,239 @@ main( int argc, char **argv ) 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; @@ -556,72 +656,71 @@ end_line: 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; 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; + /* 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 ); } @@ -835,114 +938,115 @@ static int 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 ); } @@ -952,45 +1056,44 @@ dorename( 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 ) { @@ -1012,9 +1115,9 @@ read_one_record( FILE *fp ) strcpy( buf + lcur, line ); lcur += len; - } + } - return( buf ); + return( buf ); } diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c index 5a8240d2fe..633170c73d 100644 --- a/clients/tools/ldapsearch.c +++ b/clients/tools/ldapsearch.c @@ -102,7 +102,7 @@ usage( void ) fprintf( stderr, _(" -a deref one of never (default), always, search, or find\n")); fprintf( stderr, _(" -A retrieve attribute names only (no values)\n")); fprintf( stderr, _(" -b basedn base dn for search\n")); - fprintf( stderr, _(" -E [!][=] search extensions (! indicates criticality)\n")); + fprintf( stderr, _(" -E [!][=] search extensions (! indicates criticality)\n")); #ifdef LDAP_CONTROL_X_DOMAIN_SCOPE fprintf( stderr, _(" [!]domainScope (domain scope)\n")); #endif @@ -237,23 +237,24 @@ handle_private_option( int i ) switch ( i ) { case 'a': /* set alias deref option */ if ( strcasecmp( optarg, "never" ) == 0 ) { - deref = LDAP_DEREF_NEVER; + deref = LDAP_DEREF_NEVER; } else if ( strncasecmp( optarg, "search", sizeof("search")-1 ) == 0 ) { - deref = LDAP_DEREF_SEARCHING; + deref = LDAP_DEREF_SEARCHING; } else if ( strncasecmp( optarg, "find", sizeof("find")-1 ) == 0 ) { - deref = LDAP_DEREF_FINDING; + deref = LDAP_DEREF_FINDING; } else if ( strcasecmp( optarg, "always" ) == 0 ) { - deref = LDAP_DEREF_ALWAYS; + deref = LDAP_DEREF_ALWAYS; } else { - fprintf( stderr, _("alias deref should be never, search, find, or always\n") ); - usage(); + fprintf( stderr, + _("alias deref should be never, search, find, or always\n") ); + usage(); } break; case 'A': /* retrieve attribute names only -- no values */ ++attrsonly; break; case 'b': /* search base */ - base = strdup( optarg ); + base = ber_strdup( optarg ); break; case 'E': /* search extensions */ if( protocol == LDAP_VERSION2 ) { @@ -273,7 +274,7 @@ handle_private_option( int i ) optarg++; } - control = strdup( optarg ); + control = ber_strdup( optarg ); if ( (cvalue = strchr( control, '=' )) != NULL ) { *cvalue++ = '\0'; } @@ -281,7 +282,8 @@ handle_private_option( int i ) if ( strcasecmp( control, "mv" ) == 0 ) { /* ValuesReturnFilter control */ if( valuesReturnFilter ) { - fprintf( stderr, _("ValuesReturnFilter previously specified\n")); + fprintf( stderr, + _("ValuesReturnFilter previously specified\n")); exit( EXIT_FAILURE ); } valuesReturnFilter= 1 + crit; @@ -300,7 +302,8 @@ handle_private_option( int i ) int num, tmp; /* PagedResults control */ if ( pagedResults != 0 ) { - fprintf( stderr, _("PagedResultsControl previously specified\n") ); + fprintf( stderr, + _("PagedResultsControl previously specified\n") ); exit( EXIT_FAILURE ); } @@ -315,17 +318,22 @@ handle_private_option( int i ) } else if ( strcasecmp( promptp, "noprompt" ) == 0) { pagePrompt = 0; } else { - fprintf( stderr, _("Invalid value for PagedResultsControl, %s/%s.\n"), cvalue, promptp); + fprintf( stderr, + _("Invalid value for PagedResultsControl," + " %s/%s.\n"), cvalue, promptp ); exit( EXIT_FAILURE ); } } num = sscanf( cvalue, "%d", &tmp ); if ( num != 1 ) { - fprintf( stderr, _("Invalid value for PagedResultsControl, %s.\n"), cvalue); + fprintf( stderr, + _("Invalid value for PagedResultsControl, %s.\n"), + cvalue ); exit( EXIT_FAILURE ); } } else { - fprintf( stderr, _("Invalid value for PagedResultsControl.\n"), cvalue); + fprintf( stderr, _("Invalid value for PagedResultsControl.\n"), + cvalue); exit( EXIT_FAILURE ); } pageSize = (ber_int_t) tmp; @@ -350,7 +358,8 @@ handle_private_option( int i ) #ifdef LDAP_CONTROL_SUBENTRIES } else if ( strcasecmp( control, "subentries" ) == 0 ) { if( subentries ) { - fprintf( stderr, _("subentries control previously specified\n")); + fprintf( stderr, + _("subentries control previously specified\n")); exit( EXIT_FAILURE ); } if( cvalue == NULL || strcasecmp( cvalue, "true") == 0 ) { @@ -370,12 +379,11 @@ handle_private_option( int i ) char *cookiep; char *slimitp; if ( ldapsync ) { - fprintf( stderr, _("ldap sync control previously specified\n") ); + fprintf( stderr, _("sync control previously specified\n") ); exit( EXIT_FAILURE ); } if ( cvalue == NULL ) { - fprintf( stderr, - _("missing specification of ldap sync control\n")); + fprintf( stderr, _("missing specification of sync control\n")); exit( EXIT_FAILURE ); } if ( strncasecmp( cvalue, "ro", 2 ) == 0 ) { @@ -403,15 +411,15 @@ handle_private_option( int i ) if ( slimitp != NULL && *slimitp != '\0' ) sync_slimit = atoi( slimitp ); } else { - fprintf( stderr, - _("ldap sync control value \"%s\" invalid\n"), + fprintf( stderr, _("sync control value \"%s\" invalid\n"), cvalue ); exit( EXIT_FAILURE ); } if ( crit ) ldapsync *= -1; } else { - fprintf( stderr, _("Invalid search extension name: %s\n"), control ); + fprintf( stderr, _("Invalid search extension name: %s\n"), + control ); usage(); } break; @@ -442,8 +450,8 @@ handle_private_option( int i ) } else if ( strncasecmp( optarg, "sub", sizeof("sub")-1 ) == 0 ) { scope = LDAP_SCOPE_SUBTREE; } else { - fprintf( stderr, _("scope should be base, one, or sub\n") ); - usage(); + fprintf( stderr, _("scope should be base, one, or sub\n") ); + usage(); } break; case 'S': /* sort attribute */ @@ -473,21 +481,25 @@ static void private_conn_setup( LDAP *ld ) { if (deref != -1 && - ldap_set_option( ld, LDAP_OPT_DEREF, (void *) &deref ) != LDAP_OPT_SUCCESS ) + ldap_set_option( ld, LDAP_OPT_DEREF, (void *) &deref ) + != LDAP_OPT_SUCCESS ) { fprintf( stderr, _("Could not set LDAP_OPT_DEREF %d\n"), deref ); exit( EXIT_FAILURE ); } if (timelimit != -1 && - ldap_set_option( ld, LDAP_OPT_TIMELIMIT, (void *) &timelimit ) != LDAP_OPT_SUCCESS ) + ldap_set_option( ld, LDAP_OPT_TIMELIMIT, (void *) &timelimit ) + != LDAP_OPT_SUCCESS ) { fprintf( stderr, _("Could not set LDAP_OPT_TIMELIMIT %d\n"), timelimit ); exit( EXIT_FAILURE ); } if (sizelimit != -1 && - ldap_set_option( ld, LDAP_OPT_SIZELIMIT, (void *) &sizelimit ) != LDAP_OPT_SUCCESS ) + ldap_set_option( ld, LDAP_OPT_SIZELIMIT, (void *) &sizelimit ) + != LDAP_OPT_SUCCESS ) { - fprintf( stderr, _("Could not set LDAP_OPT_SIZELIMIT %d\n"), sizelimit ); + fprintf( stderr, + _("Could not set LDAP_OPT_SIZELIMIT %d\n"), sizelimit ); exit( EXIT_FAILURE ); } } @@ -715,9 +727,13 @@ getNextPage: tool_server_controls( ld, c, i ); +#ifdef LDAP_CONTROL_SUBENTRIES ber_free( seber, 1 ); +#endif ber_free( vrber, 1 ); +#ifdef LDAP_CONTROL_PAGEDRESULTS ber_free( prber, 1 ); +#endif } if ( verbose ) { @@ -1121,8 +1137,8 @@ print_entry( } else if ( bvals ) { for ( i = 0; bvals[i].bv_val != NULL; i++ ) { - if ( vals2tmp > 1 || ( vals2tmp - && ldif_is_not_printable( bvals[i].bv_val, bvals[i].bv_len ) )) + if ( vals2tmp > 1 || ( vals2tmp && + ldif_is_not_printable( bvals[i].bv_val, bvals[i].bv_len ))) { int tmpfd; /* write value to file */ diff --git a/include/ldap.h b/include/ldap.h index e2be9c0242..043cfb9263 100644 --- a/include/ldap.h +++ b/include/ldap.h @@ -1835,6 +1835,47 @@ ldap_parse_vlv_control LDAP_P(( struct berval **contextp, int *errcodep )); +/* + * LDAP Transactions + * in txn.c + */ +LDAP_F( int ) +ldap_parse_txn_create LDAP_P(( + LDAP *ld, + LDAPMessage *res, + struct berval **cookie )); + +LDAP_F( int ) +ldap_txn_create LDAP_P(( + LDAP *ld, + LDAPControl **sctrls, + LDAPControl **cctrls, + int *msgidp )); + +LDAP_F( int ) +ldap_txn_create_s LDAP_P(( + LDAP *ld, + struct berval **cookie, + LDAPControl **sctrls, + LDAPControl **cctrls )); + +LDAP_F( int ) +ldap_txn_end LDAP_P(( + LDAP *ld, + struct berval *cookie, + int commit, + LDAPControl **sctrls, + LDAPControl **cctrls, + int *msgidp )); + +LDAP_F( int ) +ldap_txn_end_s LDAP_P(( + LDAP *ld, + struct berval *cookie, + int commit, + LDAPControl **sctrls, + LDAPControl **cctrls )); + /* * LDAP Who Am I? * in whoami.c diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in index dddebdada4..ab687b6877 100644 --- a/libraries/libldap/Makefile.in +++ b/libraries/libldap/Makefile.in @@ -26,7 +26,7 @@ SRCS = bind.c open.c result.c error.c compare.c search.c \ request.c os-ip.c url.c sortctrl.c vlvctrl.c \ init.c options.c print.c string.c util-int.c schema.c \ charray.c tls.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ - pcontrol.c + groupings.c txn.c ppcontrol.c OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ controls.lo messages.lo references.lo extended.lo cyrus.lo \ @@ -37,7 +37,7 @@ OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ request.lo os-ip.lo url.lo sortctrl.lo vlvctrl.lo \ init.lo options.lo print.lo string.lo util-int.lo schema.lo \ charray.lo tls.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ - ppcontrol.lo + groupings.lo txn.lo ppcontrol.lo LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries diff --git a/libraries/libldap/cancel.c b/libraries/libldap/cancel.c index 82b6852bea..21af93145d 100644 --- a/libraries/libldap/cancel.c +++ b/libraries/libldap/cancel.c @@ -12,6 +12,10 @@ * top-level directory of the distribution or, alternatively, at * . */ +/* ACKNOWLEDGEMENTS: + * This program was orignally developed by Kurt D. Zeilenga for inclusion in + * OpenLDAP Software. + */ /* * LDAPv3 Cancel Operation Request diff --git a/libraries/libldap/groupings.c b/libraries/libldap/groupings.c new file mode 100644 index 0000000000..42f6e9528e --- /dev/null +++ b/libraries/libldap/groupings.c @@ -0,0 +1,30 @@ +/* $OpenLDAP$ */ +/* This work is part of OpenLDAP Software . + * + * Copyright 2004 The OpenLDAP Foundation. + * 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 + * . + */ +/* ACKNOWLEDGEMENTS: + * This program was orignally developed by Kurt D. Zeilenga for inclusion in + * OpenLDAP Software. + */ + +#include "portable.h" + +#include + +#include +#include + +#include "ldap-int.h" + + + diff --git a/libraries/libldap/passwd.c b/libraries/libldap/passwd.c index 7fbc0cf900..57428292c8 100644 --- a/libraries/libldap/passwd.c +++ b/libraries/libldap/passwd.c @@ -12,6 +12,10 @@ * top-level directory of the distribution or, alternatively, at * . */ +/* ACKNOWLEDGEMENTS: + * This program was orignally developed by Kurt D. Zeilenga for inclusion in + * OpenLDAP Software. + */ #include "portable.h" diff --git a/libraries/libldap/txn.c b/libraries/libldap/txn.c new file mode 100644 index 0000000000..575eb49bb5 --- /dev/null +++ b/libraries/libldap/txn.c @@ -0,0 +1,48 @@ +/* $OpenLDAP$ */ +/* This work is part of OpenLDAP Software . + * + * Copyright 2004 The OpenLDAP Foundation. + * 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 + * . + */ +/* ACKNOWLEDGEMENTS: + * This program was orignally developed by Kurt D. Zeilenga for inclusion in + * OpenLDAP Software. + */ + +#include "portable.h" + +#include + +#include +#include + +#include "ldap-int.h" + +int +ldap_txn_create_s( + LDAP *ld, + struct berval **cookie, + LDAPControl **sctrls, + LDAPControl **cctrls ) +{ + return LDAP_NOT_SUPPORTED; +} + +int +ldap_txn_end_s( + LDAP *ld, + struct berval *cookie, + int commit, + LDAPControl **sctrls, + LDAPControl **cctrls ) +{ + return LDAP_NOT_SUPPORTED; +} diff --git a/libraries/libldap/whoami.c b/libraries/libldap/whoami.c index fc83e5f2cb..9f1a3b3b5c 100644 --- a/libraries/libldap/whoami.c +++ b/libraries/libldap/whoami.c @@ -12,6 +12,10 @@ * top-level directory of the distribution or, alternatively, at * . */ +/* ACKNOWLEDGEMENTS: + * This program was orignally developed by Kurt D. Zeilenga for inclusion in + * OpenLDAP Software. + */ #include "portable.h" diff --git a/libraries/libldap_r/Makefile.in b/libraries/libldap_r/Makefile.in index 688957da8a..7cb84a79f3 100644 --- a/libraries/libldap_r/Makefile.in +++ b/libraries/libldap_r/Makefile.in @@ -28,7 +28,7 @@ XXSRCS = apitest.c test.c \ request.c os-ip.c url.c sortctrl.c vlvctrl.c \ init.c options.c print.c string.c util-int.c schema.c \ charray.c tls.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ - ppcontrol.c + groupings.c txn.c ppcontrol.c SRCS = threads.c rdwr.c tpool.c rq.c \ thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \ thr_pth.c thr_stub.c @@ -44,7 +44,7 @@ OBJS = threads.lo rdwr.lo tpool.lo rq.lo \ request.lo os-ip.lo url.lo sortctrl.lo vlvctrl.lo \ init.lo options.lo print.lo string.lo util-int.lo schema.lo \ charray.lo tls.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ - ppcontrol.lo + groupings.lo txn.lo ppcontrol.lo LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries -- 2.39.5