diff options
author | Noriko Hosoi <nhosoi@redhat.com> | 2008-06-04 22:22:57 +0000 |
---|---|---|
committer | Noriko Hosoi <nhosoi@redhat.com> | 2008-06-04 22:22:57 +0000 |
commit | 89517d1f8e4a5acf42ec9169e11db2e6d093b294 (patch) | |
tree | 6d9e0cda7312b4863acd7ff9382e279aede2f6f2 /ldap/servers/slapd/entry.c | |
parent | 9f291c3390124ebc4763701f3236598aff264c31 (diff) | |
download | ds-89517d1f8e4a5acf42ec9169e11db2e6d093b294.tar.gz ds-89517d1f8e4a5acf42ec9169e11db2e6d093b294.tar.xz ds-89517d1f8e4a5acf42ec9169e11db2e6d093b294.zip |
Resolves: #436837
Summary: Dynamically reload schema via task interface
Description: implemented task based schema file reloading
(see also http://directory.fedoraproject.org/wiki/Dynamically_Reload_Schema)
Diffstat (limited to 'ldap/servers/slapd/entry.c')
-rw-r--r-- | ldap/servers/slapd/entry.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ldap/servers/slapd/entry.c b/ldap/servers/slapd/entry.c index 4254af6f..57f1d47f 100644 --- a/ldap/servers/slapd/entry.c +++ b/ldap/servers/slapd/entry.c @@ -1067,7 +1067,14 @@ slapi_str2entry( char *s, int flags ) if ( flags & SLAPI_STR2ENTRY_EXPAND_OBJECTCLASSES ) { - slapi_schema_expand_objectclasses( e ); + if ( flags & SLAPI_STR2ENTRY_NO_SCHEMA_LOCK ) + { + schema_expand_objectclasses_nolock( e ); + } + else + { + slapi_schema_expand_objectclasses( e ); + } } if ( flags & SLAPI_STR2ENTRY_TOMBSTONE_CHECK ) |