Attachment 308847 Details for Bug 436837 – cvs diffs

[patch] cvs diffs

schema_err.diffs (text/plain), 4.82 KB, created by Noriko Hosoi on 2008-06-10 18:37:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2008-06-10 18:37:01 UTC

Size: 4.82 KB

patch

obsolete

>Index: slapi-private.h
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi-private.h,v
>retrieving revision 1.22
>diff -t -w -U4 -r1.22 slapi-private.h
>--- slapi-private.h	4 Jun 2008 22:22:55 -0000	1.22
>+++ slapi-private.h	10 Jun 2008 18:23:20 -0000
>@@ -1083,9 +1083,9 @@
> #define DSE_SCHEMA_NO_BACKEND        0x0004  /* don't add as backend */
> 
> #define DSE_SCHEMA_NO_GLOCK          0x0010  /* don't lock global resources */
> #define DSE_SCHEMA_LOCKED            0x0020  /* already locked with
>-                                              * slapi_load_schemafile_lock;
>+                                              * reload_schemafile_lock;
>                                               * no further lock needed */
> #define DSE_SCHEMA_USER_DEFINED_ONLY 0x0100  /* refresh user defined schema */
> 
> #define SLAPI_RTN_BIT_FETCH_EXISTING_DN_ENTRY 0
>Index: proto-slap.h
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/proto-slap.h,v
>retrieving revision 1.33
>diff -t -w -U4 -r1.33 proto-slap.h
>--- proto-slap.h	4 Jun 2008 22:22:55 -0000	1.33
>+++ proto-slap.h	10 Jun 2008 18:23:20 -0000
>@@ -856,11 +856,8 @@
> /* Note: callers of g_set_global_schema_csn() must hold a write lock. */
> /* csn is consumed. */
> void g_set_global_schema_csn(CSN *csn);
> void slapi_schema_expand_objectclasses( Slapi_Entry *e );
>-/* lock to protect both objectclass and schema_dse */
>-void slapi_load_schemafile_lock( void );
>-void slapi_load_schemafile_unlock( void );
> /* API to validate the schema files */
> int slapi_validate_schema_files(char *schemadir);
> /* API to reload the schema files */
> int slapi_reload_schema_files(char *schemadir);
>Index: schema.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/schema.c,v
>retrieving revision 1.12
>diff -t -w -U4 -r1.12 schema.c
>--- schema.c	4 Jun 2008 22:22:55 -0000	1.12
>+++ schema.c	10 Jun 2008 18:23:20 -0000
>@@ -2722,9 +2722,9 @@
>  *     schema_flags      : Any or none of the following bits could be set
>  *                         DSE_SCHEMA_NO_CHECK -- schema won't be checked
>  *                         DSE_SCHEMA_NO_GLOCK -- don't lock global resources
>  *                         DSE_SCHEMA_LOCKED   -- already locked with
>- *                                                slapi_load_schemafile_lock;
>+ *                                                reload_schemafile_lock;
>  *                                                no further lock needed
>  *     schema_ds4x_compat: if non-zero, act like Netscape DS 4.x
>  *
>  * Returns: an LDAP error code
>@@ -3142,10 +3142,10 @@
>  *        DSE_SCHEMA_NO_CHECK -- schema won't be checked
>  *        DSE_SCHEMA_NO_GLOCK -- locking of global resources is turned off;
>  *                               this saves time during initialization since 
>  *                               the server operates in single threaded mode 
>- *                               at that time or in slapi_load_schemafile_lock.
>- *        DSE_SCHEMA_LOCKED   -- already locked with slapi_load_schemafile_lock;
>+ *                               at that time or in reload_schemafile_lock.
>+ *        DSE_SCHEMA_LOCKED   -- already locked with reload_schemafile_lock;
>  *                               no further lock needed
>  *
>  * if is_user_defined is true, force attribute type to be user defined.
>  *
>@@ -4891,16 +4891,16 @@
> }
> 
> /* lock to protect both objectclass and schema_dse */
> static void
>-slapi_load_schemafile_lock()
>+reload_schemafile_lock()
> {
>         oc_lock_write();
>         schema_dse_lock_write();
> }
> 
> static void
>-slapi_load_schemafile_unlock()
>+reload_schemafile_unlock()
> {
>         schema_dse_unlock();
>         oc_unlock();
> }
>@@ -4941,21 +4941,21 @@
>                                 "schema file reload failed\n" );
>                 return LDAP_LOCAL_ERROR;
>         }
>         slapi_be_Wlock(be);     /* be lock must be outer of schemafile lock */
>-        slapi_load_schemafile_lock();
>+        reload_schemafile_lock();
>         attr_syntax_delete_all();
>         oc_delete_all_nolock();
>         rc = init_schema_dse_ext(schemadir, be, &my_pschemadse,
>                            DSE_SCHEMA_NO_CHECK | DSE_SCHEMA_LOCKED);
>         if (rc) {
>                 dse_destroy(pschemadse);
>                 pschemadse = my_pschemadse;
>-                slapi_load_schemafile_unlock();
>+                reload_schemafile_unlock();
>                 slapi_be_Unlock(be);
>                 return LDAP_SUCCESS;
>         } else {
>-                slapi_load_schemafile_unlock();
>+                reload_schemafile_unlock();
>                 slapi_be_Unlock(be);
>                 slapi_log_error( SLAPI_LOG_FATAL, "schema_reload",
>                                 "schema file reload failed\n" );
>                 return LDAP_LOCAL_ERROR;

Actions: View | Diff

Attachments on bug 436837: 307257 | 308278 | 308379 | 308400 | 308403 | 308554 | 308555 | 308847 | 308848 | 311975