Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • openldap/openldap
  • hyc/openldap
  • ryan/openldap
  • iboukris/openldap
  • ondra/openldap
  • sshanks-kx/openldap
  • blaggacao/openldap
  • pbrezina/openldap
  • quanah/openldap
  • dragos_h/openldap
  • lorenz/openldap
  • tsaarni/openldap
  • fei.ding/openldap
  • orent/openldap
  • arrowplum/openldap
  • barchiesi/openldap
  • jotik/openldap
  • hamano/openldap
  • ingovoss/openldap
  • henson/openldap
  • jlrine2/openldap
  • howeverAT/openldap
  • nivanova/openldap
  • orbea/openldap
  • rdubner/openldap
  • smckinney/openldap
  • jklowden/openldap
  • dpa-openldap/openldap
  • rouzier/openldap
  • orgads/openldap
  • ffontaine/openldap
  • jiaqingz/openldap
  • dcoutadeur/openldap
  • begeragus/openldap
  • pubellit/openldap
  • glandium/openldap
  • facboy/openldap
  • thesamesam/openldap
  • Johan/openldap
  • fkooman/openldap
  • gburd/openldap
  • h-homma/openldap
  • sgallagher/openldap
  • ahmed_zaki/openldap
  • gnoe/openldap
  • mid/openldap
  • clan/openldap
47 results
Show changes
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 12973 additions and 13791 deletions
clients/tools/ldapsearch.c
View file @ a624e749
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* $OpenLDAP$ */ /* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>. /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
* *
* Copyright 1998-2008 The OpenLDAP Foundation. * Copyright 1998-2010 The OpenLDAP Foundation.
* Portions Copyright 1998-2003 Kurt D. Zeilenga. * Portions Copyright 1998-2003 Kurt D. Zeilenga.
* Portions Copyright 1998-2001 Net Boolean Incorporated. * Portions Copyright 1998-2001 Net Boolean Incorporated.
* Portions Copyright 2001-2003 IBM Corporation. * Portions Copyright 2001-2003 IBM Corporation.
...@@ -123,21 +123,32 @@ usage( void ) ...@@ -123,21 +123,32 @@ usage( void )
fprintf( stderr, _(" -a deref one of never (default), always, search, or find\n")); fprintf( stderr, _(" -a deref one of never (default), always, search, or find\n"));
fprintf( stderr, _(" -A retrieve attribute names only (no values)\n")); fprintf( stderr, _(" -A retrieve attribute names only (no values)\n"));
fprintf( stderr, _(" -b basedn base dn for search\n")); fprintf( stderr, _(" -b basedn base dn for search\n"));
fprintf( stderr, _(" -c continuous operation mode (do not stop on errors)\n"));
fprintf( stderr, _(" -E [!]<ext>[=<extparam>] search extensions (! indicates criticality)\n")); fprintf( stderr, _(" -E [!]<ext>[=<extparam>] search extensions (! indicates criticality)\n"));
fprintf( stderr, _(" [!]domainScope (domain scope)\n")); fprintf( stderr, _(" [!]domainScope (domain scope)\n"));
fprintf( stderr, _(" !dontUseCopy (Don't Use Copy)\n")); fprintf( stderr, _(" !dontUseCopy (Don't Use Copy)\n"));
fprintf( stderr, _(" [!]mv=<filter> (matched values filter)\n")); fprintf( stderr, _(" [!]mv=<filter> (RFC 3876 matched values filter)\n"));
fprintf( stderr, _(" [!]pr=<size>[/prompt|noprompt] (paged results/prompt)\n")); fprintf( stderr, _(" [!]pr=<size>[/prompt|noprompt] (RFC 2696 paged results/prompt)\n"));
fprintf( stderr, _(" [!]subentries[=true|false] (subentries)\n")); fprintf( stderr, _(" [!]sss=[-]<attr[:OID]>[/[-]<attr[:OID]>...]\n"));
fprintf( stderr, _(" [!]sync=ro[/<cookie>] (LDAP Sync refreshOnly)\n")); fprintf( stderr, _(" (RFC 2891 server side sorting)\n"));
fprintf( stderr, _(" rp[/<cookie>][/<slimit>] (LDAP Sync refreshAndPersist)\n")); fprintf( stderr, _(" [!]subentries[=true|false] (RFC 3672 subentries)\n"));
fprintf( stderr, _(" [!]sync=ro[/<cookie>] (RFC 4533 LDAP Sync refreshOnly)\n"));
fprintf( stderr, _(" rp[/<cookie>][/<slimit>] (refreshAndPersist)\n"));
fprintf( stderr, _(" [!]vlv=<before>/<after>(/<offset>/<count>|:<value>)\n"));
fprintf( stderr, _(" (ldapv3-vlv-09 virtual list views)\n"));
#ifdef LDAP_CONTROL_X_DEREF
fprintf( stderr, _(" [!]deref=derefAttr:attr[,...][;derefAttr:attr[,...][;...]]\n"));
#endif
fprintf( stderr, _(" [!]<oid>=:<value> (generic control; no response handling)\n")); fprintf( stderr, _(" [!]<oid>=:<value> (generic control; no response handling)\n"));
fprintf( stderr, _(" -f file read operations from `file'\n"));
fprintf( stderr, _(" -F prefix URL prefix for files (default: %s)\n"), def_urlpre); fprintf( stderr, _(" -F prefix URL prefix for files (default: %s)\n"), def_urlpre);
fprintf( stderr, _(" -l limit time limit (in seconds, or \"none\" or \"max\") for search\n")); fprintf( stderr, _(" -l limit time limit (in seconds, or \"none\" or \"max\") for search\n"));
fprintf( stderr, _(" -L print responses in LDIFv1 format\n")); fprintf( stderr, _(" -L print responses in LDIFv1 format\n"));
fprintf( stderr, _(" -LL print responses in LDIF format without comments\n")); fprintf( stderr, _(" -LL print responses in LDIF format without comments\n"));
fprintf( stderr, _(" -LLL print responses in LDIF format without comments\n")); fprintf( stderr, _(" -LLL print responses in LDIF format without comments\n"));
fprintf( stderr, _(" and version\n")); fprintf( stderr, _(" and version\n"));
fprintf( stderr, _(" -M enable Manage DSA IT control (-MM to make critical)\n"));
fprintf( stderr, _(" -P version protocol version (default: 3)\n"));
fprintf( stderr, _(" -s scope one of base, one, sub or children (search scope)\n")); fprintf( stderr, _(" -s scope one of base, one, sub or children (search scope)\n"));
fprintf( stderr, _(" -S attr sort the results by attribute `attr'\n")); fprintf( stderr, _(" -S attr sort the results by attribute `attr'\n"));
fprintf( stderr, _(" -t write binary values to files in temporary directory\n")); fprintf( stderr, _(" -t write binary values to files in temporary directory\n"));
...@@ -199,6 +210,13 @@ static int dontUseCopy = 0; ...@@ -199,6 +210,13 @@ static int dontUseCopy = 0;
static int domainScope = 0; static int domainScope = 0;
static int sss = 0;
static LDAPSortKey **sss_keys = NULL;
static int vlv = 0;
static LDAPVLVInfo vlvInfo;
static struct berval vlvValue;
static int ldapsync = 0; static int ldapsync = 0;
static struct berval sync_cookie = { 0, NULL }; static struct berval sync_cookie = { 0, NULL };
static int sync_slimit = -1; static int sync_slimit = -1;
...@@ -218,6 +236,12 @@ static LDAPControl *c = NULL; ...@@ -218,6 +236,12 @@ static LDAPControl *c = NULL;
static int nctrls = 0; static int nctrls = 0;
static int save_nctrls = 0; static int save_nctrls = 0;
#ifdef LDAP_CONTROL_X_DEREF
static int derefcrit;
static LDAPDerefSpec *ds;
static struct berval derefval;
#endif
static int static int
ctrl_add( void ) ctrl_add( void )
{ {
...@@ -249,9 +273,50 @@ urlize(char *url) ...@@ -249,9 +273,50 @@ urlize(char *url)
} }
} }
static int
parse_vlv(char *cvalue)
{
char *keyp, *key2;
int num1, num2;
keyp = cvalue;
if ( sscanf( keyp, "%d/%d", &num1, &num2 ) != 2 ) {
fprintf( stderr,
_("VLV control value \"%s\" invalid\n"),
cvalue );
return -1;
}
vlvInfo.ldvlv_before_count = num1;
vlvInfo.ldvlv_after_count = num2;
keyp = strchr( keyp, '/' ) + 1;
key2 = strchr( keyp, '/' );
if ( key2 ) {
keyp = key2 + 1;
if ( sscanf( keyp, "%d/%d", &num1, &num2 ) != 2 ) {
fprintf( stderr,
_("VLV control value \"%s\" invalid\n"),
cvalue );
return -1;
}
vlvInfo.ldvlv_offset = num1;
vlvInfo.ldvlv_count = num2;
vlvInfo.ldvlv_attrvalue = NULL;
} else {
key2 = strchr( keyp, ':' );
if ( !key2 ) {
fprintf( stderr,
_("VLV control value \"%s\" invalid\n"),
cvalue );
return -1;
}
ber_str2bv( key2+1, 0, 0, &vlvValue );
vlvInfo.ldvlv_attrvalue = &vlvValue;
}
return 0;
}
const char options[] = "a:Ab:cE:F:l:Ls:S:tT:uz:" const char options[] = "a:Ab:cE:F:l:Ls:S:tT:uz:"
"Cd:D:e:f:h:H:IMnO:o:p:P:QR:U:vVw:WxX:y:Y:Z"; "Cd:D:e:f:h:H:IMnNO:o:p:P:QR:U:vVw:WxX:y:Y:Z";
int int
handle_private_option( int i ) handle_private_option( int i )
...@@ -329,6 +394,11 @@ handle_private_option( int i ) ...@@ -329,6 +394,11 @@ handle_private_option( int i )
_("PagedResultsControl previously specified\n") ); _("PagedResultsControl previously specified\n") );
exit( EXIT_FAILURE ); exit( EXIT_FAILURE );
} }
if ( vlv != 0 ) {
fprintf( stderr,
_("PagedResultsControl incompatible with VLV\n") );
exit( EXIT_FAILURE );
}
if( cvalue != NULL ) { if( cvalue != NULL ) {
char *promptp; char *promptp;
...@@ -395,6 +465,31 @@ handle_private_option( int i ) ...@@ -395,6 +465,31 @@ handle_private_option( int i )
domainScope = 1 + crit; domainScope = 1 + crit;
} else if ( strcasecmp( control, "sss" ) == 0 ) {
char *keyp;
if( sss ) {
fprintf( stderr,
_("server side sorting control previously specified\n"));
exit( EXIT_FAILURE );
}
if( cvalue == NULL ) {
fprintf( stderr,
_("missing specification of sss control\n") );
exit( EXIT_FAILURE );
}
keyp = cvalue;
while ( ( keyp = strchr(keyp, '/') ) != NULL ) {
*keyp++ = ' ';
}
if ( ldap_create_sort_keylist( &sss_keys, cvalue )) {
fprintf( stderr,
_("server side sorting control value \"%s\" invalid\n"),
cvalue );
exit( EXIT_FAILURE );
}
sss = 1 + crit;
} else if ( strcasecmp( control, "subentries" ) == 0 ) { } else if ( strcasecmp( control, "subentries" ) == 0 ) {
if( subentries ) { if( subentries ) {
fprintf( stderr, fprintf( stderr,
...@@ -461,6 +556,72 @@ handle_private_option( int i ) ...@@ -461,6 +556,72 @@ handle_private_option( int i )
} }
if ( crit ) ldapsync *= -1; if ( crit ) ldapsync *= -1;
} else if ( strcasecmp( control, "vlv" ) == 0 ) {
if( vlv ) {
fprintf( stderr,
_("virtual list view control previously specified\n"));
exit( EXIT_FAILURE );
}
if ( pagedResults != 0 ) {
fprintf( stderr,
_("PagedResultsControl incompatible with VLV\n") );
exit( EXIT_FAILURE );
}
if( cvalue == NULL ) {
fprintf( stderr,
_("missing specification of vlv control\n") );
exit( EXIT_FAILURE );
}
if ( parse_vlv( cvalue ))
exit( EXIT_FAILURE );
vlv = 1 + crit;
#ifdef LDAP_CONTROL_X_DEREF
} else if ( strcasecmp( control, "deref" ) == 0 ) {
int ispecs;
char **specs;
/* cvalue is something like
*
* derefAttr:attr[,attr[...]][;derefAttr:attr[,attr[...]]]"
*/
specs = ldap_str2charray( cvalue, ";" );
if ( specs == NULL ) {
fprintf( stderr, _("deref specs \"%s\" invalid\n"),
cvalue );
exit( EXIT_FAILURE );
}
for ( ispecs = 0; specs[ ispecs ] != NULL; ispecs++ )
/* count'em */
ds = ldap_memcalloc( ispecs + 1, sizeof( LDAPDerefSpec ) );
if ( ds == NULL ) {
perror( "malloc" );
exit( EXIT_FAILURE );
}
for ( ispecs = 0; specs[ ispecs ] != NULL; ispecs++ ) {
char *ptr;
ptr = strchr( specs[ ispecs ], ':' );
if ( ptr == NULL ) {
fprintf( stderr, _("deref specs \"%s\" invalid\n"),
cvalue );
exit( EXIT_FAILURE );
}
ds[ ispecs ].derefAttr = specs[ ispecs ];
*ptr++ = '\0';
ds[ ispecs ].attributes = ldap_str2charray( ptr, "," );
}
derefcrit = 1 + crit;
ldap_memfree( specs );
#endif /* LDAP_CONTROL_X_DEREF */
} else if ( tool_is_oid( control ) ) { } else if ( tool_is_oid( control ) ) {
if ( ctrl_add() ) { if ( ctrl_add() ) {
exit( EXIT_FAILURE ); exit( EXIT_FAILURE );
...@@ -664,6 +825,12 @@ main( int argc, char **argv ) ...@@ -664,6 +825,12 @@ main( int argc, char **argv )
tool_args( argc, argv ); tool_args( argc, argv );
if ( vlv && !sss ) {
fprintf( stderr,
_("VLV control requires server side sort control\n" ));
return EXIT_FAILURE;
}
if (( argc - optind < 1 ) || if (( argc - optind < 1 ) ||
( *argv[optind] != '(' /*')'*/ && ( *argv[optind] != '(' /*')'*/ &&
( strchr( argv[optind], '=' ) == NULL ) ) ) ( strchr( argv[optind], '=' ) == NULL ) ) )
...@@ -732,16 +899,6 @@ main( int argc, char **argv ) ...@@ -732,16 +899,6 @@ main( int argc, char **argv )
ld = tool_conn_setup( 0, &private_conn_setup ); ld = tool_conn_setup( 0, &private_conn_setup );
if ( pw_file || want_bindpw ) {
if ( pw_file ) {
rc = lutil_get_filed_password( pw_file, &passwd );
if( rc ) return EXIT_FAILURE;
} else {
passwd.bv_val = getpassphrase( _("Enter LDAP Password: ") );
passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0;
}
}
tool_bind( ld ); tool_bind( ld );
getNextPage: getNextPage:
...@@ -750,12 +907,17 @@ getNextPage: ...@@ -750,12 +907,17 @@ getNextPage:
if ( nctrls > 0 if ( nctrls > 0
#ifdef LDAP_CONTROL_DONTUSECOPY #ifdef LDAP_CONTROL_DONTUSECOPY
|| dontUseCopy || dontUseCopy
#endif
#ifdef LDAP_CONTROL_X_DEREF
|| derefcrit
#endif #endif
|| domainScope || domainScope
|| pagedResults || pagedResults
|| ldapsync || ldapsync
|| sss
|| subentries || subentries
|| valuesReturnFilter ) || valuesReturnFilter
|| vlv )
{ {
#ifdef LDAP_CONTROL_DONTUSECOPY #ifdef LDAP_CONTROL_DONTUSECOPY
...@@ -825,13 +987,13 @@ getNextPage: ...@@ -825,13 +987,13 @@ getNextPage:
&sync_cookie ); &sync_cookie );
} }
if ( err == LBER_ERROR ) { if ( err == -1 ) {
ber_free( syncber, 1 ); ber_free( syncber, 1 );
fprintf( stderr, _("ldap sync control encoding error!\n") ); fprintf( stderr, _("ldap sync control encoding error!\n") );
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if ( ber_flatten( syncber, &syncbvalp ) == LBER_ERROR ) { if ( ber_flatten( syncber, &syncbvalp ) == -1 ) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
...@@ -886,12 +1048,73 @@ getNextPage: ...@@ -886,12 +1048,73 @@ getNextPage:
c[i].ldctl_iscritical = pagedResults > 1; c[i].ldctl_iscritical = pagedResults > 1;
i++; i++;
} }
if ( sss ) {
if ( ctrl_add() ) {
return EXIT_FAILURE;
}
if ( ldap_create_sort_control_value( ld,
sss_keys, &c[i].ldctl_value ) )
{
return EXIT_FAILURE;
}
c[i].ldctl_oid = LDAP_CONTROL_SORTREQUEST;
c[i].ldctl_iscritical = sss > 1;
i++;
}
if ( vlv ) {
if ( ctrl_add() ) {
return EXIT_FAILURE;
}
if ( ldap_create_vlv_control_value( ld,
&vlvInfo, &c[i].ldctl_value ) )
{
return EXIT_FAILURE;
}
c[i].ldctl_oid = LDAP_CONTROL_VLVREQUEST;
c[i].ldctl_iscritical = sss > 1;
i++;
}
#ifdef LDAP_CONTROL_X_DEREF
if ( derefcrit ) {
if ( derefval.bv_val == NULL ) {
int i;
assert( ds != NULL );
if ( ldap_create_deref_control_value( ld, ds, &derefval ) != LDAP_SUCCESS ) {
return EXIT_FAILURE;
}
for ( i = 0; ds[ i ].derefAttr != NULL; i++ ) {
ldap_memfree( ds[ i ].derefAttr );
ldap_charray_free( ds[ i ].attributes );
}
ldap_memfree( ds );
ds = NULL;
}
if ( ctrl_add() ) {
exit( EXIT_FAILURE );
}
c[ i ].ldctl_iscritical = derefcrit > 1;
c[ i ].ldctl_oid = LDAP_CONTROL_X_DEREF;
c[ i ].ldctl_value = derefval;
i++;
}
#endif /* LDAP_CONTROL_X_DEREF */
} }
tool_server_controls( ld, c, i ); tool_server_controls( ld, c, i );
ber_free( seber, 1 ); if ( seber ) ber_free( seber, 1 );
ber_free( vrber, 1 ); if ( vrber ) ber_free( vrber, 1 );
/* step back to the original number of controls, so that /* step back to the original number of controls, so that
* those set while parsing args are preserved */ * those set while parsing args are preserved */
...@@ -968,6 +1191,25 @@ getNextPage: ...@@ -968,6 +1191,25 @@ getNextPage:
(pagedResults > 1) ? _("critical ") : "", (pagedResults > 1) ? _("critical ") : "",
pageSize ); pageSize );
} }
if ( sss ) {
printf(_("\n# with server side sorting %scontrol"),
sss > 1 ? _("critical ") : "" );
}
if ( vlv ) {
printf(_("\n# with virtual list view %scontrol: %d/%d"),
vlv > 1 ? _("critical ") : "",
vlvInfo.ldvlv_before_count, vlvInfo.ldvlv_after_count);
if ( vlvInfo.ldvlv_attrvalue )
printf(":%s", vlvInfo.ldvlv_attrvalue->bv_val );
else
printf("/%d/%d", vlvInfo.ldvlv_offset, vlvInfo.ldvlv_count );
}
#ifdef LDAP_CONTROL_X_DEREF
if ( derefcrit ) {
printf(_("\n# with dereference %scontrol"),
derefcrit > 1 ? _("critical ") : "" );
}
#endif
printf( _("\n#\n\n") ); printf( _("\n#\n\n") );
...@@ -1005,7 +1247,7 @@ getNextPage: ...@@ -1005,7 +1247,7 @@ getNextPage:
} }
if (( rc == LDAP_SUCCESS ) && pageSize && pr_morePagedResults ) { if (( rc == LDAP_SUCCESS ) && pageSize && pr_morePagedResults ) {
char buf[6]; char buf[12];
int i, moreEntries, tmpSize; int i, moreEntries, tmpSize;
/* Loop to get the next pages when /* Loop to get the next pages when
...@@ -1043,6 +1285,41 @@ getNextPage: ...@@ -1043,6 +1285,41 @@ getNextPage:
goto getNextPage; goto getNextPage;
} }
if (( rc == LDAP_SUCCESS ) && vlv ) {
char buf[BUFSIZ];
int i, moreEntries;
/* Loop to get the next window when
* enter is pressed on the terminal.
*/
printf( _("Press [before/after(/offset/count|:value)] Enter for the next window.\n"));
i = 0;
moreEntries = getchar();
while ( moreEntries != EOF && moreEntries != '\n' ) {
if ( i < (int)sizeof(buf) - 1 ) {
buf[i] = moreEntries;
i++;
}
moreEntries = getchar();
}
buf[i] = '\0';
if ( buf[0] ) {
i = parse_vlv( strdup( buf ));
if ( i )
return EXIT_FAILURE;
} else {
vlvInfo.ldvlv_attrvalue = NULL;
vlvInfo.ldvlv_count = vlvCount;
vlvInfo.ldvlv_offset += vlvInfo.ldvlv_after_count;
}
if ( vlvInfo.ldvlv_context )
ber_bvfree( vlvInfo.ldvlv_context );
vlvInfo.ldvlv_context = vlvContext;
goto getNextPage;
}
tool_unbind( ld ); tool_unbind( ld );
tool_destroy(); tool_destroy();
if ( base != NULL ) { if ( base != NULL ) {
...@@ -1051,6 +1328,12 @@ getNextPage: ...@@ -1051,6 +1328,12 @@ getNextPage:
if ( control != NULL ) { if ( control != NULL ) {
ber_memfree( control ); ber_memfree( control );
} }
if ( sss_keys != NULL ) {
ldap_free_sort_keylist( sss_keys );
}
if ( derefval.bv_val != NULL ) {
ldap_memfree( derefval.bv_val );
}
if ( c ) { if ( c ) {
for ( ; save_nctrls-- > 0; ) { for ( ; save_nctrls-- > 0; ) {
...@@ -1092,14 +1375,15 @@ static int dosearch( ...@@ -1092,14 +1375,15 @@ static int dosearch(
int cancel_msgid = -1; int cancel_msgid = -1;
if( filtpatt != NULL ) { if( filtpatt != NULL ) {
size_t max_fsize = strlen( filtpatt ) + strlen( value ) + 1; size_t max_fsize = strlen( filtpatt ) + strlen( value ) + 1, outlen;
filter = malloc( max_fsize ); filter = malloc( max_fsize );
if( filter == NULL ) { if( filter == NULL ) {
perror( "malloc" ); perror( "malloc" );
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if( snprintf( filter, max_fsize, filtpatt, value ) >= max_fsize ) { outlen = snprintf( filter, max_fsize, filtpatt, value );
if( outlen >= max_fsize ) {
fprintf( stderr, "Bad filter pattern: \"%s\"\n", filtpatt ); fprintf( stderr, "Bad filter pattern: \"%s\"\n", filtpatt );
free( filter ); free( filter );
return EXIT_FAILURE; return EXIT_FAILURE;
...@@ -1564,7 +1848,7 @@ static int print_result( ...@@ -1564,7 +1848,7 @@ static int print_result(
tool_write_ldif( LDIF_PUT_TEXT, tool_write_ldif( LDIF_PUT_TEXT,
"text", line, "text", line,
next ? next - line : strlen( line ) ); next ? (size_t) (next - line) : strlen( line ));
line = next ? next + 1 : NULL; line = next ? next + 1 : NULL;
} }
......
clients/tools/ldapurl.c 0 → 100644
View file @ a624e749
/* ldapurl -- a tool for generating LDAP URLs */
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
* Copyright 2008-2010 The OpenLDAP Foundation.
* Portions Copyright 2008 Pierangelo Masarati, SysNet
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted only as authorized by the OpenLDAP
* Public License.
*
* A copy of this license is available in the file LICENSE in the
* top-level directory of the distribution or, alternatively, at
* <http://www.OpenLDAP.org/license.html>.
*/
/* Portions Copyright (c) 1992-1996 Regents of the University of Michigan.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
* provided that this notice is preserved and that due credit is given
* to the University of Michigan at Ann Arbor. The name of the
* University may not be used to endorse or promote products derived
* from this software without specific prior written permission. This
* software is provided ``as is'' without express or implied warranty.
*/
/* ACKNOWLEDGEMENTS:
* This work was originally developed by Pierangelo Masarati
* for inclusion in OpenLDAP software.
*/
#include "portable.h"
#include <ac/stdlib.h>
#include <stdio.h>
#include <ac/unistd.h>
#include "ldap.h"
#include "ldap_pvt.h"
#include "lutil.h"
static int
usage(void)
{
fprintf( stderr, _("usage: %s [options]\n\n"), "ldapurl" );
fprintf( stderr, _("generates RFC 4516 LDAP URL with extensions\n\n" ) );
fprintf( stderr, _("URL options:\n"));
fprintf( stderr, _(" -a attrs comma separated list of attributes\n" ) );
fprintf( stderr, _(" -b base (RFC 4514 LDAP DN)\n" ) );
fprintf( stderr, _(" -E ext (format: \"ext=value\"; multiple occurrences allowed)\n" ) );
fprintf( stderr, _(" -f filter (RFC 4515 LDAP filter)\n" ) );
fprintf( stderr, _(" -h host \n" ) );
fprintf( stderr, _(" -p port (default: 389 for ldap, 636 for ldaps)\n" ) );
fprintf( stderr, _(" -s scope (RFC 4511 searchScope and extensions)\n" ) );
fprintf( stderr, _(" -S scheme (RFC 4516 LDAP URL scheme and extensions)\n" ) );
exit( EXIT_FAILURE );
}
static int
do_uri_create( LDAPURLDesc *lud )
{
char *uri;
if ( lud->lud_scheme == NULL ) {
lud->lud_scheme = "ldap";
}
if ( lud->lud_port == -1 ) {
if ( strcasecmp( lud->lud_scheme, "ldap" ) == 0 ) {
lud->lud_port = LDAP_PORT;
} else if ( strcasecmp( lud->lud_scheme, "ldaps" ) == 0 ) {
lud->lud_port = LDAPS_PORT;
} else if ( strcasecmp( lud->lud_scheme, "ldapi" ) == 0 ) {
lud->lud_port = 0;
} else {
/* forgiving... */
lud->lud_port = 0;
}
}
if ( lud->lud_scope == -1 ) {
lud->lud_scope = LDAP_SCOPE_DEFAULT;
}
uri = ldap_url_desc2str( lud );
if ( lud->lud_attrs != NULL ) {
ldap_charray_free( lud->lud_attrs );
lud->lud_attrs = NULL;
}
if ( lud->lud_exts != NULL ) {
free( lud->lud_exts );
lud->lud_exts = NULL;
}
if ( uri == NULL ) {
fprintf( stderr, "unable to generate URI\n" );
exit( EXIT_FAILURE );
}
printf( "%s\n", uri );
free( uri );
return 0;
}
static int
do_uri_explode( const char *uri )
{
LDAPURLDesc *lud;
int rc;
rc = ldap_url_parse( uri, &lud );
if ( rc != LDAP_URL_SUCCESS ) {
fprintf( stderr, "unable to parse URI \"%s\"\n", uri );
return 1;
}
if ( lud->lud_scheme != NULL && lud->lud_scheme[0] != '\0' ) {
printf( "scheme: %s\n", lud->lud_scheme );
}
if ( lud->lud_host != NULL && lud->lud_host[0] != '\0' ) {
printf( "host: %s\n", lud->lud_host );
}
if ( lud->lud_port != 0 ) {
printf( "port: %d\n", lud->lud_port );
}
if ( lud->lud_dn != NULL && lud->lud_dn[0] != '\0' ) {
printf( "dn: %s\n", lud->lud_dn );
}
if ( lud->lud_attrs != NULL ) {
int i;
for ( i = 0; lud->lud_attrs[i] != NULL; i++ ) {
printf( "selector: %s\n", lud->lud_attrs[i] );
}
}
if ( lud->lud_scope != LDAP_SCOPE_DEFAULT ) {
printf( "scope: %s\n", ldap_pvt_scope2str( lud->lud_scope ) );
}
if ( lud->lud_filter != NULL && lud->lud_filter[0] != '\0' ) {
printf( "filter: %s\n", lud->lud_filter );
}
if ( lud->lud_exts != NULL ) {
int i;
for ( i = 0; lud->lud_exts[i] != NULL; i++ ) {
printf( "extension: %s\n", lud->lud_exts[i] );
}
}
return 0;
}
int
main( int argc, char *argv[])
{
LDAPURLDesc lud = { 0 };
char *uri = NULL;
int gotlud = 0;
int nexts = 0;
lud.lud_port = -1;
lud.lud_scope = -1;
while ( 1 ) {
int opt = getopt( argc, argv, "S:h:p:b:a:s:f:E:H:" );
if ( opt == EOF ) {
break;
}
if ( opt == 'H' ) {
if ( gotlud ) {
fprintf( stderr, "option -H incompatible with previous options\n" );
usage();
}
if ( uri != NULL ) {
fprintf( stderr, "URI already provided\n" );
usage();
}
uri = optarg;
continue;
}
switch ( opt ) {
case 'S':
case 'h':
case 'p':
case 'b':
case 'a':
case 's':
case 'f':
case 'E':
if ( uri != NULL ) {
fprintf( stderr, "option -%c incompatible with -H\n", opt );
usage();
}
gotlud++;
}
switch ( opt ) {
case 'S':
if ( lud.lud_scheme != NULL ) {
fprintf( stderr, "scheme already provided\n" );
usage();
}
lud.lud_scheme = optarg;
break;
case 'h':
if ( lud.lud_host != NULL ) {
fprintf( stderr, "host already provided\n" );
usage();
}
lud.lud_host = optarg;
break;
case 'p':
if ( lud.lud_port != -1 ) {
fprintf( stderr, "port already provided\n" );
usage();
}
if ( lutil_atoi( &lud.lud_port, optarg ) ) {
fprintf( stderr, "unable to parse port \"%s\"\n", optarg );
usage();
}
break;
case 'b':
if ( lud.lud_dn != NULL ) {
fprintf( stderr, "base already provided\n" );
usage();
}
lud.lud_dn = optarg;
break;
case 'a':
if ( lud.lud_attrs != NULL ) {
fprintf( stderr, "attrs already provided\n" );
usage();
}
lud.lud_attrs = ldap_str2charray( optarg, "," );
if ( lud.lud_attrs == NULL ) {
fprintf( stderr, "unable to parse attrs list \"%s\"\n", optarg );
usage();
}
break;
case 's':
if ( lud.lud_scope != -1 ) {
fprintf( stderr, "scope already provided\n" );
usage();
}
lud.lud_scope = ldap_pvt_str2scope( optarg );
if ( lud.lud_scope == -1 ) {
fprintf( stderr, "unable to parse scope \"%s\"\n", optarg );
usage();
}
break;
case 'f':
if ( lud.lud_filter != NULL ) {
fprintf( stderr, "filter already provided\n" );
usage();
}
lud.lud_filter = optarg;
break;
case 'E':
lud.lud_exts = (char **)realloc( lud.lud_exts,
sizeof( char * ) * ( nexts + 2 ) );
lud.lud_exts[ nexts++ ] = optarg;
lud.lud_exts[ nexts ] = NULL;
break;
default:
assert( opt != 'H' );
usage();
}
}
if ( uri != NULL ) {
return do_uri_explode( uri );
}
return do_uri_create( &lud );
}
clients/tools/ldapwhoami.c
View file @ a624e749
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* $OpenLDAP$ */ /* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>. /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
* *
* Copyright 1998-2008 The OpenLDAP Foundation. * Copyright 1998-2010 The OpenLDAP Foundation.
* Portions Copyright 1998-2003 Kurt D. Zeilenga. * Portions Copyright 1998-2003 Kurt D. Zeilenga.
* Portions Copyright 1998-2001 Net Boolean Incorporated. * Portions Copyright 1998-2001 Net Boolean Incorporated.
* Portions Copyright 2001-2003 IBM Corporation. * Portions Copyright 2001-2003 IBM Corporation.
...@@ -62,7 +62,7 @@ usage( void ) ...@@ -62,7 +62,7 @@ usage( void )
const char options[] = "" const char options[] = ""
"d:D:e:h:H:InO:o:p:QR:U:vVw:WxX:y:Y:Z"; "d:D:e:h:H:InNO:o:p:QR:U:vVw:WxX:y:Y:Z";
int int
handle_private_option( int i ) handle_private_option( int i )
...@@ -129,16 +129,6 @@ main( int argc, char *argv[] ) ...@@ -129,16 +129,6 @@ main( int argc, char *argv[] )
usage(); usage();
} }
if ( pw_file || want_bindpw ) {
if ( pw_file ) {
rc = lutil_get_filed_password( pw_file, &passwd );
if( rc ) return EXIT_FAILURE;
} else {
passwd.bv_val = getpassphrase( _("Enter LDAP Password: ") );
passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0;
}
}
ld = tool_conn_setup( 0, 0 ); ld = tool_conn_setup( 0, 0 );
tool_bind( ld ); tool_bind( ld );
......
configure
View file @ a624e749
This diff is collapsed.
configure.in
View file @ a624e749
dnl $OpenLDAP$ dnl $OpenLDAP$
dnl This work is part of OpenLDAP Software <http://www.openldap.org/>. dnl This work is part of OpenLDAP Software <http://www.openldap.org/>.
dnl dnl
dnl Copyright 1998-2008 The OpenLDAP Foundation. dnl Copyright 1998-2010 The OpenLDAP Foundation.
dnl All rights reserved. dnl All rights reserved.
dnl dnl
dnl Redistribution and use in source and binary forms, with or without dnl Redistribution and use in source and binary forms, with or without
...@@ -23,7 +23,7 @@ define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl ...@@ -23,7 +23,7 @@ define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
define([AC_LIBTOOL_LANG_GCJ_CONFIG], [:])dnl define([AC_LIBTOOL_LANG_GCJ_CONFIG], [:])dnl
dnl ================================================================ dnl ================================================================
dnl Configure.in for OpenLDAP dnl Configure.in for OpenLDAP
AC_COPYRIGHT([[Copyright 1998-2008 The OpenLDAP Foundation. All rights reserved. AC_COPYRIGHT([[Copyright 1998-2010 The OpenLDAP Foundation. All rights reserved.
Restrictions apply, see COPYRIGHT and LICENSE files.]]) Restrictions apply, see COPYRIGHT and LICENSE files.]])
AC_REVISION([$OpenLDAP$]) AC_REVISION([$OpenLDAP$])
AC_INIT([OpenLDAP],,[http://www.openldap.org/its/]) AC_INIT([OpenLDAP],,[http://www.openldap.org/its/])
...@@ -96,7 +96,7 @@ AH_TOP([ ...@@ -96,7 +96,7 @@ AH_TOP([
/* begin of portable.h.pre */ /* begin of portable.h.pre */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>. /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
* *
* Copyright 1998-2008 The OpenLDAP Foundation * Copyright 1998-2010 The OpenLDAP Foundation
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
...@@ -253,8 +253,8 @@ OL_ARG_WITH(mp, ...@@ -253,8 +253,8 @@ OL_ARG_WITH(mp,
[ --with-mp with multiple precision statistics auto|longlong|long|bignum|gmp], [ --with-mp with multiple precision statistics auto|longlong|long|bignum|gmp],
auto, [auto longlong long bignum gmp yes no]) auto, [auto longlong long bignum gmp yes no])
OL_ARG_WITH(odbc, OL_ARG_WITH(odbc,
[ --with-odbc with specific ODBC support iodbc|unixodbc|auto], [ --with-odbc with specific ODBC support iodbc|unixodbc|odbc32|auto],
auto, [auto iodbc unixodbc] ) auto, [auto iodbc unixodbc odbc32] )
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
dnl Server options dnl Server options
...@@ -286,6 +286,7 @@ Backends="bdb \ ...@@ -286,6 +286,7 @@ Backends="bdb \
ldap \ ldap \
meta \ meta \
monitor \ monitor \
ndb \
null \ null \
passwd \ passwd \
perl \ perl \
...@@ -311,6 +312,8 @@ OL_ARG_ENABLE(meta,[ --enable-meta enable metadirectory backend], ...@@ -311,6 +312,8 @@ OL_ARG_ENABLE(meta,[ --enable-meta enable metadirectory backend],
no, [no yes mod], ol_enable_backends)dnl no, [no yes mod], ol_enable_backends)dnl
OL_ARG_ENABLE(monitor,[ --enable-monitor enable monitor backend], OL_ARG_ENABLE(monitor,[ --enable-monitor enable monitor backend],
yes, [no yes mod], ol_enable_backends)dnl yes, [no yes mod], ol_enable_backends)dnl
OL_ARG_ENABLE(ndb,[ --enable-ndb enable MySQL NDB Cluster backend],
no, [no yes mod], ol_enable_backends)dnl
OL_ARG_ENABLE(null,[ --enable-null enable null backend], OL_ARG_ENABLE(null,[ --enable-null enable null backend],
no, [no yes mod], ol_enable_backends)dnl no, [no yes mod], ol_enable_backends)dnl
OL_ARG_ENABLE(passwd,[ --enable-passwd enable passwd backend], OL_ARG_ENABLE(passwd,[ --enable-passwd enable passwd backend],
...@@ -330,8 +333,10 @@ dnl ---------------------------------------------------------------- ...@@ -330,8 +333,10 @@ dnl ----------------------------------------------------------------
dnl SLAPD Overlay Options dnl SLAPD Overlay Options
Overlays="accesslog \ Overlays="accesslog \
auditlog \ auditlog \
collect \
constraint \ constraint \
dds \ dds \
deref \
dyngroup \ dyngroup \
dynlist \ dynlist \
memberof \ memberof \
...@@ -341,6 +346,7 @@ Overlays="accesslog \ ...@@ -341,6 +346,7 @@ Overlays="accesslog \
retcode \ retcode \
rwm \ rwm \
seqmod \ seqmod \
sssvlv \
syncprov \ syncprov \
translucent \ translucent \
unique \ unique \
...@@ -355,10 +361,14 @@ OL_ARG_ENABLE(accesslog,[ --enable-accesslog In-Directory Access Logging ov ...@@ -355,10 +361,14 @@ OL_ARG_ENABLE(accesslog,[ --enable-accesslog In-Directory Access Logging ov
no, [no yes mod], ol_enable_overlays) no, [no yes mod], ol_enable_overlays)
OL_ARG_ENABLE(auditlog,[ --enable-auditlog Audit Logging overlay], OL_ARG_ENABLE(auditlog,[ --enable-auditlog Audit Logging overlay],
no, [no yes mod], ol_enable_overlays) no, [no yes mod], ol_enable_overlays)
OL_ARG_ENABLE(collect,[ --enable-collect Collect overlay],
no, [no yes mod], ol_enable_overlays)
OL_ARG_ENABLE(constraint,[ --enable-constraint Attribute Constraint overlay], OL_ARG_ENABLE(constraint,[ --enable-constraint Attribute Constraint overlay],
no, [no yes mod], ol_enable_overlays) no, [no yes mod], ol_enable_overlays)
OL_ARG_ENABLE(dds,[ --enable-dds Dynamic Directory Services overlay], OL_ARG_ENABLE(dds,[ --enable-dds Dynamic Directory Services overlay],
no, [no yes mod], ol_enable_overlays) no, [no yes mod], ol_enable_overlays)
OL_ARG_ENABLE(deref,[ --enable-deref Dereference overlay],
no, [no yes mod], ol_enable_overlays)
OL_ARG_ENABLE(dyngroup,[ --enable-dyngroup Dynamic Group overlay], OL_ARG_ENABLE(dyngroup,[ --enable-dyngroup Dynamic Group overlay],
no, [no yes mod], ol_enable_overlays) no, [no yes mod], ol_enable_overlays)
OL_ARG_ENABLE(dynlist,[ --enable-dynlist Dynamic List overlay], OL_ARG_ENABLE(dynlist,[ --enable-dynlist Dynamic List overlay],
...@@ -376,7 +386,9 @@ OL_ARG_ENABLE(retcode,[ --enable-retcode Return Code testing overlay], ...@@ -376,7 +386,9 @@ OL_ARG_ENABLE(retcode,[ --enable-retcode Return Code testing overlay],
OL_ARG_ENABLE(rwm,[ --enable-rwm Rewrite/Remap overlay], OL_ARG_ENABLE(rwm,[ --enable-rwm Rewrite/Remap overlay],
no, [no yes mod], ol_enable_overlays) no, [no yes mod], ol_enable_overlays)
OL_ARG_ENABLE(seqmod,[ --enable-seqmod Sequential Modify overlay], OL_ARG_ENABLE(seqmod,[ --enable-seqmod Sequential Modify overlay],
yes, [no yes mod], ol_enable_overlays) no, [no yes mod], ol_enable_overlays)
OL_ARG_ENABLE(sssvlv,[ --enable-sssvlv ServerSideSort/VLV overlay],
no, [no yes mod], ol_enable_overlays)
OL_ARG_ENABLE(syncprov,[ --enable-syncprov Syncrepl Provider overlay], OL_ARG_ENABLE(syncprov,[ --enable-syncprov Syncrepl Provider overlay],
yes, [no yes mod], ol_enable_overlays) yes, [no yes mod], ol_enable_overlays)
OL_ARG_ENABLE(translucent,[ --enable-translucent Translucent Proxy overlay], OL_ARG_ENABLE(translucent,[ --enable-translucent Translucent Proxy overlay],
...@@ -460,6 +472,7 @@ elif test $ol_enable_modules != yes && ...@@ -460,6 +472,7 @@ elif test $ol_enable_modules != yes &&
test $ol_enable_ldap = no && test $ol_enable_ldap = no &&
test $ol_enable_meta = no && test $ol_enable_meta = no &&
test $ol_enable_monitor = no && test $ol_enable_monitor = no &&
test $ol_enable_ndb = no &&
test $ol_enable_null = no && test $ol_enable_null = no &&
test $ol_enable_passwd = no && test $ol_enable_passwd = no &&
test $ol_enable_perl = no && test $ol_enable_perl = no &&
...@@ -500,6 +513,8 @@ dnl ---------------------------------------------------------------- ...@@ -500,6 +513,8 @@ dnl ----------------------------------------------------------------
dnl Initialize vars dnl Initialize vars
LDAP_LIBS= LDAP_LIBS=
BDB_LIBS= BDB_LIBS=
SLAPD_NDB_LIBS=
SLAPD_NDB_INCS=
LTHREAD_LIBS= LTHREAD_LIBS=
LUTIL_LIBS= LUTIL_LIBS=
...@@ -518,6 +533,7 @@ BUILD_HDB=no ...@@ -518,6 +533,7 @@ BUILD_HDB=no
BUILD_LDAP=no BUILD_LDAP=no
BUILD_META=no BUILD_META=no
BUILD_MONITOR=no BUILD_MONITOR=no
BUILD_NDB=no
BUILD_NULL=no BUILD_NULL=no
BUILD_PASSWD=no BUILD_PASSWD=no
BUILD_PERL=no BUILD_PERL=no
...@@ -531,6 +547,7 @@ BUILD_AUDITLOG=no ...@@ -531,6 +547,7 @@ BUILD_AUDITLOG=no
BUILD_CONSTRAINT=no BUILD_CONSTRAINT=no
BUILD_DDS=no BUILD_DDS=no
BUILD_DENYOP=no BUILD_DENYOP=no
BUILD_DEREF=no
BUILD_DYNGROUP=no BUILD_DYNGROUP=no
BUILD_DYNLIST=no BUILD_DYNLIST=no
BUILD_LASTMOD=no BUILD_LASTMOD=no
...@@ -541,6 +558,7 @@ BUILD_REFINT=no ...@@ -541,6 +558,7 @@ BUILD_REFINT=no
BUILD_RETCODE=no BUILD_RETCODE=no
BUILD_RWM=no BUILD_RWM=no
BUILD_SEQMOD=no BUILD_SEQMOD=no
BUILD_SSSVLV=no
BUILD_SYNCPROV=no BUILD_SYNCPROV=no
BUILD_TRANSLUCENT=no BUILD_TRANSLUCENT=no
BUILD_UNIQUE=no BUILD_UNIQUE=no
...@@ -675,12 +693,14 @@ if test $ol_enable_perl != no ; then ...@@ -675,12 +693,14 @@ if test $ol_enable_perl != no ; then
fi fi
AC_PROG_CPP AC_PROG_CPP
OL_MSVC
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
dnl Checks for Windows NT dnl Checks for Windows NT
case $host_os in case $host_os in
*mingw32* ) ac_cv_mingw32=yes ;; *mingw32* ) ac_cv_mingw32=yes ;;
*cygwin* ) ac_cv_cygwin=yes ;; *cygwin* ) ac_cv_cygwin=yes ;;
*interix* ) ac_cv_interix=yes ;;
esac esac
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
...@@ -826,7 +846,10 @@ AC_CHECK_HEADERS( \ ...@@ -826,7 +846,10 @@ AC_CHECK_HEADERS( \
) )
dnl Only check Winsock on MinGW dnl Only check Winsock on MinGW
if test "$ac_cv_mingw32" = yes ; then if test "$ac_cv_mingw32" = yes \
-o "$ac_cv_interix" = yes \
-o "$ol_cv_msvc" = yes
then
AC_CHECK_HEADERS( winsock.h winsock2.h ) AC_CHECK_HEADERS( winsock.h winsock2.h )
fi fi
...@@ -858,37 +881,48 @@ if test $ac_cv_func_sigaction = no && test $ac_cv_func_sigaction = no ; then ...@@ -858,37 +881,48 @@ if test $ac_cv_func_sigaction = no && test $ac_cv_func_sigaction = no ; then
AC_CHECK_LIB(V3, sigset) AC_CHECK_LIB(V3, sigset)
fi fi
if test $ol_cv_msvc = yes ; then
ol_cv_winsock=yes
fi
dnl The following is INTENTIONALLY scripted out because shell does not dnl The following is INTENTIONALLY scripted out because shell does not
dnl support variable names with the '@' character, which is what dnl support variable names with the '@' character, which is what
dnl autoconf would try to generate if one merely used AC_SEARCH_LIBS dnl autoconf would try to generate if one merely used AC_SEARCH_LIBS
if test "$ac_cv_header_winsock_h" = yes; then if test "$ac_cv_header_winsock_h" = yes; then
AC_CACHE_CHECK([for winsock], [ol_cv_winsock], AC_CACHE_CHECK([for winsock], [ol_cv_winsock],[
save_LIBS="$LIBS" save_LIBS="$LIBS"
for curlib in ws2_32 wsock32; do for curlib in none ws2_32 wsock32; do
LIBS="$LIBS -l$curlib" if test $curlib != none ; then
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winsock.h> LIBS="$save_LIBS -l$curlib"
fi
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winsock.h>
]], [[ ]], [[
socket(0,0,0); socket(0,0,0);
select(0,NULL,NULL,NULL,NULL); select(0,NULL,NULL,NULL,NULL);
closesocket(0); closesocket(0);
gethostname(NULL,0); gethostname(NULL,0);
]])],[ol_cv_winsock=yes],[ol_cv_winsock=no]) ]])],[ol_cv_winsock=$curlib],[ol_cv_winsock=no])
if test $ol_cv_winsock = yes; then test "$ol_cv_winsock" != no && break
AC_DEFINE(HAVE_WINSOCK, 1, [define if you have winsock]) done
ac_cv_func_socket=yes LIBS="$save_LIBS"
ac_cv_func_select=yes ])
ac_cv_func_closesocket=yes
ac_cv_func_gethostname=yes if test $ol_cv_winsock != no ; then
if test $curlib = ws2_32; then AC_DEFINE(HAVE_WINSOCK, 1, [define if you have winsock])
ol_cv_winsock=winsock2 ac_cv_func_socket=yes
AC_DEFINE(HAVE_WINSOCK2, 1, ac_cv_func_select=yes
[define if you have winsock2]) ac_cv_func_closesocket=yes
ac_cv_func_gethostname=yes
if test $ol_cv_winsock != none -a $ol_cv_winsock != yes ; then
LIBS="$LIBS -l$ol_cv_winsock"
fi fi
break
if test $ol_cv_winsock = ws2_32 -o $ol_cv_winsock = yes ; then
AC_DEFINE(HAVE_WINSOCK2, 1, [define if you have winsock2])
fi
fi fi
LIBS="$save_LIBS"
done)
fi fi
dnl Find socket() dnl Find socket()
...@@ -953,7 +987,6 @@ then ...@@ -953,7 +987,6 @@ then
fi fi
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
# strerror checks
OL_STRERROR OL_STRERROR
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
...@@ -981,12 +1014,14 @@ dnl UUID Support ...@@ -981,12 +1014,14 @@ dnl UUID Support
have_uuid=no have_uuid=no
AC_CHECK_HEADERS(sys/uuid.h) AC_CHECK_HEADERS(sys/uuid.h)
dnl The HAVE_UUID_TO_STR code path also needs uuid_create
if test $ac_cv_header_sys_uuid_h = yes ; then if test $ac_cv_header_sys_uuid_h = yes ; then
save_LIBS="$LIBS" save_LIBS="$LIBS"
AC_SEARCH_LIBS([uuid_to_str], [uuid], [have_uuid=yes], :) AC_SEARCH_LIBS([uuid_to_str], [uuid], [have_uuid=yes], :)
AC_SEARCH_LIBS([uuid_create], [uuid], :, [have_uuid=no])
LIBS="$save_LIBS" LIBS="$save_LIBS"
if test have_uuid = yes ; then if test $have_uuid = yes ; then
AC_DEFINE(HAVE_UUID_TO_STR,1, AC_DEFINE(HAVE_UUID_TO_STR,1,
[define if you have uuid_to_str()]) [define if you have uuid_to_str()])
...@@ -996,14 +1031,16 @@ if test $ac_cv_header_sys_uuid_h = yes ; then ...@@ -996,14 +1031,16 @@ if test $ac_cv_header_sys_uuid_h = yes ; then
fi fi
dnl Look for uuid_generate dnl Look for uuid_generate
dnl The HAVE_UUID_GENERATE code path also needs uuid_unparse_lower
if test $have_uuid = no ; then if test $have_uuid = no ; then
AC_CHECK_HEADERS(uuid/uuid.h) AC_CHECK_HEADERS(uuid/uuid.h)
if test $ac_cv_header_uuid_uuid_h = yes ; then if test $ac_cv_header_uuid_uuid_h = yes ; then
save_LIBS="$LIBS" save_LIBS="$LIBS"
AC_SEARCH_LIBS([uuid_generate], [uuid], [have_uuid=yes], :) AC_SEARCH_LIBS([uuid_generate], [uuid], [have_uuid=yes], :)
AC_SEARCH_LIBS([uuid_unparse_lower], [uuid], :, [have_uuid=no])
LIBS="$save_LIBS" LIBS="$save_LIBS"
if test have_uuid = yes ; then if test $have_uuid = yes ; then
AC_DEFINE(HAVE_UUID_GENERATE,1, AC_DEFINE(HAVE_UUID_GENERATE,1,
[define if you have uuid_generate()]) [define if you have uuid_generate()])
...@@ -1799,6 +1836,7 @@ dnl ---------------------------------------------------------------- ...@@ -1799,6 +1836,7 @@ dnl ----------------------------------------------------------------
dnl Tests for reentrant functions necessary to build -lldap_r dnl Tests for reentrant functions necessary to build -lldap_r
AC_CHECK_FUNCS( \ AC_CHECK_FUNCS( \
ctime_r \ ctime_r \
gmtime_r localtime_r \
gethostbyname_r gethostbyaddr_r \ gethostbyname_r gethostbyaddr_r \
) )
...@@ -1840,12 +1878,6 @@ if test $ol_enable_bdb/$ol_enable_hdb != no/no; then ...@@ -1840,12 +1878,6 @@ if test $ol_enable_bdb/$ol_enable_hdb != no/no; then
BDB_LIBS="$BDB_LIBS $ol_cv_lib_db" BDB_LIBS="$BDB_LIBS $ol_cv_lib_db"
fi fi
OL_BDB_COMPAT
if test $ol_cv_bdb_compat != yes ; then
AC_MSG_ERROR([BDB/HDB: BerkeleyDB version incompatible])
fi
SLAPD_LIBS="$SLAPD_LIBS \$(BDB_LIBS)" SLAPD_LIBS="$SLAPD_LIBS \$(BDB_LIBS)"
ol_link_bdb=yes ol_link_bdb=yes
...@@ -1929,7 +1961,7 @@ if test $ol_enable_sql != no ; then ...@@ -1929,7 +1961,7 @@ if test $ol_enable_sql != no ; then
LIBS="$LTHREAD_LIBS" LIBS="$LTHREAD_LIBS"
if test $ol_with_odbc = auto ; then if test $ol_with_odbc = auto ; then
ol_with_odbc="iodbc unixodbc" ol_with_odbc="iodbc unixodbc odbc32"
fi fi
for odbc in $ol_with_odbc ; do for odbc in $ol_with_odbc ; do
...@@ -1949,6 +1981,13 @@ if test $ol_enable_sql != no ; then ...@@ -1949,6 +1981,13 @@ if test $ol_enable_sql != no ; then
fi fi
;; ;;
odbc32)
AC_CHECK_LIB(odbc32, SQLDriverConnect, [have_odbc32=yes], [have_odbc32=no])
if test $have_odbc32 = yes ; then
ol_link_sql="-lodbc32"
fi
;;
*) *)
AC_MSG_ERROR([unknown ODBC library]) AC_MSG_ERROR([unknown ODBC library])
;; ;;
...@@ -1966,6 +2005,47 @@ if test $ol_enable_sql != no ; then ...@@ -1966,6 +2005,47 @@ if test $ol_enable_sql != no ; then
fi fi
fi fi
dnl ----------------------------------------------------------------
dnl MySQL NDBapi
dnl Note: uses C++, but we don't want to add C++ test overhead to
dnl the rest of the libtool machinery.
ol_link_ndb=no
if test $ol_enable_ndb != no ; then
AC_CHECK_PROG(MYSQL,mysql_config,yes)
if test "$MYSQL" != yes ; then
AC_MSG_ERROR([could not locate mysql_config])
fi
SQL_INC=`mysql_config --include`
SLAPD_NDB_INCS="$SQL_INC $SQL_INC/storage/ndb $SQL_INC/storage/ndb/ndbapi"
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$SLAPD_NDB_INCS"
AC_MSG_CHECKING(for NdbApi.hpp)
AC_PREPROC_IFELSE(
[AC_LANG_SOURCE([[#include <NdbApi.hpp>]])],
AC_MSG_RESULT(yes),
AC_MSG_ERROR([could not locate NdbApi headers])
)
CPPFLAGS="$save_CPPFLAGS"
SQL_LIB=`mysql_config --libs_r`
SLAPD_NDB_LIBS="$SQL_LIB -lndbclient -lstdc++"
save_LDFLAGS="$LDFLAGS"
save_LIBS="$LIBS"
LDFLAGS="$SQL_LIB"
AC_CHECK_LIB(ndbclient,ndb_init,[: ok],[
AC_MSG_ERROR([could not locate ndbclient library])
],[-lstdc++])
LIBS="$save_LIBS"
LDFLAGS="$save_LDFLAGS"
if test "$ol_enable_ndb" = yes ; then
SLAPD_LIBS="$SLAPD_LIBS \$(SLAPD_NDB_LIBS)"
fi
fi
dnl ---------------------------------------------------------------- dnl ----------------------------------------------------------------
dnl International Components for Unicode dnl International Components for Unicode
OL_ICU OL_ICU
...@@ -2292,9 +2372,12 @@ AC_CHECK_FUNC(_snprintf, [ac_cv_func_snprintf=yes ...@@ -2292,9 +2372,12 @@ AC_CHECK_FUNC(_snprintf, [ac_cv_func_snprintf=yes
AC_DEFINE(snprintf, _snprintf, [define to snprintf routine]) AC_DEFINE(snprintf, _snprintf, [define to snprintf routine])
]) ])
AC_CHECK_FUNC(_vsnprintf, [ac_cv_func_vsnprintf=yes AC_CHECK_FUNCS(vsnprintf _vsnprintf)
if test $ac_cv_func_vsnprintf = no -a $ac_cv_func__vsnprintf = yes ; then
ac_cv_func_vsnprintf=yes
AC_DEFINE(vsnprintf, _vsnprintf, [define to vsnprintf routine]) AC_DEFINE(vsnprintf, _vsnprintf, [define to vsnprintf routine])
]) fi
AC_FUNC_VPRINTF AC_FUNC_VPRINTF
...@@ -2313,9 +2396,9 @@ AC_CHECK_FUNCS( \ ...@@ -2313,9 +2396,9 @@ AC_CHECK_FUNCS( \
flock \ flock \
fstat \ fstat \
getdtablesize \ getdtablesize \
geteuid \
getgrgid \ getgrgid \
gethostname \ gethostname \
getpass \
getpassphrase \ getpassphrase \
getpwuid \ getpwuid \
getpwnam \ getpwnam \
...@@ -2572,6 +2655,19 @@ if test "$ol_enable_meta" != no ; then ...@@ -2572,6 +2655,19 @@ if test "$ol_enable_meta" != no ; then
AC_DEFINE_UNQUOTED(SLAPD_META,$MFLAG,[define to support LDAP Metadirectory backend]) AC_DEFINE_UNQUOTED(SLAPD_META,$MFLAG,[define to support LDAP Metadirectory backend])
fi fi
if test "$ol_enable_ndb" != no ; then
BUILD_SLAPD=yes
BUILD_NDB=$ol_enable_ndb
if test "$ol_enable_ndb" = mod ; then
SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-ndb"
MFLAG=SLAPD_MOD_DYNAMIC
else
SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-ndb"
MFLAG=SLAPD_MOD_STATIC
fi
AC_DEFINE_UNQUOTED(SLAPD_NDB,$MFLAG,[define to support NDB backend])
fi
if test "$ol_enable_null" != no ; then if test "$ol_enable_null" != no ; then
BUILD_SLAPD=yes BUILD_SLAPD=yes
BUILD_NULL=$ol_enable_null BUILD_NULL=$ol_enable_null
...@@ -2690,6 +2786,18 @@ if test "$ol_enable_auditlog" != no ; then ...@@ -2690,6 +2786,18 @@ if test "$ol_enable_auditlog" != no ; then
AC_DEFINE_UNQUOTED(SLAPD_OVER_AUDITLOG,$MFLAG,[define for Audit Logging overlay]) AC_DEFINE_UNQUOTED(SLAPD_OVER_AUDITLOG,$MFLAG,[define for Audit Logging overlay])
fi fi
if test "$ol_enable_collect" != no ; then
BUILD_COLLECT=$ol_enable_collect
if test "$ol_enable_collect" = mod ; then
MFLAG=SLAPD_MOD_DYNAMIC
SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS collect.la"
else
MFLAG=SLAPD_MOD_STATIC
SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS collect.o"
fi
AC_DEFINE_UNQUOTED(SLAPD_OVER_COLLECT,$MFLAG,[define for Collect overlay])
fi
if test "$ol_enable_constraint" != no ; then if test "$ol_enable_constraint" != no ; then
BUILD_CONSTRAINT=$ol_enable_constraint BUILD_CONSTRAINT=$ol_enable_constraint
if test "$ol_enable_constraint" = mod ; then if test "$ol_enable_constraint" = mod ; then
...@@ -2714,6 +2822,18 @@ if test "$ol_enable_dds" != no ; then ...@@ -2714,6 +2822,18 @@ if test "$ol_enable_dds" != no ; then
AC_DEFINE_UNQUOTED(SLAPD_OVER_DDS,$MFLAG,[define for Dynamic Directory Services overlay]) AC_DEFINE_UNQUOTED(SLAPD_OVER_DDS,$MFLAG,[define for Dynamic Directory Services overlay])
fi fi
if test "$ol_enable_deref" != no ; then
BUILD_DEREF=$ol_enable_deref
if test "$ol_enable_deref" = mod ; then
MFLAG=SLAPD_MOD_DYNAMIC
SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS deref.la"
else
MFLAG=SLAPD_MOD_STATIC
SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS deref.o"
fi
AC_DEFINE_UNQUOTED(SLAPD_OVER_DEREF,$MFLAG,[define for Dynamic Directory Services overlay])
fi
if test "$ol_enable_dyngroup" != no ; then if test "$ol_enable_dyngroup" != no ; then
BUILD_DYNGROUP=$ol_enable_dyngroup BUILD_DYNGROUP=$ol_enable_dyngroup
if test "$ol_enable_dyngroup" = mod ; then if test "$ol_enable_dyngroup" = mod ; then
...@@ -2823,6 +2943,18 @@ if test "$ol_enable_seqmod" != no ; then ...@@ -2823,6 +2943,18 @@ if test "$ol_enable_seqmod" != no ; then
AC_DEFINE_UNQUOTED(SLAPD_OVER_SEQMOD,$MFLAG,[define for Sequential Modify overlay]) AC_DEFINE_UNQUOTED(SLAPD_OVER_SEQMOD,$MFLAG,[define for Sequential Modify overlay])
fi fi
if test "$ol_enable_sssvlv" != no ; then
BUILD_SSSVLV=$ol_enable_sssvlv
if test "$ol_enable_sssvlv" = mod ; then
MFLAG=SLAPD_MOD_DYNAMIC
SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS sssvlv.la"
else
MFLAG=SLAPD_MOD_STATIC
SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS sssvlv.o"
fi
AC_DEFINE_UNQUOTED(SLAPD_OVER_SSSVLV,$MFLAG,[define for ServerSideSort/VLV overlay])
fi
if test "$ol_enable_syncprov" != no ; then if test "$ol_enable_syncprov" != no ; then
BUILD_SYNCPROV=$ol_enable_syncprov BUILD_SYNCPROV=$ol_enable_syncprov
if test "$ol_enable_syncprov" = mod ; then if test "$ol_enable_syncprov" = mod ; then
...@@ -2889,7 +3021,7 @@ dnl For Windows build, we don't want to include -dlopen flags. ...@@ -2889,7 +3021,7 @@ dnl For Windows build, we don't want to include -dlopen flags.
dnl They hurt more than they help. dnl They hurt more than they help.
dnl dnl
if test "$ac_cv_mingw32" = yes ; then if test "$ac_cv_mingw32" = yes -o $ol_cv_msvc = yes ; then
PLAT=NT PLAT=NT
SLAPD_MODULES_LDFLAGS= SLAPD_MODULES_LDFLAGS=
else else
...@@ -2916,6 +3048,7 @@ dnl backends ...@@ -2916,6 +3048,7 @@ dnl backends
AC_SUBST(BUILD_LDAP) AC_SUBST(BUILD_LDAP)
AC_SUBST(BUILD_META) AC_SUBST(BUILD_META)
AC_SUBST(BUILD_MONITOR) AC_SUBST(BUILD_MONITOR)
AC_SUBST(BUILD_NDB)
AC_SUBST(BUILD_NULL) AC_SUBST(BUILD_NULL)
AC_SUBST(BUILD_PASSWD) AC_SUBST(BUILD_PASSWD)
AC_SUBST(BUILD_RELAY) AC_SUBST(BUILD_RELAY)
...@@ -2926,9 +3059,11 @@ dnl backends ...@@ -2926,9 +3059,11 @@ dnl backends
dnl overlays dnl overlays
AC_SUBST(BUILD_ACCESSLOG) AC_SUBST(BUILD_ACCESSLOG)
AC_SUBST(BUILD_AUDITLOG) AC_SUBST(BUILD_AUDITLOG)
AC_SUBST(BUILD_COLLECT)
AC_SUBST(BUILD_CONSTRAINT) AC_SUBST(BUILD_CONSTRAINT)
AC_SUBST(BUILD_DDS) AC_SUBST(BUILD_DDS)
AC_SUBST(BUILD_DENYOP) AC_SUBST(BUILD_DENYOP)
AC_SUBST(BUILD_DEREF)
AC_SUBST(BUILD_DYNGROUP) AC_SUBST(BUILD_DYNGROUP)
AC_SUBST(BUILD_DYNLIST) AC_SUBST(BUILD_DYNLIST)
AC_SUBST(BUILD_LASTMOD) AC_SUBST(BUILD_LASTMOD)
...@@ -2939,6 +3074,7 @@ dnl overlays ...@@ -2939,6 +3074,7 @@ dnl overlays
AC_SUBST(BUILD_RETCODE) AC_SUBST(BUILD_RETCODE)
AC_SUBST(BUILD_RWM) AC_SUBST(BUILD_RWM)
AC_SUBST(BUILD_SEQMOD) AC_SUBST(BUILD_SEQMOD)
AC_SUBST(BUILD_SSSVLV)
AC_SUBST(BUILD_SYNCPROV) AC_SUBST(BUILD_SYNCPROV)
AC_SUBST(BUILD_TRANSLUCENT) AC_SUBST(BUILD_TRANSLUCENT)
AC_SUBST(BUILD_UNIQUE) AC_SUBST(BUILD_UNIQUE)
...@@ -2947,6 +3083,8 @@ dnl overlays ...@@ -2947,6 +3083,8 @@ dnl overlays
AC_SUBST(LDAP_LIBS) AC_SUBST(LDAP_LIBS)
AC_SUBST(SLAPD_LIBS) AC_SUBST(SLAPD_LIBS)
AC_SUBST(BDB_LIBS) AC_SUBST(BDB_LIBS)
AC_SUBST(SLAPD_NDB_LIBS)
AC_SUBST(SLAPD_NDB_INCS)
AC_SUBST(LTHREAD_LIBS) AC_SUBST(LTHREAD_LIBS)
AC_SUBST(LUTIL_LIBS) AC_SUBST(LUTIL_LIBS)
AC_SUBST(WRAP_LIBS) AC_SUBST(WRAP_LIBS)
...@@ -3017,6 +3155,7 @@ AC_CONFIG_FILES([Makefile:build/top.mk:Makefile.in:build/dir.mk] ...@@ -3017,6 +3155,7 @@ AC_CONFIG_FILES([Makefile:build/top.mk:Makefile.in:build/dir.mk]
[servers/slapd/back-ldif/Makefile:build/top.mk:servers/slapd/back-ldif/Makefile.in:build/mod.mk] [servers/slapd/back-ldif/Makefile:build/top.mk:servers/slapd/back-ldif/Makefile.in:build/mod.mk]
[servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk] [servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk]
[servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk] [servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk]
[servers/slapd/back-ndb/Makefile:build/top.mk:servers/slapd/back-ndb/Makefile.in:build/mod.mk]
[servers/slapd/back-null/Makefile:build/top.mk:servers/slapd/back-null/Makefile.in:build/mod.mk] [servers/slapd/back-null/Makefile:build/top.mk:servers/slapd/back-null/Makefile.in:build/mod.mk]
[servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/mod.mk] [servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/mod.mk]
[servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/mod.mk] [servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/mod.mk]
...@@ -3040,7 +3179,7 @@ rm -f $BACKENDSC ...@@ -3040,7 +3179,7 @@ rm -f $BACKENDSC
cat > $BACKENDSC << ENDX cat > $BACKENDSC << ENDX
/* This work is part of OpenLDAP Software <http://www.openldap.org/>. /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
* *
* Copyright 1998-2008 The OpenLDAP Foundation. * Copyright 1998-2010 The OpenLDAP Foundation.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
...@@ -3091,7 +3230,7 @@ rm -f $OVERLAYSC ...@@ -3091,7 +3230,7 @@ rm -f $OVERLAYSC
cat > $OVERLAYSC << ENDX cat > $OVERLAYSC << ENDX
/* This work is part of OpenLDAP Software <http://www.openldap.org/>. /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
* *
* Copyright 1998-2008 The OpenLDAP Foundation. * Copyright 1998-2010 The OpenLDAP Foundation.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
......
contrib/ConfigOIDs
View file @ a624e749
...@@ -2,3 +2,5 @@ List of OpenLDAP Configuration OIDs allocated to contrib modules ...@@ -2,3 +2,5 @@ List of OpenLDAP Configuration OIDs allocated to contrib modules
OLcfgCt{Oc|At}:1 smbk5pwd OLcfgCt{Oc|At}:1 smbk5pwd
OLcfgCt{Oc|At}:2 autogroup OLcfgCt{Oc|At}:2 autogroup
OLcfgCt{Oc|At}:3 nssov
OLcfgCt{Oc|At}:4 cloak
contrib/README
View file @ a624e749
OpenLDAP Contributed Software README OpenLDAP Contributed Software README
OpenLDAP Project provides a number of freely-distributable LDAP OpenLDAP Project provides a number of freely-distributable LDAP
software packages. Though distributed with OpenLDAP Software, they software packages. While distributed as part of OpenLDAP Software,
are not part of OpenLDAP Software. Some packages may be out of they are not necessarily supported by the OpenLDAP Project. Some
date. Each package in this directory has it's own use and packages may be out of date. Each package in this directory has its
redistribution restrictions as documented within the package. own use and may have different redistribution restrictions than typical
for OpenLDAP Software.
Current contributions: Current contributions:
ldapc++ ldapc++
......
contrib/ldapc++/COPYRIGHT
View file @ a624e749
Copyright 1998-2008 The OpenLDAP Foundation Copyright 1998-2010 The OpenLDAP Foundation
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
......
contrib/ldapc++/Makefile.am
View file @ a624e749
# $OpenLDAP$ # $OpenLDAP$
## ##
# Copyright 2000-2003, OpenLDAP Foundation, All Rights Reserved. # Copyright 2000-2008, OpenLDAP Foundation, All Rights Reserved.
# COPYING RESTRICTIONS APPLY, see COPYRIGHT file # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
## ##
EXTRA_DIST = BUGS EXTRA_DIST=COPYRIGHT doxygen.rc LICENSE version.var version.sh
SUBDIRS = src examples SUBDIRS = src examples
contrib/ldapc++/Makefile.in
View file @ a624e749
# Makefile.in generated by automake 1.10 from Makefile.am. # Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # with or without modifications, as long as this notice is preserved.
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# $OpenLDAP$ # $OpenLDAP$
# Copyright 2000-2003, OpenLDAP Foundation, All Rights Reserved. # Copyright 2000-2008, OpenLDAP Foundation, All Rights Reserved.
# COPYING RESTRICTIONS APPLY, see COPYRIGHT file # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
VPATH = @srcdir@ VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
...@@ -93,6 +93,7 @@ CXXFLAGS = @CXXFLAGS@ ...@@ -93,6 +93,7 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@ DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@ ECHO = @ECHO@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@ ECHO_N = @ECHO_N@
...@@ -115,7 +116,9 @@ LN_S = @LN_S@ ...@@ -115,7 +116,9 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@ MKDIR_P = @MKDIR_P@
NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
OPENLDAP_CPP_API_VERSION = @OPENLDAP_CPP_API_VERSION@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_NAME = @PACKAGE_NAME@
...@@ -180,7 +183,7 @@ sysconfdir = @sysconfdir@ ...@@ -180,7 +183,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
EXTRA_DIST = BUGS EXTRA_DIST = COPYRIGHT doxygen.rc LICENSE version.var version.sh
SUBDIRS = src examples SUBDIRS = src examples
all: all-recursive all: all-recursive
...@@ -303,8 +306,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ...@@ -303,8 +306,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) ' { files[$$0] = 1; } \ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
END { for (i in files) print i; }'`; \ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique mkid -fID $$unique
tags: TAGS tags: TAGS
...@@ -329,8 +332,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ...@@ -329,8 +332,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) ' { files[$$0] = 1; } \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { for (i in files) print i; }'`; \ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \ test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
...@@ -340,13 +343,12 @@ ctags: CTAGS ...@@ -340,13 +343,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP) $(TAGS_FILES) $(LISP)
tags=; \ tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) ' { files[$$0] = 1; } \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { for (i in files) print i; }'`; \ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \ test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique $$tags $$unique
...@@ -417,6 +419,10 @@ dist-bzip2: distdir ...@@ -417,6 +419,10 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir) $(am__remove_distdir)
dist-lzma: distdir
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
$(am__remove_distdir)
dist-tarZ: distdir dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir) $(am__remove_distdir)
...@@ -443,6 +449,8 @@ distcheck: dist ...@@ -443,6 +449,8 @@ distcheck: dist
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \ *.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \ *.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \ *.shar.gz*) \
...@@ -594,8 +602,8 @@ uninstall-am: ...@@ -594,8 +602,8 @@ uninstall-am:
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \ all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
distclean-generic distclean-libtool distclean-tags \ distclean distclean-generic distclean-libtool distclean-tags \
distcleancheck distdir distuninstallcheck dvi dvi-am html \ distcleancheck distdir distuninstallcheck dvi dvi-am html \
html-am info info-am install install-am install-data \ html-am info info-am install install-am install-data \
install-data-am install-dvi install-dvi-am install-exec \ install-data-am install-dvi install-dvi-am install-exec \
......
contrib/ldapc++/aclocal.m4
View file @ a624e749
This diff is collapsed.
contrib/ldapc++/configure
View file @ a624e749
This diff is collapsed.
contrib/ldapc++/configure.in
View file @ a624e749
dnl $OpenLDAP$ dnl $OpenLDAP$
dnl Copyright 2000-2003, OpenLDAP Foundation, All Rights Reserved. dnl Copyright 2000-2008, OpenLDAP Foundation, All Rights Reserved.
dnl COPYING RESTRICTIONS APPLY, see COPYRIGHT file dnl COPYING RESTRICTIONS APPLY, see COPYRIGHT file
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl disable config.cache AC_COPYRIGHT([[Copyright 2000-2010 The OpenLDAP Foundation. All rights reserved.
dnl define([AC_CACHE_LOAD], ) Restrictions apply, see COPYRIGHT and LICENSE files.]])
dnl define([AC_CACHE_SAVE], ) AC_REVISION([$OpenLDAP$])
AC_INIT(ldapcpplib, [] , [http://www.openldap.org/its/] )
AC_INIT(ldapcpplib, 0.0.5)
AC_CONFIG_SRCDIR(src/LDAPConnection.h) AC_CONFIG_SRCDIR(src/LDAPConnection.h)
AM_INIT_AUTOMAKE(foreign) AM_INIT_AUTOMAKE(foreign)
AM_CONFIG_HEADER(src/config.h) AM_CONFIG_HEADER(src/config.h)
eval `$ac_aux_dir/version.sh`
if test -z "$OL_CPP_API_RELEASE"; then
AC_MSG_ERROR([could not determine version])
fi
VERSION=$OL_CPP_API_RELEASE
OPENLDAP_CPP_API_VERSION=$OL_CPP_API_VERSION
AC_SUBST(VERSION)
AC_SUBST(OPENLDAP_CPP_API_VERSION)
dnl Checks for programs. dnl Checks for programs.
AC_PROG_INSTALL AC_PROG_INSTALL
dnl AC_PROG_CC dnl AC_PROG_CC
...@@ -26,9 +33,7 @@ dnl AC_PROG_MAKE_SET ...@@ -26,9 +33,7 @@ dnl AC_PROG_MAKE_SET
AC_ARG_ENABLE(debug,[ --enable-debug],[ AC_ARG_ENABLE(debug,[ --enable-debug],[
CXXFLAGS="-g -O0 -Wall" CXXFLAGS="-g -O0 -Wall"
AC_DEFINE(WITH_DEBUG,[],[Define to 1 ot enable debug logging]) AC_DEFINE(WITH_DEBUG,[],[Define to 1 ot enable debug logging])
],[ ],
CXXFLAGS="-O0"
]
) )
AC_ARG_WITH(libldap,[ --with-libldap=DIR Path to the libldap library [/usr/local/lib]],[ AC_ARG_WITH(libldap,[ --with-libldap=DIR Path to the libldap library [/usr/local/lib]],[
......
contrib/ldapc++/doxygen.rc
View file @ a624e749
...@@ -262,7 +262,7 @@ EXTRACT_ALL = YES ...@@ -262,7 +262,7 @@ EXTRACT_ALL = YES
# If the EXTRACT_PRIVATE tag is set to YES all private members of a class # If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation. # will be included in the documentation.
EXTRACT_PRIVATE = YES EXTRACT_PRIVATE = NO
# If the EXTRACT_STATIC tag is set to YES all static members of a file # If the EXTRACT_STATIC tag is set to YES all static members of a file
# will be included in the documentation. # will be included in the documentation.
...@@ -273,7 +273,7 @@ EXTRACT_STATIC = NO ...@@ -273,7 +273,7 @@ EXTRACT_STATIC = NO
# defined locally in source files will be included in the documentation. # defined locally in source files will be included in the documentation.
# If set to NO only classes defined in header files are included. # If set to NO only classes defined in header files are included.
EXTRACT_LOCAL_CLASSES = YES EXTRACT_LOCAL_CLASSES = NO
# This flag is only useful for Objective-C code. When set to YES local # This flag is only useful for Objective-C code. When set to YES local
# methods, which are defined in the implementation section but not in # methods, which are defined in the implementation section but not in
......
contrib/ldapc++/examples/Makefile.am
View file @ a624e749
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# COPYING RESTRICTIONS APPLY, see COPYRIGHT file # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
## ##
AM_CPPFLAGS = -I$(top_srcdir)/src AM_CPPFLAGS = -I$(top_srcdir)/src
noinst_PROGRAMS = main readSchema urlTest noinst_PROGRAMS = main readSchema startTls urlTest
main_SOURCES = main.cpp main_SOURCES = main.cpp
main_LDADD = ../src/libldapcpp.la main_LDADD = ../src/libldapcpp.la
...@@ -13,5 +13,8 @@ main_LDADD = ../src/libldapcpp.la ...@@ -13,5 +13,8 @@ main_LDADD = ../src/libldapcpp.la
readSchema_SOURCES = readSchema.cpp readSchema_SOURCES = readSchema.cpp
readSchema_LDADD = ../src/libldapcpp.la readSchema_LDADD = ../src/libldapcpp.la
startTls_SOURCES = startTls.cpp
startTls_LDADD = ../src/libldapcpp.la
urlTest_SOURCES = urlTest.cpp urlTest_SOURCES = urlTest.cpp
urlTest_LDADD = ../src/libldapcpp.la urlTest_LDADD = ../src/libldapcpp.la
contrib/ldapc++/examples/Makefile.in
View file @ a624e749
# Makefile.in generated by automake 1.10 from Makefile.am. # Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@ # @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
# Inc.
# This Makefile.in is free software; the Free Software Foundation # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # with or without modifications, as long as this notice is preserved.
...@@ -18,8 +19,9 @@ ...@@ -18,8 +19,9 @@
VPATH = @srcdir@ VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644 install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c install_sh_PROGRAM = $(install_sh) -c
...@@ -34,7 +36,8 @@ PRE_UNINSTALL = : ...@@ -34,7 +36,8 @@ PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
build_triplet = @build@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
noinst_PROGRAMS = main$(EXEEXT) readSchema$(EXEEXT) urlTest$(EXEEXT) noinst_PROGRAMS = main$(EXEEXT) readSchema$(EXEEXT) startTls$(EXEEXT) \
urlTest$(EXEEXT)
subdir = examples subdir = examples
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
...@@ -44,6 +47,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ...@@ -44,6 +47,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(install_sh) -d mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/config.h CONFIG_HEADER = $(top_builddir)/src/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
PROGRAMS = $(noinst_PROGRAMS) PROGRAMS = $(noinst_PROGRAMS)
am_main_OBJECTS = main.$(OBJEXT) am_main_OBJECTS = main.$(OBJEXT)
main_OBJECTS = $(am_main_OBJECTS) main_OBJECTS = $(am_main_OBJECTS)
...@@ -51,12 +55,16 @@ main_DEPENDENCIES = ../src/libldapcpp.la ...@@ -51,12 +55,16 @@ main_DEPENDENCIES = ../src/libldapcpp.la
am_readSchema_OBJECTS = readSchema.$(OBJEXT) am_readSchema_OBJECTS = readSchema.$(OBJEXT)
readSchema_OBJECTS = $(am_readSchema_OBJECTS) readSchema_OBJECTS = $(am_readSchema_OBJECTS)
readSchema_DEPENDENCIES = ../src/libldapcpp.la readSchema_DEPENDENCIES = ../src/libldapcpp.la
am_startTls_OBJECTS = startTls.$(OBJEXT)
startTls_OBJECTS = $(am_startTls_OBJECTS)
startTls_DEPENDENCIES = ../src/libldapcpp.la
am_urlTest_OBJECTS = urlTest.$(OBJEXT) am_urlTest_OBJECTS = urlTest.$(OBJEXT)
urlTest_OBJECTS = $(am_urlTest_OBJECTS) urlTest_OBJECTS = $(am_urlTest_OBJECTS)
urlTest_DEPENDENCIES = ../src/libldapcpp.la urlTest_DEPENDENCIES = ../src/libldapcpp.la
DEFAULT_INCLUDES = -I. -I$(top_builddir)/src@am__isrc@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
depcomp = $(SHELL) $(top_srcdir)/depcomp depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles
am__mv = mv -f
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
...@@ -66,9 +74,10 @@ CXXLD = $(CXX) ...@@ -66,9 +74,10 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@ $(LDFLAGS) -o $@
SOURCES = $(main_SOURCES) $(readSchema_SOURCES) $(urlTest_SOURCES) SOURCES = $(main_SOURCES) $(readSchema_SOURCES) $(startTls_SOURCES) \
DIST_SOURCES = $(main_SOURCES) $(readSchema_SOURCES) \
$(urlTest_SOURCES) $(urlTest_SOURCES)
DIST_SOURCES = $(main_SOURCES) $(readSchema_SOURCES) \
$(startTls_SOURCES) $(urlTest_SOURCES)
ETAGS = etags ETAGS = etags
CTAGS = ctags CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
...@@ -91,29 +100,37 @@ CXXFLAGS = @CXXFLAGS@ ...@@ -91,29 +100,37 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@ DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
ECHO = @ECHO@ DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@ ECHO_T = @ECHO_T@
EGREP = @EGREP@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
F77 = @F77@ FGREP = @FGREP@
FFLAGS = @FFLAGS@
GREP = @GREP@ GREP = @GREP@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@ LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@ MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
OPENLDAP_CPP_API_VERSION = @OPENLDAP_CPP_API_VERSION@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_NAME = @PACKAGE_NAME@
...@@ -133,7 +150,7 @@ abs_top_builddir = @abs_top_builddir@ ...@@ -133,7 +150,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@ abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@ am__include = @am__include@
am__leading_dot = @am__leading_dot@ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@ am__quote = @am__quote@
...@@ -164,6 +181,7 @@ libdir = @libdir@ ...@@ -164,6 +181,7 @@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
localedir = @localedir@ localedir = @localedir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@ mandir = @mandir@
mkdir_p = @mkdir_p@ mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@ oldincludedir = @oldincludedir@
...@@ -176,6 +194,7 @@ sharedstatedir = @sharedstatedir@ ...@@ -176,6 +194,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@ srcdir = @srcdir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@
target_alias = @target_alias@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
...@@ -186,6 +205,8 @@ main_SOURCES = main.cpp ...@@ -186,6 +205,8 @@ main_SOURCES = main.cpp
main_LDADD = ../src/libldapcpp.la main_LDADD = ../src/libldapcpp.la
readSchema_SOURCES = readSchema.cpp readSchema_SOURCES = readSchema.cpp
readSchema_LDADD = ../src/libldapcpp.la readSchema_LDADD = ../src/libldapcpp.la
startTls_SOURCES = startTls.cpp
startTls_LDADD = ../src/libldapcpp.la
urlTest_SOURCES = urlTest.cpp urlTest_SOURCES = urlTest.cpp
urlTest_LDADD = ../src/libldapcpp.la urlTest_LDADD = ../src/libldapcpp.la
all: all-am all: all-am
...@@ -196,14 +217,14 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ...@@ -196,14 +217,14 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \ @for dep in $?; do \
case '$(am__configure_deps)' in \ case '$(am__configure_deps)' in \
*$$dep*) \ *$$dep*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
&& exit 0; \ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \ exit 1;; \
esac; \ esac; \
done; \ done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/Makefile'; \ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/Makefile'; \
cd $(top_srcdir) && \ $(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign examples/Makefile $(AUTOMAKE) --foreign examples/Makefile
.PRECIOUS: Makefile .PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \ @case '$?' in \
...@@ -221,19 +242,25 @@ $(top_srcdir)/configure: $(am__configure_deps) ...@@ -221,19 +242,25 @@ $(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
clean-noinstPROGRAMS: clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \
echo " rm -f $$p $$f"; \ rm -f $$list || exit $$?; \
rm -f $$p $$f ; \ test -n "$(EXEEXT)" || exit 0; \
done list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
main$(EXEEXT): $(main_OBJECTS) $(main_DEPENDENCIES) main$(EXEEXT): $(main_OBJECTS) $(main_DEPENDENCIES)
@rm -f main$(EXEEXT) @rm -f main$(EXEEXT)
$(CXXLINK) $(main_OBJECTS) $(main_LDADD) $(LIBS) $(CXXLINK) $(main_OBJECTS) $(main_LDADD) $(LIBS)
readSchema$(EXEEXT): $(readSchema_OBJECTS) $(readSchema_DEPENDENCIES) readSchema$(EXEEXT): $(readSchema_OBJECTS) $(readSchema_DEPENDENCIES)
@rm -f readSchema$(EXEEXT) @rm -f readSchema$(EXEEXT)
$(CXXLINK) $(readSchema_OBJECTS) $(readSchema_LDADD) $(LIBS) $(CXXLINK) $(readSchema_OBJECTS) $(readSchema_LDADD) $(LIBS)
startTls$(EXEEXT): $(startTls_OBJECTS) $(startTls_DEPENDENCIES)
@rm -f startTls$(EXEEXT)
$(CXXLINK) $(startTls_OBJECTS) $(startTls_LDADD) $(LIBS)
urlTest$(EXEEXT): $(urlTest_OBJECTS) $(urlTest_DEPENDENCIES) urlTest$(EXEEXT): $(urlTest_OBJECTS) $(urlTest_DEPENDENCIES)
@rm -f urlTest$(EXEEXT) @rm -f urlTest$(EXEEXT)
$(CXXLINK) $(urlTest_OBJECTS) $(urlTest_LDADD) $(LIBS) $(CXXLINK) $(urlTest_OBJECTS) $(urlTest_LDADD) $(LIBS)
...@@ -246,25 +273,26 @@ distclean-compile: ...@@ -246,25 +273,26 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readSchema.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readSchema.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/startTls.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/urlTest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/urlTest.Po@am__quote@
.cpp.o: .cpp.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
.cpp.obj: .cpp.obj:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cpp.lo: .cpp.lo:
@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
...@@ -280,45 +308,49 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ...@@ -280,45 +308,49 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) ' { files[$$0] = 1; } \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { for (i in files) print i; }'`; \ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique mkid -fID $$unique
tags: TAGS tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP) $(TAGS_FILES) $(LISP)
tags=; \ set x; \
here=`pwd`; \ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) ' { files[$$0] = 1; } \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { for (i in files) print i; }'`; \ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \ test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ if test $$# -gt 0; then \
$$tags $$unique; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
"$$@" $$unique; \
else \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$unique; \
fi; \
fi fi
ctags: CTAGS ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP) $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) ' { files[$$0] = 1; } \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { for (i in files) print i; }'`; \ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique $$unique
GTAGS: GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \ here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \ && $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags: distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
...@@ -339,13 +371,17 @@ distdir: $(DISTFILES) ...@@ -339,13 +371,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d "$(distdir)/$$file"; then \
find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \ fi; \
cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \ else \
test -f $(distdir)/$$file \ test -f "$(distdir)/$$file" \
|| cp -p $$d/$$file $(distdir)/$$file \ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \ || exit 1; \
fi; \ fi; \
done done
...@@ -373,6 +409,7 @@ clean-generic: ...@@ -373,6 +409,7 @@ clean-generic:
distclean-generic: distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"
...@@ -394,6 +431,8 @@ dvi-am: ...@@ -394,6 +431,8 @@ dvi-am:
html: html-am html: html-am
html-am:
info: info-am info: info-am
info-am: info-am:
...@@ -402,18 +441,28 @@ install-data-am: ...@@ -402,18 +441,28 @@ install-data-am:
install-dvi: install-dvi-am install-dvi: install-dvi-am
install-dvi-am:
install-exec-am: install-exec-am:
install-html: install-html-am install-html: install-html-am
install-html-am:
install-info: install-info-am install-info: install-info-am
install-info-am:
install-man: install-man:
install-pdf: install-pdf-am install-pdf: install-pdf-am
install-pdf-am:
install-ps: install-ps-am install-ps: install-ps-am
install-ps-am:
installcheck-am: installcheck-am:
maintainer-clean: maintainer-clean-am maintainer-clean: maintainer-clean-am
...@@ -451,6 +500,7 @@ uninstall-am: ...@@ -451,6 +500,7 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am pdf pdf-am ps ps-am tags uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:
contrib/ldapc++/examples/startTls.cpp 0 → 100644
View file @ a624e749
This diff is collapsed.
contrib/ldapc++/src/LDAPAsynConnection.h
View file @ a624e749
This diff is collapsed.
contrib/ldapc++/src/LDAPAttrType.cpp
View file @ a624e749
This diff is collapsed.