diff options
Diffstat (limited to 'ldap/servers/slapd')
| -rw-r--r-- | ldap/servers/slapd/backend.c | 2 | ||||
| -rw-r--r-- | ldap/servers/slapd/getfilelist.c | 2 | ||||
| -rw-r--r-- | ldap/servers/slapd/pblock.c | 4 | ||||
| -rw-r--r-- | ldap/servers/slapd/sasl_map.c | 2 | ||||
| -rw-r--r-- | ldap/servers/slapd/slap.h | 5 |
5 files changed, 8 insertions, 7 deletions
diff --git a/ldap/servers/slapd/backend.c b/ldap/servers/slapd/backend.c index 1bded05e..c4c399f9 100644 --- a/ldap/servers/slapd/backend.c +++ b/ldap/servers/slapd/backend.c @@ -502,7 +502,7 @@ slapi_be_setentrypoint(Slapi_Backend *be, int entrypoint, void *ret_fnptr, Slapi be->be_entry_release=(IFP) ret_fnptr; break; case SLAPI_PLUGIN_DB_SEARCH_RESULTS_RELEASE_FN: - be->be_search_results_release=(IFP) ret_fnptr; + be->be_search_results_release=(VFPP) ret_fnptr; break; case SLAPI_PLUGIN_DB_SIZE_FN: be->be_dbsize=(IFP) ret_fnptr; diff --git a/ldap/servers/slapd/getfilelist.c b/ldap/servers/slapd/getfilelist.c index ac79430f..c8dd8f9e 100644 --- a/ldap/servers/slapd/getfilelist.c +++ b/ldap/servers/slapd/getfilelist.c @@ -124,7 +124,7 @@ matches(const char *filename, const char *pattern) { Slapi_Regex *re = NULL; int match = 0; - char *error = NULL; + const char *error = NULL; if (!pattern) return 1; /* null pattern matches everything */ diff --git a/ldap/servers/slapd/pblock.c b/ldap/servers/slapd/pblock.c index c89a6485..98984ada 100644 --- a/ldap/servers/slapd/pblock.c +++ b/ldap/servers/slapd/pblock.c @@ -516,7 +516,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value ) if ( pblock->pb_plugin->plg_type != SLAPI_PLUGIN_DATABASE ) { return( -1 ); } - (*(IFP *)value) = pblock->pb_plugin->plg_search_results_release; + (*(VFPP *)value) = pblock->pb_plugin->plg_search_results_release; break; case SLAPI_PLUGIN_DB_COMPARE_FN: if ( pblock->pb_plugin->plg_type != SLAPI_PLUGIN_DATABASE ) { @@ -1814,7 +1814,7 @@ slapi_pblock_set( Slapi_PBlock *pblock, int arg, void *value ) if ( pblock->pb_plugin->plg_type != SLAPI_PLUGIN_DATABASE ) { return( -1 ); } - pblock->pb_plugin->plg_search_results_release = (IFP) value; + pblock->pb_plugin->plg_search_results_release = (VFPP) value; break; case SLAPI_PLUGIN_DB_COMPARE_FN: if ( pblock->pb_plugin->plg_type != SLAPI_PLUGIN_DATABASE ) { diff --git a/ldap/servers/slapd/sasl_map.c b/ldap/servers/slapd/sasl_map.c index 637ea5dc..383f0455 100644 --- a/ldap/servers/slapd/sasl_map.c +++ b/ldap/servers/slapd/sasl_map.c @@ -469,7 +469,7 @@ sasl_map_check(sasl_map_data *dp, char *sasl_user_and_realm, char **ldap_search_ Slapi_Regex *re = NULL; int ret = 0; int matched = 0; - char *recomp_result = NULL; + const char *recomp_result = NULL; LDAPDebug( LDAP_DEBUG_TRACE, "-> sasl_map_check\n", 0, 0, 0 ); /* Compiles the regex */ diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h index 7fd67613..696d8103 100644 --- a/ldap/servers/slapd/slap.h +++ b/ldap/servers/slapd/slap.h @@ -211,7 +211,8 @@ typedef struct symbol_t { #define SLAPD_SHORT_VERSION_STR PRODUCTTEXT typedef void (*VFP)(void *); -typedef void (*VFP0)(); +typedef void (*VFPP)(void **); +typedef void (*VFP0)(void); #define LDAPI_INTERNAL 1 #include "slapi-private.h" #include "pw.h" @@ -765,7 +766,7 @@ struct slapdplugin { IFP plg_un_db_search; /* search */ IFP plg_un_db_next_search_entry; /* iterate */ IFP plg_un_db_next_search_entry_ext; - IFP plg_un_db_search_results_release; /* PAGED RESULTS */ + VFPP plg_un_db_search_results_release; /* PAGED RESULTS */ IFP plg_un_db_entry_release; IFP plg_un_db_compare; /* compare */ IFP plg_un_db_modify; /* modify */ |