mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-30 11:39:34 -05:00
Updated Kerberos code, added password prompting, more detailed usage(). <dave@tamos.net>
This commit is contained in:
Dave Storey
parent
f32bb04ee1
commit
d50231be14
1 changed files with 146 additions and 99 deletions
|
|
@ -12,17 +12,33 @@
|
|||
#include <lber.h>
|
||||
#include <ldap.h>
|
||||
|
||||
static char *binddn = NULL;
|
||||
static char *passwd = NULL;
|
||||
static char *base = NULL;
|
||||
static char *ldaphost = NULL;
|
||||
static int ldapport = 0;
|
||||
static int not, verbose, contoper;
|
||||
static LDAP *ld;
|
||||
|
||||
#define safe_realloc( ptr, size ) ( ptr == NULL ? malloc( size ) : \
|
||||
realloc( ptr, size ))
|
||||
|
||||
static void
|
||||
usage(char *s)
|
||||
{
|
||||
fprintf(stderr, "Usage: %s [options] [dn]...\n", s);
|
||||
fprintf(stderr, " -c\t\tcontinuous operation mode\n");
|
||||
fprintf(stderr, " -D bindnd\tbind dn\n");
|
||||
fprintf(stderr, " -d level\tdebugging level\n");
|
||||
fprintf(stderr, " -f file\tread from file\n");
|
||||
fprintf(stderr, " -h host\tldap sever\n");
|
||||
#ifdef HAVE_KERBEROS
|
||||
fprintf(stderr, " -K\t\tuse Kerberos step 1\n");
|
||||
fprintf(stderr, " -k\t\tuse Kerberos instead of Simple Password authentication\n");
|
||||
#endif
|
||||
fprintf(stderr, " -n\t\tmake no modifications\n");
|
||||
fprintf(stderr, " -p port\tldap port\n");
|
||||
fprintf(stderr, " -r\t\tremove old RDN\n");
|
||||
fprintf(stderr, " -v\t\tverbose\n");
|
||||
fprintf(stderr, " -W\t\tprompt for bind password\n");
|
||||
fprintf(stderr, " -w passwd\tbind password (for simple authentication)\n");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
static int domodrdn LDAP_P((
|
||||
LDAP *ld,
|
||||
char *dn,
|
||||
|
|
@ -32,140 +48,172 @@ static int domodrdn LDAP_P((
|
|||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
char *usage = "usage: %s [-nvkc] [-d debug-level] [-h ldaphost] [-p ldapport] [-D binddn] [-w passwd] [ -f file | < entryfile | dn newrdn ]\n";
|
||||
char *myname,*infile, *entrydn, *rdn, buf[ 4096 ];
|
||||
FILE *fp;
|
||||
int rc, i, kerberos, remove, havedn, authmethod;
|
||||
|
||||
infile = NULL;
|
||||
kerberos = not = contoper = verbose = remove = 0;
|
||||
FILE *fp = NULL;
|
||||
LDAP *ld = NULL;
|
||||
char *myname, *infile, *entrydn, *rdn, buf[ 4096 ];
|
||||
char *binddn = NULL;
|
||||
char *passwd = NULL;
|
||||
char *ldaphost = NULL;
|
||||
int rc, i, remove, havedn, want_passwd;
|
||||
int authmethod = LDAP_AUTH_SIMPLE;
|
||||
int ldapport = LDAP_PORT;
|
||||
|
||||
infile = entrydn = rdn = NULL;
|
||||
not = contoper = verbose = remove = want_passwd = 0;
|
||||
myname = (myname = strrchr(argv[0], '/')) == NULL ? argv[0] : ++myname;
|
||||
|
||||
while (( i = getopt( argc, argv, "kKcnvrh:p:D:w:d:f:" )) != EOF ) {
|
||||
switch( i ) {
|
||||
case 'k': /* kerberos bind */
|
||||
kerberos = 2;
|
||||
break;
|
||||
case 'K': /* kerberos bind, part one only */
|
||||
kerberos = 1;
|
||||
break;
|
||||
while ((i = getopt(argc, argv, "cD:d:f:h:Kknp:rvWw:")) != EOF)
|
||||
{
|
||||
switch(i)
|
||||
{
|
||||
case 'c': /* continuous operation mode */
|
||||
++contoper;
|
||||
contoper++;
|
||||
break;
|
||||
case 'h': /* ldap host */
|
||||
ldaphost = strdup( optarg );
|
||||
break;
|
||||
case 'D': /* bind DN */
|
||||
|
||||
case 'D': /* bind DN */
|
||||
binddn = strdup( optarg );
|
||||
break;
|
||||
case 'w': /* password */
|
||||
passwd = strdup( optarg );
|
||||
break;
|
||||
case 'd':
|
||||
|
||||
case 'd':
|
||||
#ifdef LDAP_DEBUG
|
||||
ldap_debug = lber_debug = atoi( optarg ); /* */
|
||||
ldap_debug = lber_debug = atoi( optarg );
|
||||
#else /* LDAP_DEBUG */
|
||||
fprintf( stderr, "compile with -DLDAP_DEBUG for debugging\n" );
|
||||
#endif /* LDAP_DEBUG */
|
||||
break;
|
||||
|
||||
case 'f': /* read from file */
|
||||
infile = strdup( optarg );
|
||||
break;
|
||||
case 'p':
|
||||
|
||||
case 'h': /* ldap host */
|
||||
ldaphost = strdup( optarg );
|
||||
break;
|
||||
|
||||
case 'K': /* kerberos bind, part one only */
|
||||
#ifdef HAVE_KERBEROS
|
||||
authmethod = LDAP_AUTH_KRBV41;
|
||||
#else
|
||||
fprintf(stderr, "%s was not compiled with Kerberos support\n", argv[0]);
|
||||
#endif
|
||||
break;
|
||||
|
||||
case 'k': /* kerberos bind */
|
||||
#ifdef HAVE_KERBEROS
|
||||
authmethod = LDAP_AUTH_KRBV4;
|
||||
#else
|
||||
fprintf(stderr, "%s was not compiled with Kerberos support\n", argv[0]);
|
||||
#endif
|
||||
break;
|
||||
|
||||
case 'n': /* print adds, don't actually do them */
|
||||
not++;
|
||||
break;
|
||||
|
||||
case 'p':
|
||||
ldapport = atoi( optarg );
|
||||
break;
|
||||
case 'n': /* print adds, don't actually do them */
|
||||
++not;
|
||||
break;
|
||||
case 'v': /* verbose mode */
|
||||
verbose++;
|
||||
break;
|
||||
case 'r': /* remove old RDN */
|
||||
|
||||
case 'r': /* remove old RDN */
|
||||
remove++;
|
||||
break;
|
||||
default:
|
||||
fprintf( stderr, usage, argv[0] );
|
||||
exit( 1 );
|
||||
|
||||
case 'v': /* verbose mode */
|
||||
verbose++;
|
||||
break;
|
||||
|
||||
case 'W':
|
||||
want_passwd++;
|
||||
break;
|
||||
|
||||
case 'w': /* password */
|
||||
passwd = strdup(optarg);
|
||||
break;
|
||||
|
||||
default:
|
||||
usage(argv[0]);
|
||||
}
|
||||
}
|
||||
|
||||
havedn = 0;
|
||||
if (argc - optind == 2) {
|
||||
if (( rdn = strdup( argv[argc - 1] )) == NULL ) {
|
||||
if (argc - optind == 2)
|
||||
{
|
||||
if (( rdn = strdup( argv[argc - 1] )) == NULL )
|
||||
{
|
||||
perror( "strdup" );
|
||||
exit( 1 );
|
||||
return(1);
|
||||
}
|
||||
if (( entrydn = strdup( argv[argc - 2] )) == NULL ) {
|
||||
if (( entrydn = strdup( argv[argc - 2] )) == NULL )
|
||||
{
|
||||
perror( "strdup" );
|
||||
exit( 1 );
|
||||
return( 1 );
|
||||
}
|
||||
++havedn;
|
||||
} else if ( argc - optind != 0 ) {
|
||||
fprintf( stderr, "%s: invalid number of arguments, only two allowed\n", myname);
|
||||
fprintf( stderr, usage, argv[0] );
|
||||
exit( 1 );
|
||||
havedn++;
|
||||
} else if (argc - optind != 0) {
|
||||
fprintf(stderr, "%s: invalid number of arguments, only two allowed\n", myname);
|
||||
usage(argv[0]);
|
||||
}
|
||||
|
||||
if ( infile != NULL ) {
|
||||
if (( fp = fopen( infile, "r" )) == NULL ) {
|
||||
perror( infile );
|
||||
exit( 1 );
|
||||
if (want_passwd && !passwd)
|
||||
passwd = strdup(getpass("Enter LDAP password: "));
|
||||
|
||||
if (infile != NULL)
|
||||
{
|
||||
if ((fp = fopen( infile, "r" )) == NULL)
|
||||
{
|
||||
perror(infile);
|
||||
return(1);
|
||||
}
|
||||
} else {
|
||||
} else
|
||||
fp = stdin;
|
||||
|
||||
if ((ld = ldap_open(ldaphost, ldapport)) == NULL)
|
||||
{
|
||||
perror("ldap_open");
|
||||
return(1);
|
||||
}
|
||||
|
||||
if (( ld = ldap_open( ldaphost, ldapport )) == NULL ) {
|
||||
perror( "ldap_open" );
|
||||
exit( 1 );
|
||||
}
|
||||
/* this seems prudent */
|
||||
ldap_set_option(ld, LDAP_OPT_DEREF, LDAP_DEREF_NEVER);
|
||||
|
||||
/* this seems prudent */
|
||||
ldap_set_option( ld, LDAP_OPT_DEREF, LDAP_DEREF_NEVER);
|
||||
|
||||
if ( !kerberos ) {
|
||||
authmethod = LDAP_AUTH_SIMPLE;
|
||||
} else if ( kerberos == 1 ) {
|
||||
authmethod = LDAP_AUTH_KRBV41;
|
||||
} else {
|
||||
authmethod = LDAP_AUTH_KRBV4;
|
||||
}
|
||||
if ( ldap_bind_s( ld, binddn, passwd, authmethod ) != LDAP_SUCCESS ) {
|
||||
ldap_perror( ld, "ldap_bind" );
|
||||
exit( 1 );
|
||||
if (ldap_bind_s(ld, binddn, passwd, authmethod) != LDAP_SUCCESS)
|
||||
{
|
||||
ldap_perror(ld, "ldap_bind");
|
||||
return(1);
|
||||
}
|
||||
|
||||
rc = 0;
|
||||
if (havedn)
|
||||
rc = domodrdn(ld, entrydn, rdn, remove);
|
||||
else while ((rc == 0 || contoper) && fgets(buf, sizeof(buf), fp) != NULL) {
|
||||
if ( *buf != '\0' ) { /* blank lines optional, skip */
|
||||
buf[ strlen( buf ) - 1 ] = '\0'; /* remove nl */
|
||||
if (*buf != '\0') { /* blank lines optional, skip */
|
||||
buf[strlen(buf) - 1] = '\0'; /* remove nl */
|
||||
|
||||
if ( havedn ) { /* have DN, get RDN */
|
||||
if (( rdn = strdup( buf )) == NULL ) {
|
||||
if (havedn)
|
||||
{
|
||||
/* have DN, get RDN */
|
||||
if (( rdn = strdup( buf )) == NULL)
|
||||
{
|
||||
perror( "strdup" );
|
||||
exit( 1 );
|
||||
}
|
||||
rc = domodrdn(ld, entrydn, rdn, remove);
|
||||
havedn = 0;
|
||||
} else if ( !havedn ) { /* don't have DN yet */
|
||||
if (( entrydn = strdup( buf )) == NULL ) {
|
||||
} else if (!havedn) {
|
||||
/* don't have DN yet */
|
||||
if (( entrydn = strdup( buf )) == NULL )
|
||||
{
|
||||
perror( "strdup" );
|
||||
exit( 1 );
|
||||
}
|
||||
++havedn;
|
||||
havedn++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ldap_unbind( ld );
|
||||
ldap_unbind(ld);
|
||||
|
||||
exit( rc );
|
||||
|
||||
/* UNREACHABLE */
|
||||
return(0);
|
||||
return(rc);
|
||||
}
|
||||
|
||||
static int domodrdn(
|
||||
|
|
@ -174,26 +222,25 @@ static int domodrdn(
|
|||
char *rdn,
|
||||
int remove) /* flag: remove old RDN */
|
||||
{
|
||||
int i;
|
||||
int rc = LDAP_SUCCESS;
|
||||
|
||||
if ( verbose ) {
|
||||
printf( "modrdn %s:\n\t%s\n", dn, rdn );
|
||||
if (verbose)
|
||||
{
|
||||
printf("modrdn %s:\n\t%s\n", dn, rdn);
|
||||
if (remove)
|
||||
printf("removing old RDN\n");
|
||||
else
|
||||
printf("keeping old RDN\n");
|
||||
}
|
||||
|
||||
if ( !not ) {
|
||||
i = ldap_modrdn2_s( ld, dn, rdn, remove );
|
||||
if ( i != LDAP_SUCCESS ) {
|
||||
ldap_perror( ld, "ldap_modrdn2_s" );
|
||||
} else if ( verbose ) {
|
||||
printf( "modrdn complete\n" );
|
||||
}
|
||||
} else {
|
||||
i = LDAP_SUCCESS;
|
||||
if (!not)
|
||||
{
|
||||
rc = ldap_modrdn2_s(ld, dn, rdn, remove);
|
||||
if (rc != LDAP_SUCCESS)
|
||||
ldap_perror(ld, "ldap_modrdn2_s");
|
||||
else if (verbose)
|
||||
printf("modrdn complete\n");
|
||||
}
|
||||
|
||||
return( i );
|
||||
return(rc);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue