summaryrefslogtreecommitdiff
path: root/source3/modules/xml.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2003-04-24 03:54:54 +0000
committerJelmer Vernooij <jelmer@samba.org>2003-04-24 03:54:54 +0000
commitd13f5f85feb98b28251045d88435a1af8ce3f3ba (patch)
tree5cac6506e7cc01b728f8f68566870c865c5b7be2 /source3/modules/xml.c
parentc0960be217bbf1107843b510bb0829e9c6593e85 (diff)
downloadsamba-d13f5f85feb98b28251045d88435a1af8ce3f3ba.tar.gz
samba-d13f5f85feb98b28251045d88435a1af8ce3f3ba.tar.bz2
samba-d13f5f85feb98b28251045d88435a1af8ce3f3ba.zip
Patch from Stefan Metzmacher to add default parameters to the lp_parm()
smb.conf parameters along with some other small fixes. Binary compatible with older modules. (This used to be commit aa07b12fda732ca19d8dc41cebc7bb09e2549a30)
Diffstat (limited to 'source3/modules/xml.c')
-rw-r--r--source3/modules/xml.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/modules/xml.c b/source3/modules/xml.c
index d018175d38..42503c3d39 100644
--- a/source3/modules/xml.c
+++ b/source3/modules/xml.c
@@ -512,7 +512,7 @@ static NTSTATUS xmlsam_add_sam_account(struct pdb_methods *methods, SAM_ACCOUNT
return NT_STATUS_OK;
}
-NTSTATUS xmlsam_init(PDB_CONTEXT * pdb_context, PDB_METHODS ** pdb_method,
+static NTSTATUS xmlsam_init(PDB_CONTEXT * pdb_context, PDB_METHODS ** pdb_method,
const char *location)
{
NTSTATUS nt_status;
@@ -553,8 +553,7 @@ NTSTATUS xmlsam_init(PDB_CONTEXT * pdb_context, PDB_METHODS ** pdb_method,
(*pdb_method)->enum_group_mapping = NULL;
data = talloc(pdb_context->mem_ctx, sizeof(pdb_xml));
- data->location =
- (location ? talloc_strdup(pdb_context->mem_ctx, location) : "passdb.xml");
+ data->location = talloc_strdup(pdb_context->mem_ctx, (location ? location : "passdb.xml"));
data->pwent = NULL;
data->written = 0;
(*pdb_method)->private_data = data;