mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

actually retrieve the target, to apply clauses like sets and so

Browse Source
This commit is contained in:
Pierangelo Masarati 2005-03-31 21:21:16 +00:00
parent 2605dfa81f
commit 3958eb9e98
2 changed files with 53 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
servers/slapd/slapacl.c
View File

@ -43,7 +43,7 @@ slapacl( int argc, char **argv )
Listener listener; Listener listener;
char opbuf[OPERATION_BUFFER_SIZE]; char opbuf[OPERATION_BUFFER_SIZE];
Operation *op; Operation *op;
Entry e = { 0 }; Entry e = { 0 }, *ep = &e;
char *attr = NULL; char *attr = NULL;
slap_tool_init( progname, SLAPACL, argc, argv ); slap_tool_init( progname, SLAPACL, argc, argv );
@ -116,6 +116,45 @@ slapacl( int argc, char **argv )
attr = slap_schema.si_ad_entry->ad_cname.bv_val; attr = slap_schema.si_ad_entry->ad_cname.bv_val;
} }
if ( !dryrun ) {
ID id;
if ( !be->be_entry_open ||
!be->be_entry_close ||
!be->be_dn2id_get ||
!be->be_entry_get )
{
fprintf( stderr, "%s: target database "
"doesn't support necessary operations; "
"you may try with \"-u\" (dry run).\n",
progname );
rc = 1;
goto destroy;
}
if ( be->be_entry_open( be, 0 ) != 0 ) {
fprintf( stderr, "%s: could not open database.\n",
progname );
rc = 1;
goto destroy;
}
id = be->be_dn2id_get( be, &e.e_nname );
if ( id == NOID ) {
fprintf( stderr, "%s: unable to fetch ID of DN \"%s\"\n",
progname, e.e_nname.bv_val );
rc = 1;
goto destroy;
}
if ( be->be_id2entry_get( be, id, &ep ) != 0 ) {
fprintf( stderr, "%s: unable to fetch entry \"%s\" (%lu)\n",
progname, e.e_nname.bv_val, id );
rc = 1;
goto destroy;
}
}
for ( ; argc--; argv++ ) { for ( ; argc--; argv++ ) {
slap_mask_t mask; slap_mask_t mask;
AttributeDescription *desc = NULL; AttributeDescription *desc = NULL;
@ -164,7 +203,7 @@ slapacl( int argc, char **argv )
break; break;
} }
rc = access_allowed_mask( op, &e, desc, valp, access, rc = access_allowed_mask( op, ep, desc, valp, access,
NULL, &mask ); NULL, &mask );
if ( accessstr ) { if ( accessstr ) {
@ -187,6 +226,15 @@ slapacl( int argc, char **argv )
} }
destroy:; destroy:;
ber_memfree( e.e_name.bv_val );
ber_memfree( e.e_nname.bv_val );
if ( !dryrun ) {
if ( ep != &e ) {
be_entry_release_r( op, ep );
}
be->be_entry_close( be );
}
slap_tool_destroy(); slap_tool_destroy();
return rc; return rc;

6
servers/slapd/slapcommon.c
View File

@ -55,7 +55,7 @@ usage( int tool, const char *progname )
switch( tool ) { switch( tool ) {
case SLAPACL: case SLAPACL:
options = "\n\t[-U authcID | -D authcDN]" options = "\n\t[-U authcID | -D authcDN]"
" -b DN -o <var>[=<val>]" " -b DN -o <var>[=<val>] [-u]"
"\n\t[attr[/access][:value]] [...]\n"; "\n\t[attr[/access][:value]] [...]\n";
break; break;
@ -214,7 +214,7 @@ slap_tool_init(
break; break;
case SLAPACL: case SLAPACL:
options = "b:D:d:f:F:o:U:v"; options = "b:D:d:f:F:o:uU:v";
mode |= SLAP_TOOL_READMAIN | SLAP_TOOL_READONLY; mode |= SLAP_TOOL_READMAIN | SLAP_TOOL_READONLY;
break; break;
@ -582,8 +582,8 @@ void slap_tool_destroy( void )
{ {
if ( !dryrun ) { if ( !dryrun ) {
slap_shutdown( be ); slap_shutdown( be );
}
slap_destroy(); slap_destroy();
}
#ifdef SLAPD_MODULES #ifdef SLAPD_MODULES
if ( slapMode == SLAP_SERVER_MODE ) { if ( slapMode == SLAP_SERVER_MODE ) {
/* always false. just pulls in necessary symbol references. */ /* always false. just pulls in necessary symbol references. */