mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-22 15:49:34 -05:00
Updated Kerberos code, added password prompting. <dave@tamos.net>
This commit is contained in:
Dave Storey
parent
d50231be14
commit
50dbc7d03b
1 changed files with 167 additions and 144 deletions
|
|
@ -13,7 +13,6 @@
|
|||
|
||||
#define DEFSEP "="
|
||||
|
||||
|
||||
static void
|
||||
usage(char *s)
|
||||
{
|
||||
|
|
@ -42,9 +41,11 @@ usage( char *s )
|
|||
fprintf( stderr, " -l time lim\ttime limit (in seconds) for search\n" );
|
||||
fprintf( stderr, " -z size lim\tsize limit (in entries) for search\n" );
|
||||
fprintf( stderr, " -D binddn\tbind dn\n" );
|
||||
fprintf( stderr, " -W \t\tprompt for bind passwd\n" );
|
||||
fprintf( stderr, " -w passwd\tbind passwd (for simple authentication)\n" );
|
||||
#ifdef HAVE_KERBEROS
|
||||
fprintf( stderr, " -k\t\tuse Kerberos instead of Simple Password authentication\n" );
|
||||
fprintf( stderr, " -K\t\tuse Kerberos step 1\n" );
|
||||
#endif
|
||||
fprintf( stderr, " -h host\tldap server\n" );
|
||||
fprintf( stderr, " -p port\tport on ldap server\n" );
|
||||
|
|
@ -70,90 +71,39 @@ static int dosearch LDAP_P((
|
|||
char *filtpatt,
|
||||
char *value));
|
||||
|
||||
static char *binddn = NULL;
|
||||
static char *passwd = NULL;
|
||||
static char *base = NULL;
|
||||
static char *ldaphost = NULL;
|
||||
static int ldapport = 0;
|
||||
static char *sep = DEFSEP;
|
||||
static char *sortattr = NULL;
|
||||
static int skipsortattr = 0;
|
||||
static int verbose, not, includeufn, allow_binary, vals2tmp, ldif;
|
||||
static char *sortattr = NULL;
|
||||
static char *sep = DEFSEP;
|
||||
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
char *infile, *filtpattern, **attrs, line[ BUFSIZ ];
|
||||
FILE *fp;
|
||||
int rc, i, first, scope, kerberos, deref, attrsonly;
|
||||
int referrals, timelimit, sizelimit, authmethod;
|
||||
LDAP *ld;
|
||||
FILE *fp = NULL;
|
||||
LDAP *ld = NULL;
|
||||
char *infile = NULL;
|
||||
char *filtpattern, **attrs, line[ BUFSIZ ];
|
||||
char *binddn = NULL;
|
||||
char *passwd = NULL;
|
||||
char *base = NULL;
|
||||
char *ldaphost = NULL;
|
||||
int rc, i, first, deref, attrsonly;
|
||||
int referrals, timelimit, sizelimit, want_passwd;
|
||||
int authmethod = LDAP_AUTH_SIMPLE;
|
||||
int scope = LDAP_SCOPE_SUBTREE;
|
||||
int ldapport = LDAP_PORT;
|
||||
|
||||
infile = NULL;
|
||||
deref = verbose = allow_binary = not = kerberos = vals2tmp =
|
||||
attrsonly = ldif = 0;
|
||||
deref = verbose = allow_binary = not = vals2tmp =
|
||||
attrsonly = ldif = want_passwd = 0;
|
||||
referrals = (int)LDAP_OPT_ON;
|
||||
sizelimit = timelimit = 0;
|
||||
scope = LDAP_SCOPE_SUBTREE;
|
||||
|
||||
while (( i = getopt( argc, argv,
|
||||
#ifdef HAVE_KERBEROS
|
||||
"KknuvtRABLD:s:f:h:b:d:p:F:a:w:l:z:S:"
|
||||
#else
|
||||
"nuvtRABLD:s:f:h:b:d:p:F:a:w:l:z:S:"
|
||||
#endif
|
||||
)) != EOF ) {
|
||||
switch( i ) {
|
||||
case 'n': /* do Not do any searches */
|
||||
++not;
|
||||
break;
|
||||
case 'v': /* verbose mode */
|
||||
++verbose;
|
||||
break;
|
||||
case 'd':
|
||||
#ifdef LDAP_DEBUG
|
||||
ldap_debug = lber_debug = atoi( optarg ); /* */
|
||||
#else /* LDAP_DEBUG */
|
||||
fprintf( stderr, "compile with -DLDAP_DEBUG for debugging\n" );
|
||||
#endif /* LDAP_DEBUG */
|
||||
break;
|
||||
#ifdef HAVE_KERBEROS
|
||||
case 'k': /* use kerberos bind */
|
||||
kerberos = 2;
|
||||
break;
|
||||
case 'K': /* use kerberos bind, 1st part only */
|
||||
kerberos = 1;
|
||||
break;
|
||||
#endif
|
||||
case 'u': /* include UFN */
|
||||
++includeufn;
|
||||
break;
|
||||
case 't': /* write attribute values to /tmp files */
|
||||
++vals2tmp;
|
||||
break;
|
||||
case 'R': /* don't automatically chase referrals */
|
||||
referrals = (int) LDAP_OPT_OFF;
|
||||
break;
|
||||
while ((i = getopt(argc, argv, "Aa:Bb:D:d:h:f:F:KkLl:np:RS:s:tuvWw:z:")) != EOF)
|
||||
{
|
||||
switch(i)
|
||||
{
|
||||
case 'A': /* retrieve attribute names only -- no values */
|
||||
++attrsonly;
|
||||
break;
|
||||
case 'L': /* print entries in LDIF format */
|
||||
++ldif;
|
||||
/* fall through -- always allow binary when outputting LDIF */
|
||||
case 'B': /* allow binary values to be printed */
|
||||
++allow_binary;
|
||||
break;
|
||||
case 's': /* search scope */
|
||||
if ( strncasecmp( optarg, "base", 4 ) == 0 ) {
|
||||
scope = LDAP_SCOPE_BASE;
|
||||
} else if ( strncasecmp( optarg, "one", 3 ) == 0 ) {
|
||||
scope = LDAP_SCOPE_ONELEVEL;
|
||||
} else if ( strncasecmp( optarg, "sub", 3 ) == 0 ) {
|
||||
scope = LDAP_SCOPE_SUBTREE;
|
||||
} else {
|
||||
fprintf( stderr, "scope should be base, one, or sub\n" );
|
||||
usage( argv[ 0 ] );
|
||||
}
|
||||
attrsonly++;
|
||||
break;
|
||||
|
||||
case 'a': /* set alias deref option */
|
||||
|
|
@ -171,36 +121,114 @@ main( int argc, char **argv )
|
|||
}
|
||||
break;
|
||||
|
||||
case 'F': /* field separator */
|
||||
sep = strdup( optarg );
|
||||
break;
|
||||
case 'f': /* input file */
|
||||
infile = strdup( optarg );
|
||||
break;
|
||||
case 'h': /* ldap host */
|
||||
ldaphost = strdup( optarg );
|
||||
case 'L': /* print entries in LDIF format */
|
||||
++ldif;
|
||||
/* fall through -- always allow binary when outputting LDIF */
|
||||
case 'B': /* allow binary values to be printed */
|
||||
++allow_binary;
|
||||
break;
|
||||
|
||||
case 'b': /* searchbase */
|
||||
base = strdup( optarg );
|
||||
break;
|
||||
|
||||
case 'D': /* bind DN */
|
||||
binddn = strdup( optarg );
|
||||
break;
|
||||
case 'p': /* ldap port */
|
||||
ldapport = atoi( optarg );
|
||||
|
||||
case 'd':
|
||||
#ifdef LDAP_DEBUG
|
||||
ldap_debug = lber_debug = atoi( optarg ); /* */
|
||||
#else /* LDAP_DEBUG */
|
||||
fprintf( stderr, "compile with -DLDAP_DEBUG for debugging\n" );
|
||||
#endif /* LDAP_DEBUG */
|
||||
break;
|
||||
case 'w': /* bind password */
|
||||
passwd = strdup( optarg );
|
||||
|
||||
case 'F': /* field separator */
|
||||
sep = strdup( optarg );
|
||||
break;
|
||||
|
||||
case 'f': /* input file */
|
||||
infile = strdup( optarg );
|
||||
break;
|
||||
|
||||
case 'h': /* ldap host */
|
||||
ldaphost = strdup( optarg );
|
||||
break;
|
||||
|
||||
case 'K': /* use kerberos bind, 1st part 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': /* use 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 'l': /* time limit */
|
||||
timelimit = atoi( optarg );
|
||||
break;
|
||||
case 'z': /* size limit */
|
||||
sizelimit = atoi( optarg );
|
||||
|
||||
case 'n': /* do Not do any searches */
|
||||
++not;
|
||||
break;
|
||||
|
||||
case 'p': /* ldap port */
|
||||
ldapport = atoi( optarg );
|
||||
break;
|
||||
|
||||
case 'R': /* don't automatically chase referrals */
|
||||
referrals = (int) LDAP_OPT_OFF;
|
||||
break;
|
||||
|
||||
case 'S': /* sort attribute */
|
||||
sortattr = strdup( optarg );
|
||||
break;
|
||||
|
||||
case 's': /* search scope */
|
||||
if ( strncasecmp( optarg, "base", 4 ) == 0 ) {
|
||||
scope = LDAP_SCOPE_BASE;
|
||||
} else if ( strncasecmp( optarg, "one", 3 ) == 0 ) {
|
||||
scope = LDAP_SCOPE_ONELEVEL;
|
||||
} else if ( strncasecmp( optarg, "sub", 3 ) == 0 ) {
|
||||
scope = LDAP_SCOPE_SUBTREE;
|
||||
} else {
|
||||
fprintf( stderr, "scope should be base, one, or sub\n" );
|
||||
usage( argv[ 0 ] );
|
||||
}
|
||||
break;
|
||||
|
||||
case 't': /* write attribute values to /tmp files */
|
||||
++vals2tmp;
|
||||
break;
|
||||
|
||||
case 'u': /* include UFN */
|
||||
++includeufn;
|
||||
break;
|
||||
|
||||
case 'v': /* verbose mode */
|
||||
++verbose;
|
||||
break;
|
||||
|
||||
case 'W':
|
||||
want_passwd++;
|
||||
break;
|
||||
|
||||
case 'w': /* bind password */
|
||||
passwd = strdup( optarg );
|
||||
break;
|
||||
|
||||
case 'z': /* size limit */
|
||||
sizelimit = atoi( optarg );
|
||||
break;
|
||||
|
||||
default:
|
||||
usage(argv[0]);
|
||||
}
|
||||
|
|
@ -229,6 +257,9 @@ main( int argc, char **argv )
|
|||
attrs = &argv[ optind ];
|
||||
}
|
||||
|
||||
if (want_passwd && !passwd)
|
||||
passwd = strdup(getpass("Enter LDAP password: "));
|
||||
|
||||
if ( infile != NULL ) {
|
||||
if ( infile[0] == '-' && infile[1] == '\0' ) {
|
||||
fp = stdin;
|
||||
|
|
@ -238,13 +269,12 @@ main( int argc, char **argv )
|
|||
}
|
||||
}
|
||||
|
||||
if ( verbose ) {
|
||||
if (verbose)
|
||||
printf("ldap_open(%s, %d)\n", ldaphost, ldapport);
|
||||
}
|
||||
|
||||
if ((ld = ldap_open(ldaphost, ldapport)) == NULL) {
|
||||
perror(ldaphost);
|
||||
exit( 1 );
|
||||
return(1);
|
||||
}
|
||||
|
||||
if (ldap_set_option(ld, LDAP_OPT_DEREF, (void *)&deref) == -1 ) {
|
||||
|
|
@ -260,16 +290,9 @@ main( int argc, char **argv )
|
|||
/* set option error */
|
||||
}
|
||||
|
||||
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 );
|
||||
return(1);
|
||||
}
|
||||
|
||||
if ( verbose ) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue