5 files changed, 18 insertions, 18 deletions
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index db35669e1a..2209a6d087 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -15,13 +15,13 @@ PRIVATE_DEPENDENCIES = LIBNDR
 
 python_uuid_OBJ_FILES = $(pyscriptsrcdir)/uuidmodule.o
 
-[PYTHON::python_glue]
-LIBRARY_REALNAME = samba/glue.$(SHLIBEXT)
+[PYTHON::python__glue]
+LIBRARY_REALNAME = samba/_glue.$(SHLIBEXT)
 PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS pyldb python_dcerpc_misc python_dcerpc_security pyauth pyldb_util pyparam_util
 
-python_glue_OBJ_FILES = $(pyscriptsrcdir)/pyglue.o
+python__glue_OBJ_FILES = $(pyscriptsrcdir)/pyglue.o
 
-$(python_glue_OBJ_FILES): CFLAGS+=-I$(ldbsrcdir)
+$(python__glue_OBJ_FILES): CFLAGS+=-I$(ldbsrcdir)
 
 _PY_FILES = $(shell find $(pyscriptsrcdir)/samba -type f -name "*.py")
 
diff --git a/source4/scripting/python/pyglue.c b/source4/scripting/python/pyglue.c
index bf6c30b5f8..530c33e7d4 100644
--- a/source4/scripting/python/pyglue.c
+++ b/source4/scripting/python/pyglue.c
@@ -309,13 +309,13 @@ static PyMethodDef py_misc_methods[] = {
 	{ NULL }
 };
 
-void initglue(void)
+void init_glue(void)
 {
 	PyObject *m;
 
 	debug_setup_talloc_log();
 
-	m = Py_InitModule3("glue", py_misc_methods, 
+	m = Py_InitModule3("_glue", py_misc_methods, 
 			   "Python bindings for miscellaneous Samba functions.");
 	if (m == NULL)
 		return;
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index a513541da8..d7fc05cabd 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -43,7 +43,7 @@ else:
 
 import ldb
 import dsdb
-import glue
+import _glue
 from samba._ldb import Ldb as _Ldb
 
 class Ldb(_Ldb):
@@ -275,13 +275,13 @@ class Ldb(_Ldb):
         dsdb.samdb_get_domain_sid(self)
 
     def set_schema_from_ldif(self, pf, df):
-        glue.dsdb_set_schema_from_ldif(self, pf, df)
+        _glue.dsdb_set_schema_from_ldif(self, pf, df)
 
     def set_schema_from_ldb(self, ldb):
-        glue.dsdb_set_schema_from_ldb(self, ldb)
+        _glue.dsdb_set_schema_from_ldb(self, ldb)
 
     def write_prefixes_from_schema(self):
-        glue.dsdb_write_prefixes_from_schema_to_ldb(self)
+        _glue.dsdb_write_prefixes_from_schema_to_ldb(self)
 
     def convert_schema_to_openldap(self, target, mapping):
         return dsdb.dsdb_convert_schema_to_openldap(self, target, mapping)
@@ -397,8 +397,8 @@ def ensure_external_module(modulename, location):
             sys.modules[modulename] = __import__(
                 "samba.external.%s" % modulename, fromlist=["samba.external"])
 
-version = glue.version
-interface_ips = glue.interface_ips
-set_debug_level = glue.set_debug_level
-unix2nttime = glue.unix2nttime
-generate_random_password = glue.generate_random_password
+version = _glue.version
+interface_ips = _glue.interface_ips
+set_debug_level = _glue.set_debug_level
+unix2nttime = _glue.unix2nttime
+generate_random_password = _glue.generate_random_password
diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py
index 62e16f7c75..1fbfd9c713 100644
--- a/source4/scripting/python/samba/getopt.py
+++ b/source4/scripting/python/samba/getopt.py
@@ -22,7 +22,7 @@
 import optparse
 from credentials import Credentials, DONT_USE_KERBEROS, MUST_USE_KERBEROS
 from hostconfig import Hostconfig
-import glue
+import samba
 
 __docformat__ = "restructuredText"
 
@@ -60,7 +60,7 @@ class SambaOptions(optparse.OptionGroup):
         else:
             lp.load_default()
         if self._debuglevel:
-            glue.set_debug_level(self._debuglevel)
+            samba.set_debug_level(self._debuglevel)
         return lp
 
     def get_hostconfig(self):
diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build
index 96de643b4f..9c12ca7b4b 100644
--- a/source4/scripting/python/wscript_build
+++ b/source4/scripting/python/wscript_build
@@ -24,7 +24,7 @@ bld.SAMBA_PYTHON('python_uuid',
 bld.SAMBA_PYTHON('python_glue',
                  source='pyglue.c',
                  deps='LIBNDR ldb SAMDB CREDENTIALS pyldb python_dcerpc_misc python_dcerpc_security pyauth pyldb_util pyparam_util',
-                 realname='samba/glue.so'
+                 realname='samba/_glue.so'
 	)