[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  7645aca4d05 lib:cmdline: Use getprogname() to avoid possible issues with setproctitle()
       via  d3c0d68aa12 s3:cmdline: Use D_ERR() instead of DBG_ERR() for talloc log
      from  f9ffed06862 lib:cmdline: Also set logfile for the debug system

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


- Log -----------------------------------------------------------------
commit 7645aca4d05a74504da8cc82131a7d4fded42251
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jun 4 17:55:46 2021 +0200

    lib:cmdline: Use getprogname() to avoid possible issues with setproctitle()
    
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Tue Jun  8 14:58:58 UTC 2021 on sn-devel-184

commit d3c0d68aa12ac9fb8479a9b2d5b22d8e6e00828f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jun 4 08:58:09 2021 +0200

    s3:cmdline: Use D_ERR() instead of DBG_ERR() for talloc log
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

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

Summary of changes:
 lib/cmdline/cmdline.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/cmdline/cmdline.c b/lib/cmdline/cmdline.c
index 9c0a88bd452..11630287a83 100644
--- a/lib/cmdline/cmdline.c
+++ b/lib/cmdline/cmdline.c
@@ -47,7 +47,7 @@ TALLOC_CTX *samba_cmdline_get_talloc_ctx(void)
 
 static void _samba_cmdline_talloc_log(const char *message)
 {
-	DBG_ERR("%s", message);
+	D_ERR("%s", message);
 }
 
 bool samba_cmdline_init_common(TALLOC_CTX *mem_ctx)
@@ -331,12 +331,7 @@ static void popt_samba_callback(poptContext popt_ctx,
 	bool ok;
 
 	/* Find out basename of current program */
-	pname = strrchr_m(poptGetInvocationName(popt_ctx), '/');
-	if (pname == NULL) {
-		pname = poptGetInvocationName(popt_ctx);
-	} else {
-		pname++;
-	}
+	pname = getprogname();
 
 	if (reason == POPT_CALLBACK_REASON_PRE) {
 		if (lp_ctx == NULL) {


-- 
Samba Shared Repository