Attachment 11557 Details for Bug 11566 – git-am fix for 4.3.next.

[patch] git-am fix for 4.3.next.

bug-11566-4.3 (text/plain), 1.06 KB, created by Jeremy Allison on 2015-10-30 18:16:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2015-10-30 18:16:35 UTC

Size: 1.06 KB

patch

obsolete

>From 1e0fc56a7723e8c2df62f0d46ad4c7c864d47b0c Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Tue, 27 Oct 2015 17:08:50 -0700
>Subject: [PATCH] lib: util: Make non-critical message a warning.
>
>Non-root utilities (e.g. bin/net) call this via messaging_init().
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11566
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>(cherry picked from commit 859e3415b38538ff6c023e4a56570d94a4fe4432)
>---
> lib/util/util.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/lib/util/util.c b/lib/util/util.c
>index 157a4aa..a6bc304 100644
>--- a/lib/util/util.c
>+++ b/lib/util/util.c
>@@ -275,8 +275,8 @@ _PUBLIC_ bool directory_create_or_exist_strict(const char *dname,
> 		return false;
> 	}
> 	if (st.st_uid != uid && !uid_wrapper_enabled()) {
>-		DEBUG(0, ("invalid ownership on directory "
>-			  "%s\n", dname));
>+		DBG_NOTICE("invalid ownership on directory "
>+			  "%s\n", dname);
> 		return false;
> 	}
> 	if ((st.st_mode & 0777) != dir_perms) {
>-- 
>2.6.0.rc2.230.g3dd15c0
>

Flags:

ddiss: review+

Actions: View

Attachments on bug 11566: 11557 | 11558