" -p port port on LDAP server\n"
" -Q use SASL Quiet mode\n"
" -R realm SASL realm\n"
-" -U user SASL authentication identity (username)\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 id SASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\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"
, s );
{
char* p;
- for( p = optarg; *p == '\0'; p++ ) {
+ for( p = optarg; *p != '\0'; p++ ) {
*p = '\0';
}
}
{
char* p;
- for( p = optarg; *p == '\0'; p++ ) {
+ for( p = optarg; *p != '\0'; p++ ) {
*p = '\0';
}
}
break;
case 'D': /* bind DN */
if( binddn != NULL ) {
- fprintf( stderr, "%s: -D previously specified\n" );
+ 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" );
+ fprintf( stderr, "%s: -h incompatible with -H\n", prog );
return EXIT_FAILURE;
}
if( ldaphost != NULL ) {
- fprintf( stderr, "%s: -h previously specified\n" );
+ 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" );
+ fprintf( stderr, "%s: -H incompatible with -h\n", prog );
return EXIT_FAILURE;
}
if( ldapport ) {
- fprintf( stderr, "%s: -H incompatible with -p\n" );
+ fprintf( stderr, "%s: -H incompatible with -p\n", prog );
return EXIT_FAILURE;
}
if( ldapuri != NULL ) {
- fprintf( stderr, "%s: -H previously specified\n" );
+ fprintf( stderr, "%s: -H previously specified\n", prog );
return EXIT_FAILURE;
}
ldapuri = strdup( optarg );
case 'O':
#ifdef HAVE_CYRUS_SASL
if( sasl_secprops != NULL ) {
- fprintf( stderr, "%s: -O previously specified\n" );
+ fprintf( stderr, "%s: -O previously specified\n", prog );
return EXIT_FAILURE;
}
if( version == LDAP_VERSION2 ) {
break;
case 'p':
if( ldapport ) {
- fprintf( stderr, "%s: -p previously specified\n" );
+ fprintf( stderr, "%s: -p previously specified\n", prog );
return EXIT_FAILURE;
}
ldapport = atoi( optarg );
case 'R':
#ifdef HAVE_CYRUS_SASL
if( sasl_realm != NULL ) {
- fprintf( stderr, "%s: -R previously specified\n" );
+ fprintf( stderr, "%s: -R previously specified\n", prog );
return EXIT_FAILURE;
}
if( version == LDAP_VERSION2 ) {
case 'U':
#ifdef HAVE_CYRUS_SASL
if( sasl_authc_id != NULL ) {
- fprintf( stderr, "%s: -U previously specified\n" );
+ fprintf( stderr, "%s: -U previously specified\n", prog );
return EXIT_FAILURE;
}
if( version == LDAP_VERSION2 ) {
{
char* p;
- for( p = optarg; *p == '\0'; p++ ) {
+ for( p = optarg; *p != '\0'; p++ ) {
*p = '\0';
}
}
case 'Y':
#ifdef HAVE_CYRUS_SASL
if( sasl_mech != NULL ) {
- fprintf( stderr, "%s: -Y previously specified\n" );
+ fprintf( stderr, "%s: -Y previously specified\n", prog );
return EXIT_FAILURE;
}
if( version == LDAP_VERSION2 ) {
case 'X':
#ifdef HAVE_CYRUS_SASL
if( sasl_authz_id != NULL ) {
- fprintf( stderr, "%s: -X previously specified\n" );
+ fprintf( stderr, "%s: -X previously specified\n", prog );
return EXIT_FAILURE;
}
if( version == LDAP_VERSION2 ) {
default:
- fprintf( stderr, "%s: unrecongized option -%c\n",
+ fprintf( stderr, "%s: unrecognized option -%c\n",
prog, optopt );
usage (argv[0]);
}
if (want_bindpw && passwd.bv_val == NULL ) {
/* handle bind password */
- fprintf( stderr, "Bind DN: %s\n", binddn );
passwd.bv_val = strdup( getpassphrase("Enter bind password: "));
passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0;
}
}
/* LDAPv3 only */
- version = 3;
+ version = LDAP_VERSION3;
rc = ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version );
if(rc != LDAP_OPT_SUCCESS ) {
}
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 ( authmethod == LDAP_AUTH_SASL ) {
if( oldpw != NULL ) {
ber_printf( ber, "ts",
- LDAP_TAG_EXOP_X_MODIFY_PASSWD_NEW, oldpw );
+ LDAP_TAG_EXOP_X_MODIFY_PASSWD_OLD, oldpw );
free(oldpw);
}