Attachment 5650 Details for Bug 7387 – Patch applying to master.

[patch] Patch applying to master.

2d0c6365ac2e95366aa45366484e498132b2559c (text/plain), 1.19 KB, created by Lars Müller on 2010-04-23 10:41:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lars Müller

Created: 2010-04-23 10:41:12 UTC

Size: 1.19 KB

patch

obsolete

>commit 2d0c6365ac2e95366aa45366484e498132b2559c
>Author: Lars MÃ¼ller <lars@samba.org>
>Date:   Fri Apr 23 17:24:58 2010 +0200
>
>    s3: do not endless loop in process_registry_globals()
>    
>    In the case of "include = registry" process_registry_globals() caused an
>    endless loop catched by the maximume include detection.
>    
>    This was to trigger by:
>    
>    a) Adding "include = registry" to the smb.conf global section
>    b) Calling "net conf import /etc/samba/smb.conf"
>    c) Calling "net conf drop"
>    
>    The result was:
>    [2010/04/23 16:44:05.760955,  0] param/loadparm.c:7257(handle_include)
>    Error: Maximum include depth (100) exceeded!
>
>diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
>index 350f3c0..06fd48e 100644
>--- a/source3/param/loadparm.c
>+++ b/source3/param/loadparm.c
>@@ -7068,16 +7068,9 @@ done:
>  */
> static bool process_registry_globals(void)
> {
>-	bool ret;
>-
> 	add_to_file_list(INCLUDE_REGISTRY_NAME, INCLUDE_REGISTRY_NAME);
> 
>-	ret = do_parameter("registry shares", "yes", NULL);
>-	if (!ret) {
>-		return ret;
>-	}
>-
>-	return process_registry_service(GLOBAL_NAME);
>+	return do_parameter("registry shares", "yes", NULL);
> }
> 
> bool process_registry_shares(void)

Flags:

obnox: review-

Actions: View

Attachments on bug 7387: 5650