sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

param: duplicate the copy service in lib/param into source3 loadparm

Browse Source 
Change-Id: I9ddd9ba9c05ab226a335d261554dd1587f7e59fc
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Garming Sam 2014-02-19 13:38:09 +13:00 committed by Jeremy Allison
parent 31ada41b5a
commit c8b499b342
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/param/loadparm.c
View File

@ -561,7 +561,7 @@ bool lpcfg_parm_bool(struct loadparm_context *lp_ctx,
* Set a string value, deallocating any existing space, and allocing the space
* for the string
*/
static bool lpcfg_string_set(TALLOC_CTX *mem_ctx, char **dest, const char *src)
bool lpcfg_string_set(TALLOC_CTX *mem_ctx, char **dest, const char *src)
{
talloc_free(*dest);
@ -581,7 +581,7 @@ static bool lpcfg_string_set(TALLOC_CTX *mem_ctx, char **dest, const char *src)
* Set a string value, deallocating any existing space, and allocing the space
* for the string
*/
static bool lpcfg_string_set_upper(TALLOC_CTX *mem_ctx, char **dest, const char *src)
bool lpcfg_string_set_upper(TALLOC_CTX *mem_ctx, char **dest, const char *src)
{
talloc_free(*dest);

32
source3/param/loadparm.c
View File

@ -2138,7 +2138,8 @@ struct loadparm_service *lp_default_loadparm_service()
If pcopymapDest is NULL then copy all fields
***************************************************************************/
static void copy_service(struct loadparm_service *pserviceDest, const struct loadparm_service *pserviceSource,
static void copy_service(struct loadparm_service *pserviceDest,
const struct loadparm_service *pserviceSource,
struct bitmap *pcopymapDest)
{
int i;
@ -2147,9 +2148,11 @@ static void copy_service(struct loadparm_service *pserviceDest, const struct loa
for (i = 0; parm_table[i].label; i++)
if (parm_table[i].p_class == P_LOCAL &&
(bcopyall || bitmap_query(pcopymapDest,i))) {
const void *src_ptr = ((const char *)pserviceSource) + parm_table[i].offset;
void *dest_ptr = lp_parm_ptr(pserviceDest, &parm_table[i]);
(bcopyall || bitmap_query(pcopymapDest, i))) {
const void *src_ptr =
((const char *)pserviceSource) + parm_table[i].offset;
void *dest_ptr =
((char *)pserviceDest) + parm_table[i].offset;
switch (parm_table[i].type) {
case P_BOOL:
@ -2158,9 +2161,9 @@ static void copy_service(struct loadparm_service *pserviceDest, const struct loa
break;
case P_INTEGER:
case P_ENUM:
case P_OCTAL:
case P_BYTES:
case P_OCTAL:
case P_ENUM:
*(int *)dest_ptr = *(const int *)src_ptr;
break;
@ -2169,23 +2172,20 @@ static void copy_service(struct loadparm_service *pserviceDest, const struct loa
break;
case P_STRING:
string_set(pserviceDest, (char **)dest_ptr,
lpcfg_string_set(pserviceDest,
(char **)dest_ptr,
*(const char * const *)src_ptr);
break;
case P_USTRING:
{
char *upper_string = strupper_talloc(talloc_tos(),
*(const char * const *)src_ptr);
string_set(pserviceDest, (char **)dest_ptr,
upper_string);
TALLOC_FREE(upper_string);
lpcfg_string_set_upper(pserviceDest,
(char **)dest_ptr,
*(const char * const *)src_ptr);
break;
}
case P_LIST:
TALLOC_FREE(*((char ***)dest_ptr));
*((const char * const **)dest_ptr) = (const char * const *)str_list_copy(pserviceDest,
*(const char ** const *)src_ptr);
*(const char * const **)dest_ptr = (const char * const *)str_list_copy(pserviceDest,
*(const char * * const *)src_ptr);
break;
default:
break;