r26456: Provide default config object, fix typo.

(This used to be commit 2b59df2af973044d9d3875c9202c17647f561d3b)

4 files changed, 28 insertions, 2 deletions

diff --git a/source4/param/param.i b/source4/param/param.i
index 674c1671e0f..d013fa7ae54 100644
--- a/source4/param/param.i
+++ b/source4/param/param.i
@@ -106,4 +106,4 @@ typedef struct param_section {
 } param_section;
 
 %rename(default_config) global_loadparm;
-//struct loadparm_context *global_loadparm ;
+struct loadparm_context *global_loadparm;
diff --git a/source4/param/param.py b/source4/param/param.py
index 9c0bac9c07f..aa01d6e830a 100644
--- a/source4/param/param.py
+++ b/source4/param/param.py
@@ -120,4 +120,5 @@ param_section_swigregister = _param.param_section_swigregister
 param_section_swigregister(param_section)
 
 
+cvar = _param.cvar
 
diff --git a/source4/param/param_wrap.c b/source4/param/param_wrap.c
index ac4a752c7fe..7f0b8c865b6 100644
--- a/source4/param/param_wrap.c
+++ b/source4/param/param_wrap.c
@@ -3408,6 +3408,29 @@ SWIGINTERN PyObject *param_section_swiginit(PyObject *SWIGUNUSEDPARM(self), PyOb
   return SWIG_Python_InitShadowInstance(args);
 }
 
+SWIGINTERN int Swig_var_default_config_set(PyObject *_val) {
+  {
+    void *argp = 0;
+    int res = SWIG_ConvertPtr(_val, &argp, SWIGTYPE_p_loadparm_context,  0 );  
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), "in variable '""global_loadparm""' of type '""struct loadparm_context *""'");
+    }
+    global_loadparm = (struct loadparm_context *)(argp);
+  }
+  return 0;
+fail:
+  return 1;
+}
+
+
+SWIGINTERN PyObject *Swig_var_default_config_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_NewPointerObj(SWIG_as_voidptr(global_loadparm), SWIGTYPE_p_loadparm_context,  0 );
+  return pyobj;
+}
+
+
 static PyMethodDef SwigMethods[] = {
 	 { (char *)"new_LoadParm", (PyCFunction)_wrap_new_LoadParm, METH_NOARGS, NULL},
 	 { (char *)"LoadParm_load", (PyCFunction) _wrap_LoadParm_load, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -4030,5 +4053,7 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_InstallConstants(d,swig_const_table);
   
   
+  PyDict_SetItemString(d,(char*)"cvar", SWIG_globals());
+  SWIG_addvarlink(SWIG_globals(),(char*)"default_config",Swig_var_default_config_get, Swig_var_default_config_set);
 }
 
diff --git a/source4/param/tests/bindings.py b/source4/param/tests/bindings.py
index ea542e21878..57ad23b21e3 100644
--- a/source4/param/tests/bindings.py
+++ b/source4/param/tests/bindings.py
@@ -25,7 +25,7 @@ class LoadParmTestCase(unittest.TestCase):
         file = param.LoadParm()
         self.assertTrue(file is not None)
 
-    def test_lenght(self):
+    def test_length(self):
         file = param.LoadParm()
         self.assertEquals(0, len(file))