summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2022-04-26 12:26:25 +0200
committerJule Anger <janger@samba.org>2022-04-28 08:00:14 +0000
commit0b9a9c3a9847a201dd9c50082b3c66380d2cc55f (patch)
tree33e555c065e2ec7655c43d55922737438226782a
parente6cc5f946586190a2e761fd491498c1991d4a937 (diff)
downloadsamba-0b9a9c3a9847a201dd9c50082b3c66380d2cc55f.tar.gz
s3:passdb: Use already defined pointer in lookup_name_smbconf()
Signed-off-by: Andreas Schneider <asn@cryptomilk.org> Reviewed-by: Jeremy Allison <jra@samba.org> (cherry picked from commit ed8e466854d6d8d6120388716a7b604df7a4db27)
-rw-r--r--source3/passdb/lookup_sid.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
index c14d7a7b123..dbea5578f92 100644
--- a/source3/passdb/lookup_sid.c
+++ b/source3/passdb/lookup_sid.c
@@ -464,7 +464,7 @@ bool lookup_name_smbconf(TALLOC_CTX *mem_ctx,
const char **ret_domain, const char **ret_name,
struct dom_sid *ret_sid, enum lsa_SidType *ret_type)
{
- char *qualified_name;
+ char *qualified_name = NULL;
const char *p;
if ((p = strchr_m(full_name, *lp_winbind_separator())) != NULL) {
@@ -472,16 +472,14 @@ bool lookup_name_smbconf(TALLOC_CTX *mem_ctx,
/* The name is already qualified with a domain. */
if (*lp_winbind_separator() != '\\') {
- char *tmp;
-
/* lookup_name() needs '\\' as a separator */
- tmp = talloc_strdup(mem_ctx, full_name);
- if (!tmp) {
+ qualified_name = talloc_strdup(mem_ctx, full_name);
+ if (qualified_name == NULL) {
return false;
}
- tmp[p - full_name] = '\\';
- full_name = tmp;
+ qualified_name[p - full_name] = '\\';
+ full_name = qualified_name;
}
return lookup_name(mem_ctx, full_name, flags,