[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1433-g2ea55c0

[Michael Adam]

The branch, v3-2-test has been updated
       via  2ea55c03b25eb5e98be3449e12004a7246319acd (commit)
       via  704ac0ba49134d14dc00769b1cf2d9f55657bdfb (commit)
      from  56801810253ae870437f694947f58c27661cef9b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 2ea55c03b25eb5e98be3449e12004a7246319acd
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jan 16 17:31:44 2008 +0100

    Add "config backend" to the parameters forbidden in registry config.
    
    Make registry based configs more fool-proof.
    
    Michael

commit 704ac0ba49134d14dc00769b1cf2d9f55657bdfb
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jan 16 17:15:08 2008 +0100

    Add my (C) to loadparm.c.
    
    I think now that I have changed some substantial logic,
    I should confess.... :-)
    
    Michael

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

Summary of changes:
 source/lib/util_reg.c   |    1 +
 source/param/loadparm.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/util_reg.c b/source/lib/util_reg.c
index 956f047..2d7d70c 100644
--- a/source/lib/util_reg.c
+++ b/source/lib/util_reg.c
@@ -130,6 +130,7 @@ bool registry_smbconf_valname_forbidden(const char *valname)
 		"include",
 		"lock directory",
 		"lock dir",
+		"config backend",
 		NULL
 	};
 	const char **forbidden = NULL;
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 4fc8b89..0d3fbbf 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -9,6 +9,7 @@
    Copyright (C) Alexander Bokovoy 2002
    Copyright (C) Stefan (metze) Metzmacher 2002
    Copyright (C) Jim McDonough <jmcd at us.ibm.com> 2003
+   Copyright (C) Michael Adam 2008
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by


-- 
Samba Shared Repository