Attachment 12550 Details for Bug 12364 – git-am fix for 4.4.next and 4.5.next

[patch] git-am fix for 4.4.next and 4.5.next

smbcquotas-init-45.patch (text/plain), 1.79 KB, created by Uri Simchoni on 2016-10-06 19:50:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Uri Simchoni

Created: 2016-10-06 19:50:40 UTC

Size: 1.79 KB

patch

obsolete

>From 5579b29c03f448c3088312f5010a391756cbdb5e Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Wed, 5 Oct 2016 08:22:54 +0200
>Subject: [PATCH] s3-utils: Fix loading smb.conf in smbcquotas
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12364
>
>Pair-Programmed-With: Uri Simchoni <uri@samba.org>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>Signed-off-by: Uri Simchoni <uri@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit c7bcbd166d23b6ebcc2d968b76b0640b9a9beebb)
>---
> source3/utils/smbcquotas.c | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
>diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
>index e6f1dfb..539caba 100644
>--- a/source3/utils/smbcquotas.c
>+++ b/source3/utils/smbcquotas.c
>@@ -568,6 +568,7 @@ int main(int argc, char *argv[])
> 	static bool test_args = False;
> 	struct cli_state *cli;
> 	bool fix_user = False;
>+	bool ok;
> 	SMB_NTQUOTA_STRUCT qt;
> 	TALLOC_CTX *frame = talloc_stackframe();
> 	poptContext pc;
>@@ -601,9 +602,6 @@ FSQFLAGS:QUOTA_ENABLED/DENY_DISK/LOG_SOFTLIMIT/LOG_HARD_LIMIT", "SETSTRING" },
> 
> 	fault_setup();
> 
>-	lp_load_global(get_dyn_CONFIGFILE());
>-	load_interfaces();
>-
> 	smbcquotas_auth_info = user_auth_info_init(frame);
> 	if (smbcquotas_auth_info == NULL) {
> 		exit(1);
>@@ -694,6 +692,17 @@ FSQFLAGS:QUOTA_ENABLED/DENY_DISK/LOG_SOFTLIMIT/LOG_HARD_LIMIT", "SETSTRING" },
> 	poptFreeContext(pc);
> 	popt_burn_cmdline_password(argc, argv);
> 
>+	ok = lp_load_global(get_dyn_CONFIGFILE());
>+	if (!ok) {
>+		DBG_ERR("ERROR: Loading config file %s - "
>+			"run testparm to debug it\n",
>+			get_dyn_CONFIGFILE());
>+		exit(EXIT_PARSE_ERROR);
>+	}
>+
>+	/* We must load interfaces after we load the smb.conf */
>+	load_interfaces();
>+
> 	string_replace(path, '/', '\\');
> 
> 	server = SMB_STRDUP(path+2);
>-- 
>2.5.5
>

Flags:

asn: review+
jra: review+

Actions: View

Attachments on bug 12364: 12550