[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Tue Jan 5 21:31:01 UTC 2021


The branch, master has been updated
       via  31943cc9c0d s3:utils - explicitly free cmdline_messaging_context
      from  1f06d91c57d Fix small typo in manpage

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 31943cc9c0d6c0b2be89634408b30d698a2869db
Author: Andrew Walker <awalker at ixsystems.com>
Date:   Thu Dec 24 06:38:18 2020 -0500

    s3:utils - explicitly free cmdline_messaging_context
    
    Some command line utilities do not free their messaging context
    which results in extra entries being left in the msg.lock directory.
    
    Signed-off-by: Andrew Walker <awalker at ixsystems.com>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Tue Jan  5 21:30:08 UTC 2021 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 source3/utils/mdfind.c     | 1 +
 source3/utils/net.c        | 1 +
 source3/utils/smbcontrol.c | 1 +
 source3/utils/status.c     | 1 +
 4 files changed, 4 insertions(+)


Changeset truncated at 500 lines:

diff --git a/source3/utils/mdfind.c b/source3/utils/mdfind.c
index ef2657e4fa5..cecbea4f107 100644
--- a/source3/utils/mdfind.c
+++ b/source3/utils/mdfind.c
@@ -251,6 +251,7 @@ int main(int argc, char **argv)
 		goto fail;
 	}
 
+	cmdline_messaging_context_free();
 	TALLOC_FREE(frame);
 	poptFreeContext(pc);
 	return 0;
diff --git a/source3/utils/net.c b/source3/utils/net.c
index e289b2814bc..4fc19c4a121 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -1427,6 +1427,7 @@ static void get_credentials_file(struct net_context *c,
 
 	poptFreeContext(pc);
 
+	cmdline_messaging_context_free();
 	TALLOC_FREE(frame);
 	return rc;
 }
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 5232c2b59ce..e5a6e986d82 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -1775,6 +1775,7 @@ int main(int argc, const char **argv)
 
 	ret = !do_command(evt_ctx, msg_ctx, argc, argv);
 
+	cmdline_messaging_context_free();
 	poptFreeContext(pc);
 	TALLOC_FREE(frame);
 	return ret;
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 59f09b77160..fc21d20f766 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -835,6 +835,7 @@ int main(int argc, const char *argv[])
 	}
 
 done:
+	cmdline_messaging_context_free();
 	poptFreeContext(pc);
 	TALLOC_FREE(frame);
 	return ret;


-- 
Samba Shared Repository



More information about the samba-cvs mailing list