Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 312297 Details for
Bug 456162
Merge in DNA plug-in code from FreeIPA
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
CVS Diffs
diffs.txt (text/plain), 53.69 KB, created by
Nathan Kinder
on 2008-07-21 20:14:07 UTC
(
hide
)
Description:
CVS Diffs
Filename:
MIME Type:
Creator:
Nathan Kinder
Created:
2008-07-21 20:14:07 UTC
Size:
53.69 KB
patch
obsolete
>Index: dna.c >=================================================================== >RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/dna/dna.c,v >retrieving revision 1.3 >diff -u -5 -t -w -r1.3 dna.c >--- dna.c 18 Oct 2007 22:25:14 -0000 1.3 >+++ dna.c 21 Jul 2008 20:01:12 -0000 >@@ -44,10 +44,11 @@ > * Distributed Numeric Assignment plug-in > */ > #include <stdio.h> > #include <ctype.h> > #include <string.h> >+#include <errno.h> > #include "portable.h" > #include "nspr.h" > #include "slapi-private.h" > #include "dirlite_strings.h" > #include "dirver.h" >@@ -58,11 +59,11 @@ > #ifndef _WIN32 > #include <sys/stat.h> > #endif > > #define DNA_PLUGIN_SUBSYSTEM "dna-plugin" >-#define DNA_PLUGIN_VERSION 0x00010000 >+#define DNA_PLUGIN_VERSION 0x00020000 > > #define DNA_DN "cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config" /* temporary */ > > #define DNA_SUCCESS 0 > #define DNA_FAILURE -1 >@@ -76,10 +77,20 @@ > #define DNA_INTERVAL "dnaInterval" > #define DNA_GENERATE "dnaMagicRegen" > #define DNA_FILTER "dnaFilter" > #define DNA_SCOPE "dnaScope" > >+/* since v2 */ >+#define DNA_MAXVAL "dnaMaxValue" >+#define DNA_SHARED_CFG_DN "dnaSharedCfgDN" >+ >+/* Shared Config */ >+#define DNA_GLOBAL_RANGE "dnaGlobalRange" >+#define DNA_RANGE "dnaRange" >+#define DNA_MAX_RANGE_SIZE "dnaMaxRangeSize" >+#define DNA_CHUNK_SIZE "dnaChunkSize" >+ > #define FEATURE_DESC "Distributed Numeric Assignment" > #define PLUGIN_DESC "Distributed Numeric Assignment plugin" > > static Slapi_PluginDesc pdesc = { FEATURE_DESC, > PLUGIN_MAGIC_VENDOR_STR, >@@ -89,23 +100,25 @@ > > /** > * linked list of config entries > */ > >-struct _defs { >+struct configEntry { > PRCList list; > char *dn; > char *type; > char *prefix; >- unsigned long nextval; >- unsigned long interval; >- struct slapi_filter *filter; >+ PRUint64 nextval; >+ PRUint64 interval; >+ PRUint64 maxval; >+ char *filter; >+ struct slapi_filter *slapi_filter; > char *generate; > char *scope; >-} dna_anchor; >-typedef struct _defs configEntry; >-static PRCList *config; >+}; >+ >+static PRCList *dna_global_config = NULL; > static PRRWLock *g_dna_cache_lock; > > static void *_PluginID = NULL; > static char *_PluginDN = NULL; > >@@ -131,20 +144,21 @@ > * > */ > static int loadPluginConfig(); > static int parseConfigEntry(Slapi_Entry *e); > static void deleteConfig(); >-static void freeConfigEntry(configEntry **entry); >+static void freeConfigEntry(struct configEntry ** entry); > > /** > * > * helpers > * > */ > static char *dna_get_dn(Slapi_PBlock *pb); > static int dna_dn_is_config(char *dn); >-static int dna_get_next_value(configEntry *config_entry, char **next_value_ret); >+static int dna_get_next_value(struct configEntry * config_entry, >+ char **next_value_ret); > > /** > * > * the ops (where the real work is done) > * >@@ -156,11 +170,11 @@ > > /** > * debug functions - global, for the debugger > */ > void dnaDumpConfig(); >-void dnaDumpConfigEntry(configEntry *); >+void dnaDumpConfigEntry(struct configEntry *); > > /** > * set the debug level > */ > #ifdef _WIN32 >@@ -233,11 +247,12 @@ > int dna_init( Slapi_PBlock *pb ) > { > int status = DNA_SUCCESS; > char * plugin_identity=NULL; > >- slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "--> dna_init\n"); >+ slapi_log_error(SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM, >+ "--> dna_init\n"); > > /** > * Store the plugin identity for later use. > * Used for internal operations > */ >@@ -257,27 +272,26 @@ > slapi_pblock_set(pb, SLAPI_PLUGIN_PRE_MODIFY_FN, > (void *) dna_mod_pre_op ) != 0 || > slapi_pblock_set(pb, SLAPI_PLUGIN_PRE_ADD_FN, > (void *) dna_add_pre_op ) != 0 || > /* the config change checking post op */ >- slapi_register_plugin( >- "postoperation", /* op type */ >+ slapi_register_plugin("postoperation", /* op type */ > 1, /* Enabled */ > "dna_init", /* this function desc */ > dna_postop_init, /* init func for post op */ > PLUGIN_DESC, /* plugin desc */ > NULL, /* ? */ > plugin_identity /* access control */ > ) >- ) >- { >+ ) { > slapi_log_error( SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM, > "dna_init: failed to register plugin\n" ); > status = DNA_FAILURE; > } > >- slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "<-- dna_init\n"); >+ slapi_log_error(SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM, >+ "<-- dna_init\n"); > return status; > } > > > static int dna_postop_init(Slapi_PBlock *pb) >@@ -293,13 +307,11 @@ > slapi_pblock_set(pb, SLAPI_PLUGIN_POST_MODRDN_FN, > (void *) dna_config_check_post_op ) != 0 || > slapi_pblock_set(pb, SLAPI_PLUGIN_POST_DELETE_FN, > (void *) dna_config_check_post_op ) != 0 || > slapi_pblock_set(pb, SLAPI_PLUGIN_POST_MODIFY_FN, >- (void *) dna_config_check_post_op ) != 0 >- ) >- { >+ (void *) dna_config_check_post_op) != 0) { > slapi_log_error( SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM, > "dna_postop_init: failed to register plugin\n" ); > status = DNA_FAILURE; > } > >@@ -313,20 +325,18 @@ > It is called after dna_init. > */ > static int dna_start( Slapi_PBlock *pb ) > { > char * plugindn = NULL; >- char * httpRootDir = NULL; > >- slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "--> dna_start\n"); >+ slapi_log_error(SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM, >+ "--> dna_start\n"); > >- config = &dna_anchor.list; > g_dna_cache_lock = PR_NewRWLock(PR_RWLOCK_RANK_NONE, "dna"); > g_new_value_lock = slapi_new_mutex(); > >- if(!g_dna_cache_lock || !g_new_value_lock) >- { >+ if (!g_dna_cache_lock || !g_new_value_lock) { > slapi_log_error( SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM, > "dna_start: lock creation failed\n" ); > > return DNA_FAILURE; > } >@@ -335,38 +345,39 @@ > * Get the plug-in target dn from the system > * and store it for future use. This should avoid > * hardcoding of DN's in the code. > */ > slapi_pblock_get(pb, SLAPI_TARGET_DN, &plugindn); >- if (plugindn == NULL || strlen(plugindn) == 0) >- { >+ if (NULL == plugindn || 0 == strlen(plugindn)) { > slapi_log_error( SLAPI_LOG_PLUGIN, DNA_PLUGIN_SUBSYSTEM , > "dna_start: had to use hard coded config dn\n"); > plugindn = DNA_DN; >- } >- else >- { >+ } else { > slapi_log_error( SLAPI_LOG_PLUGIN, DNA_PLUGIN_SUBSYSTEM , > "dna_start: config at %s\n", plugindn); > > } > > setPluginDN(plugindn); > > /** > * Load the config for our plug-in > */ >- PR_INIT_CLIST(config); >- if (loadPluginConfig() != DNA_SUCCESS) >- { >+ dna_global_config = (PRCList *) >+ slapi_ch_calloc(1, sizeof(struct configEntry)); >+ PR_INIT_CLIST(dna_global_config); >+ >+ if (loadPluginConfig() != DNA_SUCCESS) { > slapi_log_error( SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM, > "dna_start: unable to load plug-in configuration\n" ); > return DNA_FAILURE; > } > >- slapi_log_error( SLAPI_LOG_PLUGIN, DNA_PLUGIN_SUBSYSTEM , "dna: ready for service\n"); >- slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "<-- dna_start\n"); >+ slapi_log_error(SLAPI_LOG_PLUGIN, DNA_PLUGIN_SUBSYSTEM, >+ "dna: ready for service\n"); >+ slapi_log_error(SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM, >+ "<-- dna_start\n"); > > return DNA_SUCCESS; > } > > /* >@@ -374,23 +385,27 @@ > -------------- > closes down the cache > */ > static int dna_close( Slapi_PBlock *pb ) > { >- slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "--> dna_close\n"); >+ slapi_log_error(SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM, >+ "--> dna_close\n"); > > deleteConfig(); > >- slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "<-- dna_close\n"); >+ slapi_ch_free((void **)&dna_global_config); >+ >+ slapi_log_error(SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM, >+ "<-- dna_close\n"); > > return DNA_SUCCESS; > } > > /* > * config looks like this > * - cn=myplugin >- * --- ou=posix >+ * --- cn=posix > * ------ cn=accounts > * ------ cn=groups > * --- cn=samba > * --- cn=etc > * ------ cn=etc etc >@@ -401,214 +416,235 @@ > int result; > int i; > Slapi_PBlock *search_pb; > Slapi_Entry **entries = NULL; > >- slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "--> loadPluginConfig\n"); >+ slapi_log_error(SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM, >+ "--> loadPluginConfig\n"); > > dna_write_lock(); > deleteConfig(); > > search_pb = slapi_pblock_new(); > >- slapi_search_internal_set_pb(search_pb, DNA_DN, LDAP_SCOPE_SUBTREE, >- "objectclass=*", NULL, 0, NULL, NULL, getPluginID(), 0); >+ slapi_search_internal_set_pb(search_pb, getPluginDN(), >+ LDAP_SCOPE_SUBTREE, "objectclass=*", >+ NULL, 0, NULL, NULL, getPluginID(), 0); > slapi_search_internal_pb(search_pb); > slapi_pblock_get(search_pb, SLAPI_PLUGIN_INTOP_RESULT, &result); > >- if (status != DNA_SUCCESS) >- { >- status = DNA_SUCCESS; >+ if (LDAP_SUCCESS != result) { >+ status = DNA_FAILURE; > goto cleanup; > } > >- slapi_pblock_get(search_pb, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, &entries); >- if (NULL == entries || entries[0] == NULL) >- { >+ slapi_pblock_get(search_pb, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, >+ &entries); >+ if (NULL == entries || NULL == entries[0]) { > status = DNA_SUCCESS; > goto cleanup; > } > >- for (i = 0; (entries[i] != NULL); i++) >- { >+ for (i = 0; (entries[i] != NULL); i++) { > status = parseConfigEntry(entries[i]); >+ if (DNA_SUCCESS != status) >+ break; > } > > cleanup: > slapi_free_search_results_internal(search_pb); > slapi_pblock_destroy(search_pb); > dna_unlock(); >- slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "<-- loadPluginConfig\n"); >+ slapi_log_error(SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM, >+ "<-- loadPluginConfig\n"); > > return status; > } > > static int parseConfigEntry(Slapi_Entry *e) > { >- char *key = NULL; >- char *value = NULL; >- configEntry *entry = NULL; >- configEntry *config_entry = NULL; >- Slapi_Attr *attr = NULL; >- PRCList *list = NULL; >+ char *value; >+ struct configEntry *entry; >+ struct configEntry *config_entry; >+ PRCList *list; > int entry_added = 0; > >- slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "--> parseConfigEntry\n"); >+ slapi_log_error(SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM, >+ "--> parseConfigEntry\n"); > >- entry = (configEntry*) slapi_ch_calloc(1, sizeof(configEntry)); >- if(0 == entry) >+ entry = (struct configEntry *) >+ slapi_ch_calloc(1, sizeof(struct configEntry)); >+ if (NULL == entry) > goto bail; > > value = slapi_entry_get_ndn(e); > if(value) { > entry->dn = strdup(value); > } > >- slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "----------> dn [%s] \n",entry->dn,0,0); >+ slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM, >+ "----------> dn [%s]\n", entry->dn, 0, 0); > > value = slapi_entry_attr_get_charptr(e, DNA_TYPE); > if(value) { > entry->type = value; >- } >- else >+ } else > goto bail; > >- slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "----------> dnaType [%s] \n",entry->type,0,0); >+ slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM, >+ "----------> dnaType [%s]\n", entry->type, 0, 0); >+ >+ /* FIXME: check the attribute type, it must suport matching rules and be >+ * indexed, these are requirements and failure to meet them should result in >+ * the configuration to be disarded and an ERROR logged prominently */ > > value = slapi_entry_attr_get_charptr(e, DNA_NEXTVAL); > if (value) { > entry->nextval = strtoul(value,0,0); > slapi_ch_free_string(&value); >- value = 0; >- } >- else >+ } else > goto bail; > >- slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "----------> dnaNextValue [%d] \n",entry->nextval,0,0); >+ slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM, >+ "----------> dnaNextValue [%d]\n", entry->nextval, 0, >+ 0); > > value = slapi_entry_attr_get_charptr(e, DNA_PREFIX); >- if (value) { >+ if (value && value[0]) { > entry->prefix = value; > } > >- slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "----------> dnaPrefix [%s] \n",entry->prefix,0,0); >+ slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM, >+ "----------> dnaPrefix [%s]\n", entry->prefix, 0, 0); > > value = slapi_entry_attr_get_charptr(e, DNA_INTERVAL); > if (value) { > entry->interval = strtoul(value,0,0); >- slapi_ch_free_string(&value); >- value = 0; >- } >- else >+ } else > goto bail; > >- slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "----------> dnaInterval [%s] \n",value,0,0); >+ slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM, >+ "----------> dnaInterval [%s]\n", value, 0, 0); >+ >+ slapi_ch_free_string(&value); > > value = slapi_entry_attr_get_charptr(e, DNA_GENERATE); > if (value) { > entry->generate = value; > } > >- slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "----------> dnaMagicRegen [%s] \n",entry->generate,0,0); >+ slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM, >+ "----------> dnaMagicRegen [%s]\n", entry->generate, >+ 0, 0); > > value = slapi_entry_attr_get_charptr(e, DNA_FILTER); > if (value) { >+ entry->filter = value; > if (NULL == (entry->filter = slapi_str2filter(value))) { > slapi_log_error(SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM , > "Error: Invalid search filter in entry [%s]: [%s]\n", > entry->dn, value); > goto bail; > } >- } >- else >+ } else { > goto bail; >+ } > >- slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "----------> dnaFilter [%s] \n",value,0,0); >- >- slapi_ch_free_string(&value); >- value = 0; >+ slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM, >+ "----------> dnaFilter [%s]\n", value, 0, 0); > > value = slapi_entry_attr_get_charptr(e, DNA_SCOPE); > if (value) { >- char *canonical_dn = slapi_dn_normalize(value); >- entry->scope = canonical_dn; >+ entry->scope = slapi_dn_normalize(value); > } > >- slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "----------> dnaScope [%s] \n",entry->scope,0,0); >+ slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM, >+ "----------> dnaScope [%s]\n", entry->scope, 0, 0); >+ >+ /* optional, if not specified set -1 which is converted to the max unisgnee >+ * value */ >+ value = slapi_entry_attr_get_charptr(e, DNA_MAXVAL); >+ if (value) { >+ entry->maxval = strtoul(value, 0, 0); >+ >+ slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM, >+ "----------> dnaMaxValue [%ld]\n", value, 0, 0); >+ >+ slapi_ch_free_string(&value); >+ } else >+ entry->maxval = -1; > > > /** > * Finally add the entry to the list > * we group by type then by filter > * and finally sort by dn length with longer dn's > * first - this allows the scope checking > * code to be simple and quick and > * cunningly linear > */ >- if(!PR_CLIST_IS_EMPTY(config)) >- { >- list = PR_LIST_HEAD(config); >- while(list != config) >- { >- config_entry = (configEntry*)list; >+ if (!PR_CLIST_IS_EMPTY(dna_global_config)) { >+ list = PR_LIST_HEAD(dna_global_config); >+ while (list != dna_global_config) { >+ config_entry = (struct configEntry *) list; > > if(slapi_attr_type_cmp(config_entry->type, entry->type,1)) > goto next; > >- if(slapi_filter_compare(config_entry->filter, entry->filter)) >+ if (slapi_filter_compare(config_entry->slapi_filter, >+ entry->slapi_filter)) > goto next; > >- if(slapi_dn_issuffix(entry->scope,config_entry->scope)) >- { >+ if (slapi_dn_issuffix(entry->scope, config_entry->scope)) { > PR_INSERT_BEFORE(&(entry->list), list); > slapi_log_error( SLAPI_LOG_CONFIG, > DNA_PLUGIN_SUBSYSTEM , >- "store [%s] before [%s] \n",entry->scope,config_entry->scope,0); >+ "store [%s] before [%s] \n", entry->scope, >+ config_entry->scope, 0); > entry_added = 1; > break; > } > > next: > list = PR_NEXT_LINK (list); > >- if(config == list) >- { >+ if (dna_global_config == list) { > /* add to tail */ > PR_INSERT_BEFORE(&(entry->list), list); >- slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "store [%s] at tail\n",entry->scope,0,0); >+ slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM, >+ "store [%s] at tail\n", entry->scope, 0, >+ 0); > entry_added = 1; > break; > } > } >- } >- else >- { >+ } else { > /* first entry */ >- PR_INSERT_LINK(&(entry->list), config); >- slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , "store [%s] at head \n",entry->scope,0,0); >+ PR_INSERT_LINK(&(entry->list), dna_global_config); >+ slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM, >+ "store [%s] at head \n", entry->scope, 0, 0); > entry_added = 1; > } > > bail: >- if(0 == entry_added) >- { >+ if (0 == entry_added) { > slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , > "config entry [%s] skipped\n",entry->dn,0,0); > freeConfigEntry(&entry); > } > >- slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "<-- parseConfigEntry\n"); >+ slapi_log_error(SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM, >+ "<-- parseConfigEntry\n"); > > return DNA_SUCCESS; > } > >-static void freeConfigEntry(configEntry **entry) >+static void freeConfigEntry(struct configEntry ** entry) > { >- configEntry *e = *entry; >+ struct configEntry *e = *entry; > >- if(e->dn) >- { >+ if (e->dn) { > slapi_log_error( SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM , > "freeing config entry [%s]\n",e->dn,0,0); > slapi_ch_free_string(&e->dn); > } > >@@ -617,11 +653,14 @@ > > if(e->prefix) > slapi_ch_free_string(&e->prefix); > > if(e->filter) >- slapi_filter_free(e->filter,1); >+ slapi_ch_free_string(&e->filter); >+ >+ if (e->slapi_filter) >+ slapi_filter_free(e->slapi_filter, 1); > > if(e->generate) > slapi_ch_free_string(&e->generate); > > if(e->scope) >@@ -631,46 +670,71 @@ > } > > static void deleteConfigEntry(PRCList *entry) > { > PR_REMOVE_LINK(entry); >- freeConfigEntry((configEntry**)&entry); >+ freeConfigEntry((struct configEntry **) & entry); > } > > static void deleteConfig() > { > PRCList *list; > >- while(!PR_CLIST_IS_EMPTY(config)) >- { >- list = PR_LIST_HEAD(config); >+ while (!PR_CLIST_IS_EMPTY(dna_global_config)) { >+ list = PR_LIST_HEAD(dna_global_config); > deleteConfigEntry(list); > } > > return; > } > >+/**************************************************** >+ Distributed ranges Helpers >+****************************************************/ >+ >+static int dna_fix_maxval(Slapi_DN *dn, PRUint64 *cur, PRUint64 *max) >+{ >+ /* TODO: check the main partition to see if another range >+ * is available, and set the new local configuration >+ * accordingly. >+ * If a new range is not available run the retrieval task >+ * and simply return error >+ */ >+ >+ return LDAP_OPERATIONS_ERROR; >+} >+ >+static void dna_notice_allocation(Slapi_DN *dn, PRUint64 new) >+{ >+ /* TODO: check if we passed a new chunk threshold and update >+ * the shared configuration on the public partition. >+ */ >+ >+ return; >+} > > /**************************************************** > Helpers > ****************************************************/ > > static char *dna_get_dn(Slapi_PBlock *pb) > { > char *dn = 0; >- slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "--> dna_get_dn\n"); >+ slapi_log_error(SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM, >+ "--> dna_get_dn\n"); > >- if(slapi_pblock_get( pb, SLAPI_TARGET_DN, &dn )) >- { >- slapi_log_error( SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM, "dna_get_dn: failed to get dn of changed entry"); >+ if (slapi_pblock_get(pb, SLAPI_TARGET_DN, &dn)) { >+ slapi_log_error(SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM, >+ "dna_get_dn: failed to get dn of changed entry"); > goto bail; > } > > /* slapi_dn_normalize( dn ); > */ > bail: >- slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "<-- dna_get_dn\n"); >+ slapi_log_error(SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM, >+ "<-- dna_get_dn\n"); > > return dn; > } > > /* config check >@@ -678,110 +742,312 @@ > */ > static int dna_dn_is_config(char *dn) > { > int ret = 0; > >- slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "--> dna_is_config\n"); >+ slapi_log_error(SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM, >+ "--> dna_is_config\n"); > >- if(slapi_dn_issuffix(dn, getPluginDN())) >- { >+ if (slapi_dn_issuffix(dn, getPluginDN())) { > ret=1; > } > >- slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "<-- dna_is_config\n"); >+ slapi_log_error(SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM, >+ "<-- dna_is_config\n"); > > return ret; > } > >+#define DNA_LDAP_TAG_SK_REVERSE 0x81L >+ >+static LDAPControl *dna_build_sort_control(const char *attr) >+{ >+ LDAPControl *ctrl; >+ BerElement *ber; >+ int rc; >+ >+ ber = ber_alloc(); >+ if (NULL == ber) >+ return NULL; >+ >+ rc = ber_printf(ber, "{{stb}}", attr, DNA_LDAP_TAG_SK_REVERSE, 1); >+ if (-1 == rc) { >+ ber_free(ber, 1); >+ return NULL; >+ } >+ >+ rc = slapi_build_control(LDAP_CONTROL_SORTREQUEST, ber, 1, &ctrl); >+ >+ ber_free(ber, 1); >+ >+ if (LDAP_SUCCESS != rc) >+ return NULL; >+ >+ return ctrl; >+} > > /**************************************************** > Functions that actually do things other > than config and startup > ****************************************************/ > >+/* we do search all values between newval and maxval asking the >+ * server to sort them, then we check the first free spot and >+ * use it as newval */ >+static int dna_first_free_value(struct configEntry *config_entry, >+ PRUint64 *newval, >+ PRUint64 maxval, >+ PRUint64 increment) >+{ >+ Slapi_Entry **entries = NULL; >+ Slapi_PBlock *pb = NULL; >+ LDAPControl **ctrls; >+ char *attrs[2]; >+ char *filter; >+ char *prefix; >+ char *type; >+ int preflen; >+ int result, status; >+ PRUint64 tmpval, sval, i; >+ char *strval = NULL; >+ >+ prefix = config_entry->prefix; >+ type = config_entry->type; >+ tmpval = *newval; >+ >+ attrs[0] = type; >+ attrs[1] = NULL; >+ >+ ctrls = (LDAPControl **)slapi_ch_calloc(2, sizeof(LDAPControl)); >+ if (NULL == ctrls) >+ return LDAP_OPERATIONS_ERROR; >+ >+ ctrls[0] = dna_build_sort_control(config_entry->type); >+ if (NULL == ctrls[0]) { >+ slapi_ch_free((void **)&ctrls); >+ return LDAP_OPERATIONS_ERROR; >+ } >+ >+ filter = slapi_ch_smprintf("(&%s(&(%s>=%s%llu)(%s<=%s%llu)))", >+ config_entry->filter, >+ type, prefix?prefix:"", tmpval, >+ type, prefix?prefix:"", maxval); >+ if (NULL == filter) { >+ ldap_control_free(ctrls[0]); >+ slapi_ch_free((void **)&ctrls); >+ return LDAP_OPERATIONS_ERROR; >+ } >+ >+ pb = slapi_pblock_new(); >+ if (NULL == pb) { >+ ldap_control_free(ctrls[0]); >+ slapi_ch_free((void **)&ctrls); >+ slapi_ch_free_string(&filter); >+ return LDAP_OPERATIONS_ERROR; >+ } >+ >+ slapi_search_internal_set_pb(pb, config_entry->scope, >+ LDAP_SCOPE_SUBTREE, filter, >+ attrs, 0, ctrls, >+ NULL, getPluginID(), 0); >+ slapi_search_internal_pb(pb); >+/* >+ ldap_control_free(ctrls[0]); >+*/ >+ slapi_ch_free_string(&filter); >+ >+ slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &result); >+ if (LDAP_SUCCESS != result) { >+ status = LDAP_OPERATIONS_ERROR; >+ goto cleanup; >+ } >+ >+ slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, >+ &entries); >+ >+ if (NULL == entries || NULL == entries[0]) { >+ /* no values means we already have a good value */ >+ status = LDAP_SUCCESS; >+ goto cleanup; >+ } >+ >+ /* entries are sorted and filtered for value >= tval therefore if the >+ * first one does not match tval it means that the value is free, >+ * otherwise we need to cycle through values until we find a mismatch, >+ * the first mismatch is the first free pit */ >+ >+ preflen = prefix?strlen(prefix):0; >+ sval = 0; >+ for (i = 0; NULL != entries[i]; i++) { >+ strval = slapi_entry_attr_get_charptr(entries[i], type); >+ if (preflen) { >+ if (strlen(strval) <= preflen) { >+ /* something very wrong here ... */ >+ status = LDAP_OPERATIONS_ERROR; >+ goto cleanup; >+ } >+ strval = &strval[preflen-1]; >+ } >+ >+ errno = 0; >+ sval = strtoul(strval, 0, 0); >+ if (errno) { >+ /* something very wrong here ... */ >+ status = LDAP_OPERATIONS_ERROR; >+ goto cleanup; >+ } >+ slapi_ch_free_string(&strval); >+ >+ if (tmpval != sval) >+ break; >+ >+ if (maxval < sval) >+ break; >+ >+ tmpval += increment; >+ } >+ >+ *newval = tmpval; >+ status = LDAP_SUCCESS; >+ >+cleanup: >+ slapi_ch_free_string(&strval); >+ slapi_free_search_results_internal(pb); >+ slapi_pblock_destroy(pb); >+ >+ return status; >+} > > /* > * Perform ldap operationally atomic increment > * Return the next value to be assigned > * Method: > * 1. retrieve entry >- * 2. remove current value, add new value in one operation >- * 3. if failed, and less than 3 times, goto 1 >- */ >-static int dna_get_next_value(configEntry *config_entry, char **next_value_ret) >-{ >- int ret = LDAP_SUCCESS; >- Slapi_DN *dn = 0; >- char *attrlist[3]; >- Slapi_Entry *e = 0; >- int attempts = 0; >+ * 2. do increment operations >+ * 3. remove current value, add new value in one operation >+ * 4. if failed, and less than 3 times, goto 1 >+ */ >+static int dna_get_next_value(struct configEntry *config_entry, >+ char **next_value_ret) >+{ >+ Slapi_PBlock *pb = NULL; >+ char *old_value = NULL; >+ Slapi_Entry *e = NULL; >+ Slapi_DN *dn = NULL; >+ char *attrlist[4]; >+ int attempts; >+ int ret; > >- slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "--> dna_get_next_value\n"); >+ slapi_log_error(SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM, >+ "--> dna_get_next_value\n"); > > /* get pre-requisites to search */ > dn = slapi_sdn_new_dn_byref(config_entry->dn); > attrlist[0] = DNA_NEXTVAL; >- attrlist[1] = DNA_INTERVAL; >- attrlist[2] = 0; >+ attrlist[1] = DNA_MAXVAL; >+ attrlist[2] = DNA_INTERVAL; >+ attrlist[3] = NULL; > > > /* the operation is constructed such that race conditions > * to increment the value are detected and avoided - one wins, > * one loses - however, there is no need for the server to compete > * with itself so we lock here > */ > > slapi_lock_mutex(g_new_value_lock); > >- while(attempts < 3 && LDAP_SUCCESS == ret) >- { >- attempts++; >- >- /* do update */ >- if(e) >- { >- slapi_entry_free(e); >- e = 0; >- } >- >- ret = slapi_search_internal_get_entry( dn, attrlist, &e,getPluginID()); >- if(LDAP_SUCCESS == ret) >- { >- char *old_value; >+ for (attempts = 0; attempts < 3; attempts++) { > >- old_value = slapi_entry_attr_get_charptr(e, DNA_NEXTVAL); >- if(old_value) >- { > LDAPMod mod_add; > LDAPMod mod_delete; > LDAPMod *mods[3]; >- Slapi_PBlock *pb = slapi_pblock_new(); > char *delete_val[2]; > char *add_val[2]; > char new_value[16]; >- char *interval = 0; >+ char *interval; >+ char *max_value; >+ PRUint64 increment = 1; /* default increment */ >+ PRUint64 setval = 0; >+ PRUint64 newval = 0; >+ PRUint64 maxval = -1; > >- mods[0] = &mod_delete; >- mods[1] = &mod_add; >- mods[2] = 0; >+ /* do update */ >+ ret = slapi_search_internal_get_entry(dn, attrlist, &e, >+ getPluginID()); >+ if (LDAP_SUCCESS != ret) { >+ ret = LDAP_OPERATIONS_ERROR; >+ goto done; >+ } > >- if(0 == pb) >- goto bail; >+ old_value = slapi_entry_attr_get_charptr(e, DNA_NEXTVAL); >+ if (NULL == old_value) { >+ ret = LDAP_OPERATIONS_ERROR; >+ goto done; >+ } >+ >+ setval = strtoul(old_value, 0, 0); > >+ max_value = slapi_entry_attr_get_charptr(e, DNA_MAXVAL); >+ if (max_value) { >+ maxval = strtoul(max_value, 0, 0); >+ slapi_ch_free_string(&max_value); >+ } >+ >+ /* if not present the default is 1 */ > interval = slapi_entry_attr_get_charptr(e, DNA_INTERVAL); >- if(0 == interval) >- { >- slapi_pblock_destroy(pb); >- slapi_ch_free_string(&old_value); >- goto bail; >+ if (NULL != interval) { >+ increment = strtoul(interval, 0, 0); >+ } >+ >+ slapi_entry_free(e); >+ e = NULL; >+ >+ /* check the value is actually in range */ >+ >+ /* verify the new value is actually free and get the first >+ * one free if not*/ >+ ret = dna_first_free_value(config_entry, &setval, maxval, increment); >+ if (LDAP_SUCCESS != ret) >+ goto done; >+ >+ /* try for a new range or fail */ >+ if (setval > maxval) { >+ ret = dna_fix_maxval(dn, &setval, &maxval); >+ if (LDAP_SUCCESS != ret) { >+ slapi_log_error(SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM, >+ "dna_get_next_value: no more IDs available!!\n"); >+ goto done; >+ } >+ >+ /* verify the new value is actually free and get the first >+ * one free if not */ >+ ret = dna_first_free_value(config_entry, &setval, maxval, increment); >+ if (LDAP_SUCCESS != ret) >+ goto done; > } > >- /* perform increment */ >+ if (setval > maxval) { >+ ret = LDAP_OPERATIONS_ERROR; >+ goto done; >+ } >+ >+ newval = setval + increment; >+ >+ /* try for a new range or fail */ >+ if (newval > maxval) { >+ ret = dna_fix_maxval(dn, &newval, &maxval); >+ if (LDAP_SUCCESS != ret) { >+ slapi_log_error(SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM, >+ "dna_get_next_value: no more IDs available!!\n"); >+ goto done; >+ } >+ } >+ >+ /* try to set the new value */ > >- sprintf(new_value, "%lu", >- strtoul(interval,0,0) + >- strtoul(old_value,0,0)); >+ sprintf(new_value, "%llu", newval); > > delete_val[0] = old_value; > delete_val[1] = 0; > > mod_delete.mod_op = LDAP_MOD_DELETE; >@@ -793,69 +1059,69 @@ > > mod_add.mod_op = LDAP_MOD_ADD; > mod_add.mod_type = DNA_NEXTVAL; > mod_add.mod_values = add_val; > >- > mods[0] = &mod_delete; > mods[1] = &mod_add; > mods[2] = 0; > >- slapi_modify_internal_set_pb( >- pb, config_entry->dn, >- mods, 0, 0, >- getPluginID(), 0); >+ pb = slapi_pblock_new(); >+ if (NULL == pb) { >+ ret = LDAP_OPERATIONS_ERROR; >+ goto done; >+ } >+ >+ slapi_modify_internal_set_pb(pb, config_entry->dn, >+ mods, 0, 0, getPluginID(), 0); > > slapi_modify_internal_pb(pb); > >- slapi_pblock_get(pb, >- SLAPI_PLUGIN_INTOP_RESULT, >- &ret); >+ slapi_pblock_get(pb, SLAPI_PLUGIN_INTOP_RESULT, &ret); > > slapi_pblock_destroy(pb); >+ pb = NULL; > slapi_ch_free_string(&interval); >+ slapi_ch_free_string(&old_value); > >- if(LDAP_SUCCESS == ret) >- { >- *next_value_ret = old_value; >- break; >+ if (LDAP_SUCCESS == ret) { >+ *next_value_ret = slapi_ch_smprintf("%llu", setval); >+ if (NULL == *next_value_ret) { >+ ret = LDAP_OPERATIONS_ERROR; >+ goto done; > } >- else >- { >- slapi_ch_free_string(&old_value); >- if(LDAP_NO_SUCH_ATTRIBUTE != ret) >- { >+ >+ dna_notice_allocation(dn, newval); >+ goto done; >+ } >+ >+ if (LDAP_NO_SUCH_ATTRIBUTE != ret) { > /* not the result of a race > to change the value > */ >- break; >- } >- else >- /* we lost the race to mod >- try again >- */ >- ret = LDAP_SUCCESS; >- } >+ goto done; > } >- else >- break; >- } >- else >- break; > } > >-bail: >+ done: > > slapi_unlock_mutex(g_new_value_lock); > >+ if (LDAP_SUCCESS != ret) >+ slapi_ch_free_string(&old_value); >+ > if(dn) > slapi_sdn_free(&dn); > > if(e) > slapi_entry_free(e); > >- slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "<-- dna_get_next_value\n"); >+ if (pb) >+ slapi_pblock_destroy(pb); >+ >+ slapi_log_error(SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM, >+ "<-- dna_get_next_value\n"); > > return ret; > } > > /* for mods and adds: >@@ -866,35 +1132,34 @@ > > static int dna_pre_op(Slapi_PBlock *pb, int modtype) > { > char *dn = 0; > PRCList *list = 0; >- configEntry *config_entry = 0; >+ struct configEntry *config_entry = 0; > struct slapi_entry *e = 0; > char *last_type = 0; > char *value = 0; > int generate = 0; > Slapi_Mods *smods = 0; > Slapi_Mod *smod = 0; > LDAPMod **mods; > int free_entry = 0; >+ char *errstr = NULL; > int ret = 0; > >- slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "--> dna_pre_op\n"); >+ slapi_log_error(SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM, >+ "--> dna_pre_op\n"); > > if(0 == (dn = dna_get_dn(pb))) > goto bail; > > if(dna_dn_is_config(dn)) > goto bail; > >- if(LDAP_CHANGETYPE_ADD == modtype) >- { >+ if (LDAP_CHANGETYPE_ADD == modtype) { > slapi_pblock_get( pb, SLAPI_ADD_ENTRY, &e); >- } >- else >- { >+ } else { > /* xxxPAR: Ideally SLAPI_MODIFY_EXISTING_ENTRY should be > * available but it turns out that is only true if you are > * a dbm backend pre-op plugin - lucky dbm backend pre-op > * plugins. > * I think that is wrong since the entry is useful for filter >@@ -903,14 +1168,12 @@ > * now so we go get the entry here > * > slapi_pblock_get( pb, SLAPI_MODIFY_EXISTING_ENTRY, &e); > */ > Slapi_DN *tmp_dn = slapi_sdn_new_dn_byref(dn); >- if(tmp_dn) >- { >- slapi_search_internal_get_entry( >- tmp_dn, 0, &e,getPluginID()); >+ if (tmp_dn) { >+ slapi_search_internal_get_entry(tmp_dn, 0, &e, getPluginID()); > slapi_sdn_free(&tmp_dn); > free_entry = 1; > } > > /* grab the mods - we'll put them back later with >@@ -924,158 +1187,128 @@ > if(0 == e) > goto bailmod; > > dna_read_lock(); > >- if(!PR_CLIST_IS_EMPTY(config)) >- { >- list = PR_LIST_HEAD(config); >+ if (!PR_CLIST_IS_EMPTY(dna_global_config)) { >+ list = PR_LIST_HEAD(dna_global_config); > >- while(list != config && LDAP_SUCCESS == ret) >- { >- config_entry = (configEntry*)list; >+ while (list != dna_global_config && LDAP_SUCCESS == ret) { >+ config_entry = (struct configEntry *) list; > > /* did we already service this type? */ >- if(last_type) >- { >+ if (last_type) { > if(!slapi_attr_type_cmp(config_entry->type, last_type,1)) > goto next; > } > > /* is the entry in scope? */ >- if(config_entry->scope) >- { >+ if (config_entry->scope) { > if(!slapi_dn_issuffix(dn, config_entry->scope)) > goto next; > } > > /* does the entry match the filter? */ >- if(config_entry->filter) >- { >+ if (config_entry->slapi_filter) { > if(LDAP_SUCCESS != slapi_vattr_filter_test(pb, > e, >- config_entry->filter,0)) >+ config_entry-> >+ slapi_filter, 0)) > goto next; > } > > >- if(LDAP_CHANGETYPE_ADD == modtype) >- { >+ if (LDAP_CHANGETYPE_ADD == modtype) { > /* does attribute contain the magic value > or is the type not there? > */ >- value = slapi_entry_attr_get_charptr( >- e, config_entry->type); >- if((value && >- !slapi_utf8casecmp( >- (unsigned char *)config_entry->generate, >- (unsigned char *)value)) || >- 0 == value) >- { >+ value = >+ slapi_entry_attr_get_charptr(e, config_entry->type); >+ if ((value >+ && !slapi_UTF8CASECMP(config_entry->generate, value)) >+ || 0 == value) { > generate = 1; > } >- } >- else >- { >+ } else { > /* check mods for magic value */ > Slapi_Mod *next_mod = slapi_mod_new(); >- smod = slapi_mods_get_first_smod( >- smods, >- next_mod); >- while(smod) >- { >+ smod = slapi_mods_get_first_smod(smods, next_mod); >+ while (smod) { > char *type = (char *) > slapi_mod_get_type(smod); > >- if(slapi_attr_types_equivalent( >- type, >- config_entry->type)) >- { >+ if (slapi_attr_types_equivalent(type, >+ config_entry->type)) { > struct berval *bv = >- slapi_mod_get_first_value( >- smod); >- int len = strlen( >- config_entry-> >- generate); >+ slapi_mod_get_first_value(smod); >+ int len = strlen(config_entry->generate); > > >- if(len == bv->bv_len) >- { >- if(!slapi_utf8ncasecmp( >- (unsigned char *)bv->bv_val, >- (unsigned char *)config_entry-> >- generate, >+ if (len == bv->bv_len) { >+ if (!slapi_UTF8NCASECMP(bv->bv_val, >+ config_entry->generate, > len)) > > generate = 1; > break; > } > } > > slapi_mod_done(next_mod); >- smod = slapi_mods_get_next_smod( >- smods, >- next_mod); >+ smod = slapi_mods_get_next_smod(smods, next_mod); > } > > slapi_mod_free(&next_mod); > } > >- if(generate) >- { >+ if (generate) { > char *new_value; > int len; > > /* create the value to add */ >- if(ret = dna_get_next_value(config_entry,&value)) >+ ret = dna_get_next_value(config_entry, &value); >+ if (DNA_SUCCESS != ret) { >+ errstr = slapi_ch_smprintf("Allocation of a new value for" >+ " %s failed! Unable to proceed.", >+ config_entry->type); > break; >+ } > > len = strlen(value) + 1; >- if(config_entry->prefix) >- { >+ if (config_entry->prefix) { > len += strlen(config_entry->prefix); > } > > new_value = slapi_ch_malloc(len); > >- if(config_entry->prefix) >- { >- strcpy(new_value, >- config_entry->prefix); >+ if (config_entry->prefix) { >+ strcpy(new_value, config_entry->prefix); > strcat(new_value, value); >- } >- else >+ } else > strcpy(new_value, value); > > /* do the mod */ >- if(LDAP_CHANGETYPE_ADD == modtype) >- { >+ if (LDAP_CHANGETYPE_ADD == modtype) { > /* add - add to entry */ >- slapi_entry_attr_set_charptr( >- e, >+ slapi_entry_attr_set_charptr(e, > config_entry->type, > new_value); >- } >- else >- { >+ } else { > /* mod - add to mods */ >- slapi_mods_add_string( >- smods, >+ slapi_mods_add_string(smods, > LDAP_MOD_REPLACE, >- config_entry->type, >- new_value); >+ config_entry->type, new_value); > } > > /* free up */ > slapi_ch_free_string(&value); > slapi_ch_free_string(&new_value); > > /* make sure we don't generate for this > * type again > */ >- if(LDAP_SUCCESS == ret) >- { >+ if (LDAP_SUCCESS == ret) { > last_type = config_entry->type; > } > > generate = 0; > } >@@ -1085,12 +1318,11 @@ > } > > dna_unlock(); > > bailmod: >- if(LDAP_CHANGETYPE_MODIFY == modtype) >- { >+ if (LDAP_CHANGETYPE_MODIFY == modtype) { > /* these are the mods you made, really, > * I didn't change them, honest, just had a quick look > */ > mods = slapi_mods_get_ldapmods_passout(smods); > slapi_pblock_set( pb, SLAPI_MODIFY_MODS, mods); >@@ -1100,19 +1332,24 @@ > bail: > > if(free_entry && e) > slapi_entry_free(e); > >- if(ret) >- slapi_log_error( SLAPI_LOG_PLUGIN, DNA_PLUGIN_SUBSYSTEM , "dna_pre_op: operation failure [%d]\n", ret); >+ if (ret) { >+ slapi_log_error(SLAPI_LOG_PLUGIN, DNA_PLUGIN_SUBSYSTEM, >+ "dna_pre_op: operation failure [%d]\n", ret); >+ slapi_send_ldap_result(pb, ret, NULL, errstr, 0, NULL); >+ slapi_ch_free((void **)&errstr); >+ ret = DNA_FAILURE; >+ } > >- slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "<-- dna_pre_op\n"); >+ slapi_log_error(SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM, >+ "<-- dna_pre_op\n"); > > return ret; > } > >- > static int dna_add_pre_op( Slapi_PBlock *pb ) > { > return dna_pre_op(pb, LDAP_CHANGETYPE_ADD); > } > >@@ -1123,19 +1360,20 @@ > > static int dna_config_check_post_op(Slapi_PBlock *pb) > { > char *dn; > >- slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "--> dna_config_check_post_op\n"); >+ slapi_log_error(SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM, >+ "--> dna_config_check_post_op\n"); > >- if(dn = dna_get_dn(pb)) >- { >+ if ((dn = dna_get_dn(pb))) { > if(dna_dn_is_config(dn)) > loadPluginConfig(); > } > >- slapi_log_error( SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM , "<-- dna_config_check_post_op\n"); >+ slapi_log_error(SLAPI_LOG_TRACE, DNA_PLUGIN_SUBSYSTEM, >+ "<-- dna_config_check_post_op\n"); > > return 0; > } > > /**************************************************** >@@ -1151,34 +1389,25 @@ > { > PRCList *list; > > dna_read_lock(); > >- if(!PR_CLIST_IS_EMPTY(config)) >- { >- list = PR_LIST_HEAD(config); >- while(list != config) >- { >- dnaDumpConfigEntry((configEntry*)list); >+ if (!PR_CLIST_IS_EMPTY(dna_global_config)) { >+ list = PR_LIST_HEAD(dna_global_config); >+ while (list != dna_global_config) { >+ dnaDumpConfigEntry((struct configEntry *) list); > list = PR_NEXT_LINK (list); > } > } > > dna_unlock(); > } > > >-void dnaDumpConfigEntry(configEntry *entry) >+void dnaDumpConfigEntry(struct configEntry * entry) > { >- char buffer[BUFSIZ]; >- size_t bufsiz = (size_t)sizeof(buffer); > printf("<- type --------------> %s\n", entry->type); > printf("<---- prefix ---------> %s\n", entry->prefix); > printf("<---- next value -----> %lu\n", entry->nextval); > printf("<---- interval -------> %lu\n", entry->interval); >- buffer[0] = '\0'; >- printf("<---- filter ---------> %s\n", >- slapi_filter_to_string_internal((const struct slapi_filter *)entry->filter, buffer, &bufsiz)); > printf("<---- generate flag --> %s\n", entry->generate); > } >- >-
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=312297">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 456162
: 312297