From fedf0b0d91fdf2a6ae0ef47acd4047f662bd3374 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 10 Feb 2005 03:48:43 +0000 Subject: r5296: - only include the tdb headers where they are needed - removed the u32 hack in events.c as I think this was only needed as tdb.h defines u32. Metze, can you check that this hack is indeed no longer needed on your suse system? (This used to be commit 6f79432fe656164d4770dbce114a30dda5e7bf9a) --- source4/param/loadparm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/param') diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index f837545999..288bc3a38e 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -133,7 +133,7 @@ struct parm_struct int ivalue; char *svalue; char cvalue; - char **lvalue; + const char **lvalue; } def; }; @@ -1431,8 +1431,8 @@ const char *lp_parm_string(int lookup_service, const char *type, const char *opt /* Parametric option has following syntax: 'Type: option = value' */ /* Returned value is allocated in 'lp_talloc' context */ -char **lp_parm_string_list(int lookup_service, const char *type, const char *option, - const char *separator) +const char **lp_parm_string_list(int lookup_service, const char *type, const char *option, + const char *separator) { const char *value = get_parametrics(lookup_service, type, option); @@ -1855,7 +1855,7 @@ static void copy_service(service * pserviceDest, service * pserviceSource, BOOL strupper(*(char **)dest_ptr); break; case P_LIST: - *(char ***)dest_ptr = str_list_copy(NULL, *(const char ***)src_ptr); + *(const char ***)dest_ptr = str_list_copy(NULL, *(const char ***)src_ptr); break; default: break; @@ -2367,7 +2367,7 @@ BOOL lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue break; case P_LIST: - *(char ***)parm_ptr = str_list_make(NULL, pszParmValue, NULL); + *(const char ***)parm_ptr = str_list_make(NULL, pszParmValue, NULL); break; case P_STRING: -- cgit