[Opensync-commits] r5501 - plugins/ldap-sync/src

[<svn...@op...>]

Author: scriptor
Date: Tue Mar 31 23:02:45 2009
New Revision: 5501
URL: http://www.opensync.org/changeset/5501

Log:
One more tiny change in the course of migrating from
the "anchor system" to the "state database".

Modified:
   plugins/ldap-sync/src/ldap_connect.c
   plugins/ldap-sync/src/ldap_plugin.h

Modified: plugins/ldap-sync/src/ldap_connect.c
==============================================================================
--- plugins/ldap-sync/src/ldap_connect.c	Tue Mar 31 20:34:51 2009	(r5500)
+++ plugins/ldap-sync/src/ldap_connect.c	Tue Mar 31 23:02:45 2009	(r5501)
@@ -433,7 +433,7 @@
 
 
 	// Anchor system
-	ldap_plugin_check_anchor_system(ctx, sinkenv, &error);
+	ldap_plugin_check_state_system(ctx, sinkenv, &error);
 
 
 

Modified: plugins/ldap-sync/src/ldap_plugin.h
==============================================================================
--- plugins/ldap-sync/src/ldap_plugin.h	Tue Mar 31 20:34:51 2009	(r5500)
+++ plugins/ldap-sync/src/ldap_plugin.h	Tue Mar 31 23:02:45 2009	(r5501)
@@ -71,7 +71,13 @@
 #include "config.h"
 
 
-
+/**
+ * @headerfile "/usr/local/include/valgrind/valgrind.h"
+ * @headerfile "/usr/local/include/valgrind/memcheck.h"
+ * @brief This header file must be included if you want to make
+ *        use of certain VALGRIND macros to check addressability
+ *        and definedness of a variable.
+ */
 #if 0
 #include "/usr/local/include/valgrind/valgrind.h"
 #include "/usr/local/include/valgrind/memcheck.h"
@@ -79,10 +85,24 @@
 
 
 
-#define OPENSYNC_DEBUG_MODULES 1
-// define DISABLE_SET_SLOWSYNC 1
-// define NO_OUTPUT_TO_SCREEN 1
-// define CALL_ABORT 1
+#define OPENSYNC_DEBUG_MODULES 1 ///< Defining ghis prevents libopensync from 
+                                 ///< calling free() and dlclose() so that the
+                                 ///< function names of this plugin keep being
+                                 ///< visible in backtraces when running
+                                 ///< valgrind ... --leak-check=full 
+#undef DISABLE_SET_SLOWSYNC 1 ///< Defining this disables all of the code
+                              ///< that deals with setting slowsync based
+                              ///< on any anchor or database setting.
+#undef NO_OUTPUT_TO_SCREEN 1 ///< Calls to ldap_plugin_printf() print a
+                             ///< message by default BOTH to the trace files
+                             ///< AND to the screen. However, defining this
+                             ///< makes this function abstain from printing
+                             ///< anything to the screen.
+#undef CALL_ABORT 1 ///< Defining this lets certain code call "abort()" rather
+                    ///< than "goto error". The code fragments that make
+                    ///< use of this define are known to detect error
+                    ///< conditions in libopensync. So they are almost
+                    ///< scheduled for debugging.
 
 #define DEBUG_auth 1
 #define DEBUG_configuration 1
@@ -146,9 +166,12 @@
 #define STYLESHEET_XMLFORMAT_TODO2LDAP_TODO "xmlformat_todo2ldap_todo.xsl"
 #define STYLESHEET_XMLFORMAT_NOTE2LDAP_NOTE "xmlformat_note2ldap_note.xsl"
 
-#define USER_ATTRIBUTES 1
-#define OPERATIONAL_ATTRIBUTES 2
-#define OBJECTCLASSES 3
+#define USER_ATTRIBUTES 1 ///< This refers to ldap_plugin_call_ldap_search()
+                          ///< and LDAP_ALL_USER_ATTRIBUTE in ldap.h
+#define OPERATIONAL_ATTRIBUTES 2 ///< This refers to ldap_plugin_call_ldap_search()
+                                 ///< and LDAP_ALL_OPERATIONAL_ATTRIBUTES in ldap.h
+#define OBJECTCLASSES 3 ///< This refers to ldap_plugin_call_ldap_search()
+                        
 
 
 
@@ -426,7 +449,7 @@
 int                dont_free(void);
 osync_bool         get_sync_info(OSyncPluginEnv *env, OSyncError **error);
 int                get_version(void);
-osync_bool         ldap_plugin_check_anchor_system(OSyncContext *ctx, sink_environment *sinkenv, OSyncError **error);
+osync_bool         ldap_plugin_check_state_system(OSyncContext *ctx, sink_environment *sinkenv, OSyncError **error);
 osync_bool         ldap_plugin_check_hash_calculation(OSyncContext *ctx, sink_environment *sinkenv, const char *debug_id, const char *hash, OSyncError **error);
 osync_bool         ldap_plugin_commit_addition(OSyncContext *ctx, sink_environment *sinkenv, OSyncChange *change, GList *ldap_entries, int *result, OSyncError **error);
 void               ldap_plugin_commit_change(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *userdata);