[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  83871d2 Don't arbitrarily clean all parametric options in add_a_service(), that is called from many places, not just smb.conf processing. Only clean parametric options when doing actual smb.conf reading (or registry equivalent).
      from  bcdf781 Ensure we have correct parameters to use Windows ACL modules.

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


- Log -----------------------------------------------------------------
commit 83871d2642378d1cd0a8bad0a2d5a9a92cb1cfe8
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Oct 15 22:27:10 2010 -0700

    Don't arbitrarily clean all parametric options in add_a_service(),
    that is called from many places, not just smb.conf processing. Only
    clean parametric options when doing actual smb.conf reading (or
    registry equivalent).
    
    Michael Adams, Volker, Metze, please check.
    
    Jeremy.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Sat Oct 16 06:46:19 UTC 2010 on sn-devel-104

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

Summary of changes:
 source3/param/loadparm.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index f9a908d..8dadebf 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -6277,9 +6277,6 @@ static int add_a_service(const struct service *pservice, const char *name)
 	if (name) {
 		i = getservicebyname(name, NULL);
 		if (i >= 0) {
-			/* Clean all parametric options for service */
-			/* They will be added during parsing again */
-			free_param_opts(&ServicePtrs[i]->param_opt);
 			return (i);
 		}
 	}
@@ -8111,6 +8108,9 @@ static bool do_section(const char *pszSectionName, void *userdata)
 			DEBUG(0, ("Failed to add a new service\n"));
 			return (False);
 		}
+		/* Clean all parametric options for service */
+		/* They will be added during parsing again */
+		free_param_opts(&ServicePtrs[iServiceIndex]->param_opt);
 	}
 
 	return (bRetval);


-- 
Samba Shared Repository