Attachment 17083 Details for Bug 14945 – patch for master

[patch] patch for master

0001-s3-smbd-Allow-to-print-build-options-without-parsing.patch (text/plain), 1.58 KB, created by Andreas Schneider on 2022-01-13 14:34:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2022-01-13 14:34:12 UTC

Size: 1.58 KB

patch

obsolete

>From b6f95355213b8cdbe967ad7c92c22f1ea271c50d Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Thu, 13 Jan 2022 15:31:33 +0100
>Subject: [PATCH] s3:smbd: Allow to print build options without parsing
> smb.conf
>
>The smb.conf is parsed in post mode of a popt callback. We should directly when
>parsing the option exist so we don't require the smb.conf to be present.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14945
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/smbd/server.c | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
>diff --git a/source3/smbd/server.c b/source3/smbd/server.c
>index 39aa0d91624..897bd01afc2 100644
>--- a/source3/smbd/server.c
>+++ b/source3/smbd/server.c
>@@ -1554,7 +1554,6 @@ extern void build_options(bool screen);
> 	char *profile_level = NULL;
> 	int opt;
> 	poptContext pc;
>-	bool print_build_options = False;
> 	struct server_id main_server_id = {0};
> 	struct poptOption long_options[] = {
> 		POPT_AUTOHELP
>@@ -1657,7 +1656,8 @@ extern void build_options(bool screen);
> 	while((opt = poptGetNextOpt(pc)) != -1) {
> 		switch (opt)  {
> 		case 'b':
>-			print_build_options = True;
>+			build_options(True); /* Display output to screen as well as debug */
>+			exit(0);
> 			break;
> 		default:
> 			d_fprintf(stderr, "\nInvalid option %s: %s\n\n",
>@@ -1674,11 +1674,6 @@ extern void build_options(bool screen);
> 		log_stdout = True;
> 	}
> 
>-	if (print_build_options) {
>-		build_options(True); /* Display output to screen as well as debug */
>-		exit(0);
>-	}
>-
> #ifdef HAVE_SETLUID
> 	/* needed for SecureWare on SCO */
> 	setluid(0);
>-- 
>2.34.1
>

Flags:

asn: review? (ddiss)
metze: review+

Actions: View

Attachments on bug 14945: 17083 | 17097