From a762386ccffaace486d8422656b29a4965e13172 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Wed, 16 May 2018 16:50:55 +0200 Subject: [PATCH] s3:libsmbclient: cleanup smbc_setWorkgroup() usage It now takes a const char *. There's no need to use heap memory here. Signed-off-by: David Disseldorp Reviewed-by: Andreas Schneider --- source3/libsmb/libsmb_context.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c index 932223c9b2fb..9e7b083952f0 100644 --- a/source3/libsmb/libsmb_context.c +++ b/source3/libsmb/libsmb_context.c @@ -659,24 +659,16 @@ smbc_init_context(SMBCCTX *context) DEBUG(1, ("Using netbios name %s.\n", smbc_getNetbiosName(context))); if (!smbc_getWorkgroup(context)) { - char *workgroup; + const char *workgroup; if (lp_workgroup()) { - workgroup = SMB_STRDUP(lp_workgroup()); - } - else { + workgroup = lp_workgroup(); + } else { /* TODO: Think about a decent default workgroup */ - workgroup = SMB_STRDUP("samba"); - } - - if (!workgroup) { - TALLOC_FREE(frame); - errno = ENOMEM; - return NULL; + workgroup = "samba"; } smbc_setWorkgroup(context, workgroup); - SAFE_FREE(workgroup); if (!smbc_getWorkgroup(context)) { TALLOC_FREE(frame); -- 2.34.1