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;
#endif
static int use_tls = 0;
static int ldapadd, replace, not, verbose, contoper, force;
-static LDAP *ld;
+static LDAP *ld = NULL;
#define LDAPMOD_MAXLINE 4096
" 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\t\tadd values (default%s)\n"
-" -r\t\treplace values\n"
-" -F\t\tforce all changes records to be used\n"
-
-"common options:\n"
-" -c\t\tcontinuous operation (ignore errors)\n"
-" -C\t\tchase referrals\n"
-" -d level\tset LDAP debugging level to `level'\n"
-" -D dn\t\tbind DN\n"
-" -f file\t\tread operations from `file'\n"
-" -h host\t\tLDAP server\n"
-" -k\t\tuse Kerberos authentication\n"
-" -K\t\tlike -k, but do only step 1 of the Kerberos bind\n"
-" -M\t\tenable Manage DSA IT control (-MM to make it critical)\n"
-" -n\t\tprint changes, don't actually do them\n"
-" -O secprops\tSASL security properties\n"
-" -p port\t\tport on LDAP server\n"
-" -U user\t\tSASL authentication identity (username)\n"
-" -v\t\tverbose mode\n"
-" -w passwd\tbind password (for Simple authentication)\n"
-" -X id\t\tSASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
-" -Y mech\t\tSASL mechanism\n"
-" -Z\t\tissue Start TLS request (-ZZ to require successful response)\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 authcid SASL authentication identity\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 authzid SASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\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 );
authmethod = -1;
version = -1;
- while (( i = getopt( argc, argv, "acrf:F" "Cd:D:h:kKMnO:p:P:U:vw:WxX:Y:Z" )) != EOF ) {
+ 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 */
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 */
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 ) {
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",
+ fprintf( stderr, "%s: -O incompatible with LDAPv%d\n",
prog, version );
return EXIT_FAILURE;
}
"authentication choice\n", prog );
return EXIT_FAILURE;
}
- sasl_secprops = strdup( optarg );
authmethod = LDAP_AUTH_SASL;
version = LDAP_VERSION3;
+ sasl_secprops = strdup( optarg );
#else
fprintf( stderr, "%s: not compiled with SASL support\n",
prog );
#endif
break;
case 'p':
+ if( ldapport ) {
+ fprintf( stderr, "%s: -p previously specified\n", prog );
+ return EXIT_FAILURE;
+ }
ldapport = atoi( optarg );
break;
case 'P':
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 );
}
authmethod = LDAP_AUTH_SASL;
version = LDAP_VERSION3;
-
sasl_authc_id = strdup( optarg );
- authmethod = LDAP_AUTH_SASL;
#else
- fprintf( stderr, "%s: was not compiled with SASL support\n",
+ fprintf( stderr, "%s: not compiled with SASL support\n",
prog );
return( EXIT_FAILURE );
#endif
{
char* p;
- for( p = optarg; *p == '\0'; p++ ) {
- *p = '*';
+ for( p = optarg; *p != '\0'; p++ ) {
+ *p = '\0';
}
}
passwd.bv_len = strlen( passwd.bv_val );
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 );
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: was not compiled with SASL support\n",
+ fprintf( stderr, "%s: not compiled with SASL support\n",
prog );
return( EXIT_FAILURE );
#endif
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 );
}
authmethod = LDAP_AUTH_SASL;
version = LDAP_VERSION3;
-
sasl_authz_id = strdup( optarg );
- authmethod = LDAP_AUTH_SASL;
#else
fprintf( stderr, "%s: not compiled with SASL support\n",
prog );
case 'Z':
#ifdef HAVE_TLS
if( version == LDAP_VERSION2 ) {
- fprintf( stderr, "%s -Z incompatible with version %d\n",
+ fprintf( stderr, "%s: -Z incompatible with version %d\n",
prog, version );
return EXIT_FAILURE;
}
#endif
break;
default:
+ fprintf( stderr, "%s: unrecognized option -%c\n",
+ prog, optopt );
usage( prog );
}
}
(void) SIGNAL( SIGPIPE, SIG_IGN );
#endif
+#ifdef NEW_LOGGING
+ lutil_log_initialize( argc, argv );
+#endif
+
if ( !not ) {
- if (( ld = ldap_init( ldaphost, ldapport )) == NULL ) {
- perror( "ldap_init" );
- return( EXIT_FAILURE );
+ if( ( ldaphost != NULL || ldapport ) && ( ldapuri == NULL ) ) {
+ if ( verbose ) {
+ fprintf( stderr, "ldap_init( %s, %d )\n",
+ ldaphost != NULL ? ldaphost : "<DEFAULT>",
+ ldapport );
+ }
+
+ ld = ldap_init( ldaphost, ldapport );
+ if( ld == NULL ) {
+ perror("ldapsearch: ldap_init");
+ return EXIT_FAILURE;
+ }
+
+ } else {
+ if ( verbose ) {
+ fprintf( stderr, "ldap_initialize( %s )\n",
+ ldapuri != NULL ? ldapuri : "<DEFAULT>" );
+ }
+
+ 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 (version == -1 ) {
- version = 3;
+ version = LDAP_VERSION3;
}
if( ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version )
}
if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) {
+ ldap_perror( ld, "ldap_start_tls" );
if ( use_tls > 1 ) {
- ldap_perror( ld, "ldap_start_tls" );
return( EXIT_FAILURE );
}
- fprintf( stderr, "WARNING: could not start TLS\n" );
}
if (want_bindpw) {
if ( authmethod == LDAP_AUTH_SASL ) {
#ifdef HAVE_CYRUS_SASL
+ void *defaults;
+
if( sasl_secprops != NULL ) {
rc = ldap_set_option( ld, LDAP_OPT_X_SASL_SECPROPS,
(void *) sasl_secprops );
}
}
+ 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, lutil_sasl_interact );
+ sasl_mech, NULL, NULL,
+ sasl_flags, lutil_sasl_interact, defaults );
if( rc != LDAP_SUCCESS ) {
ldap_perror( ld, "ldap_sasl_interactive_bind_s" );
return( EXIT_FAILURE );
}
#else
- fprintf( stderr, "%s was not compiled with SASL support\n",
+ fprintf( stderr, "%s: not compiled with SASL support\n",
argv[0] );
return( EXIT_FAILURE );
#endif
c.ldctl_value.bv_len = 0;
c.ldctl_iscritical = manageDSAit > 1;
- err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, &ctrls );
+ err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, ctrls );
if( err != LDAP_OPT_SUCCESS ) {
fprintf( stderr, "Could not set ManageDSAit %scontrol\n",
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;
+ }
}
if ( verbose ) {
projects / openldap / blobdiff