/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/* ldapmodrdn.c - generic program to modify an entry's RDN using LDAP.
#include <ac/unistd.h>
#include <ldap.h>
+#include "lutil.h"
#include "lutil_ldap.h"
#include "ldap_defaults.h"
" -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"
+" -n show what would be done but don't actually update\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"
+" -U authzid 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 );
infile = NULL;
not = contoper = verbose = remove = want_bindpw =
debug = manageDSAit = referrals = 0;
- authmethod = LDAP_AUTH_SIMPLE;
+ authmethod = -1;
version = -1;
- prog = (prog = strrchr(argv[0], *LDAP_DIRSEP)) == NULL ? argv[0] : prog + 1;
+ prog = lutil_progname( "ldapmodrdn", argc, argv );
- while (( i = getopt( argc, argv, "cf:rs:" "Cd:D:h:H:IkKMnO:p:P:QRU:vw:WxX:Y:Z" )) != EOF ) {
+ while (( i = getopt( argc, argv, "cf:rs:"
+ "Cd:D:h:H:IkKMnO:p:P:QR:U:vw:WxX:Y:Z" )) != EOF )
+ {
switch( i ) {
/* Modrdn Options */
case 'c':
break;
case 'f': /* read from file */
if( infile != NULL ) {
- fprintf( stderr, "%s: -f previously specified\n" );
+ fprintf( stderr, "%s: -f previously specified\n", prog );
return EXIT_FAILURE;
}
infile = strdup( optarg );
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 ) {
#endif
break;
default:
- fprintf( stderr, "%s: unrecongized option -%c\n",
+ fprintf( stderr, "%s: unrecognized option -%c\n",
prog, optopt );
- usage( argv[0] );
+ usage( prog );
return( EXIT_FAILURE );
}
}
} else if ( argc - optind != 0 ) {
fprintf( stderr, "%s: invalid number of arguments (%d), "
"only two allowed\n", prog, argc-optind );
- usage( argv[0] );
+ usage( prog );
return( EXIT_FAILURE );
}
ldaphost != NULL ? ldaphost : "<DEFAULT>",
ldapport );
}
+
ld = ldap_init( ldaphost, ldapport );
+ if( ld == NULL ) {
+ perror("ldapmodify: ldap_init");
+ return EXIT_FAILURE;
+ }
} else {
if ( verbose ) {
fprintf( stderr, "ldap_initialize( %s )\n",
ldapuri != NULL ? ldapuri : "<DEFAULT>" );
}
- (void) ldap_initialize( &ld, ldapuri );
- }
- if( ld == NULL ) {
- fprintf( stderr, "Could not create LDAP session handle (%d): %s\n",
- rc, ldap_err2string(rc) );
- return EXIT_FAILURE;
+ 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 */
return EXIT_FAILURE;
}
- if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_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 (want_bindpw) {
}
#else
fprintf( stderr, "%s: not compiled with SASL support\n",
- argv[0] );
+ prog );
return( EXIT_FAILURE );
#endif
}
projects / openldap / blobdiff