s4-param Remove 'sam database' parameter

This now just relies on the private dir parameter, which remains.

Andrew Bartlett

diff --git a/source4/NEWS b/source4/NEWS
index b441bc784fad7f8c9b47b339b0d221c4cc69316d..f7c03c60bfd561478b550dda65fd91991545ec54 100644 (file)
--- a/source4/NEWS
+++ b/source4/NEWS
@@ -56,8 +56,7 @@ that can be either 'domain controller', 'member server' or 'standalone'. Note th
 member server support does not work yet.
 
 The following parameters have been removed:
-- passdb backend: accounts are now stored in a LDB-based SAM database, 
-       see 'sam database' below.
+- passdb backend: accounts are now stored in a LDB-based SAM database
 - update encrypted
 - public
 - guest ok
@@ -401,12 +400,6 @@ The following parameters have been added:
 
        Default: smb rpc nbt wrepl ldap cldap web kdc
 
-+ sam database
-       Location of the SAM (account database) database. This should be a 
-       LDB URL.
-
-       Default: set at compile-time
-
 + spoolss database
        Spoolss (printer) DCE/RPC server database. This should be a LDB URL.
 

diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index cef0d1e54f604ff7e48c898cc9f0601c7f927b42..d761107b156af96befdc79151eb04c466f21ea4e 100644 (file)
--- a/source4/dsdb/samdb/samdb.c
+++ b/source4/dsdb/samdb/samdb.c
@@ -104,7 +104,7 @@ struct ldb_context *samdb_connect(TALLOC_CTX *mem_ctx,
        struct cli_credentials *credentials;
        int ret;
 
-       url  = lpcfg_sam_url(lp_ctx);
+       url  = "sam.ldb";
        credentials = samdb_credentials(lp_ctx);
 
        ldb = ldb_wrap_find(url, ev_ctx, lp_ctx, session_info, credentials, flags);

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 15451c4bcfb17b0d9e09bd80161cd3ccac836ef0..b9b267794724c3380ab02de8c703b78dc8079ad2 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -94,7 +94,6 @@ struct loadparm_global
        char *szAutoServices;
        char *szPasswdChat;
        char *szShareBackend;
-       char *szSAM_URL;
        char *szIDMAP_URL;
        char *szSECRETS_URL;
        char *szSPOOLSS_URL;
@@ -372,7 +371,6 @@ static struct parm_struct parm_table[] = {
        {"null passwords", P_BOOL, P_GLOBAL, GLOBAL_VAR(bNullPasswords), NULL, NULL},
        {"obey pam restrictions", P_BOOL, P_GLOBAL, GLOBAL_VAR(bObeyPamRestrictions), NULL, NULL},
        {"password server", P_LIST, P_GLOBAL, GLOBAL_VAR(szPasswordServers), NULL, NULL},
-       {"sam database", P_STRING, P_GLOBAL, GLOBAL_VAR(szSAM_URL), NULL, NULL},
        {"idmap database", P_STRING, P_GLOBAL, GLOBAL_VAR(szIDMAP_URL), NULL, NULL},
        {"secrets database", P_STRING, P_GLOBAL, GLOBAL_VAR(szSECRETS_URL), NULL, NULL},
        {"spoolss database", P_STRING, P_GLOBAL, GLOBAL_VAR(szSPOOLSS_URL), NULL, NULL},
@@ -655,7 +653,6 @@ FN_GLOBAL_INTEGER(web_port, web_port)
 FN_GLOBAL_BOOL(tls_enabled, tls_enabled)
 FN_GLOBAL_STRING(logfile, logfile)
 FN_GLOBAL_STRING(share_backend, szShareBackend)
-FN_GLOBAL_STRING(sam_url, szSAM_URL)
 FN_GLOBAL_STRING(idmap_url, szIDMAP_URL)
 FN_GLOBAL_STRING(secrets_url, szSECRETS_URL)
 FN_GLOBAL_STRING(spoolss_url, szSPOOLSS_URL)
@@ -2437,7 +2434,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
        lpcfg_do_global_parameter(lp_ctx, "auth methods:member server", "anonymous sam winbind");
        lpcfg_do_global_parameter(lp_ctx, "auth methods:standalone", "anonymous sam_ignoredomain");
        lpcfg_do_global_parameter(lp_ctx, "private dir", dyn_PRIVATE_DIR);
-       lpcfg_do_global_parameter(lp_ctx, "sam database", "sam.ldb");
        lpcfg_do_global_parameter(lp_ctx, "idmap database", "idmap.ldb");
        lpcfg_do_global_parameter(lp_ctx, "secrets database", "secrets.ldb");
        lpcfg_do_global_parameter(lp_ctx, "spoolss database", "spoolss.ldb");

diff --git a/source4/param/pyparam.c b/source4/param/pyparam.c
index 043d8261d471bcafc67e419d2d54c3c4670b50dd..998eb9d325b206884fc4c7e146f68e5f7c637877 100644 (file)
--- a/source4/param/pyparam.c
+++ b/source4/param/pyparam.c
@@ -272,6 +272,12 @@ static PyObject *py_lp_dump(PyObject *self, PyObject *args)
        Py_RETURN_NONE;
 }
 
+static PyObject *py_samdb_url(PyObject *self)
+{
+       struct loadparm_context *lp_ctx = PyLoadparmContext_AsLoadparmContext(self);
+       return PyString_FromFormat("tdb://%s/sam.ldb", lpcfg_private_dir(lp_ctx));
+}
+
 
 static PyMethodDef py_lp_ctx_methods[] = {
        { "load", (PyCFunction)py_lp_ctx_load, METH_VARARGS, 
@@ -298,6 +304,9 @@ static PyMethodDef py_lp_ctx_methods[] = {
                "S.services() -> list" },
        { "dump", (PyCFunction)py_lp_dump, METH_VARARGS, 
                "S.dump(stream, show_defaults=False)" },
+       { "samdb_url", (PyCFunction)py_samdb_url, METH_NOARGS,
+               "S.samdb_url() -> string\n"
+               "Returns the current URL for sam.ldb." },
        { NULL }
 };
 

diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate
index c82e06bb6f539950f213de0d48369f03191b5cf0..0a13dd7c9bdf08d92b0b0f497cd753670e813404 100755 (executable)
--- a/source4/scripting/bin/samba_dnsupdate
+++ b/source4/scripting/bin/samba_dnsupdate
@@ -222,7 +222,7 @@ def get_subst_vars():
     global lp, am_rodc
     vars = {}
 
-    samdb = SamDB(url=lp.get("sam database"), session_info=system_session(),
+    samdb = SamDB(url=lp.samdb_url(), session_info=system_session(),
                   lp=lp)
 
     vars['DNSDOMAIN'] = lp.get('realm').lower()

diff --git a/source4/scripting/bin/samba_spnupdate b/source4/scripting/bin/samba_spnupdate
index 1794f2bd267dee6ee3ac507622c89e6a6092ab2b..fe3fcfc6759c0b40c3c55f0c8382863037e9cabd 100755 (executable)
--- a/source4/scripting/bin/samba_spnupdate
+++ b/source4/scripting/bin/samba_spnupdate
@@ -103,9 +103,9 @@ try:
     else:
         credentials = None
 
-    samdb = SamDB(url=lp.get("sam database"), session_info=system_session(), credentials=credentials, lp=lp)
+    samdb = SamDB(url=lp.samdb_url(), session_info=system_session(), credentials=credentials, lp=lp)
 except ldb.LdbError, (num, msg):
-    print("Unable to open sam database %s : %s" % (lp.get("sam database"), msg))
+    print("Unable to open sam database %s : %s" % (lp.samdb_url(), msg))
     sys.exit(1)
 
 

diff --git a/source4/scripting/python/samba/hostconfig.py b/source4/scripting/python/samba/hostconfig.py
index 3e6dc6b1ddd296be7fe35f641366d56b7d08d8cc..c50b944c987df069757817974ae56fedb7a9afb2 100644 (file)
--- a/source4/scripting/python/samba/hostconfig.py
+++ b/source4/scripting/python/samba/hostconfig.py
@@ -37,7 +37,7 @@ class Hostconfig(object):
         :param session_info: Session info to use
         :param credentials: Credentials to access the SamDB with
         """
-        return SamDB(url=self.lp.get("sam database"),
+        return SamDB(url=self.lp.samdb_url(),
                      session_info=session_info, credentials=credentials,
                      lp=self.lp)
 

diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index f987fb8ef37a570ac9691a67cd3f4fe2ae8feb9b..fffd352071ff759eb0eb4c059da76b595d9f008a 100644 (file)
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -432,7 +432,7 @@ def check_install(lp, session_info, credentials):
     """
     if lp.get("realm") == "":
         raise Exception("Realm empty")
-    samdb = Ldb(lp.get("sam database"), session_info=session_info,
+    samdb = Ldb(lp.samdb_url(), session_info=session_info,
             credentials=credentials, lp=lp)
     if len(samdb.search("(cn=Administrator)")) != 1:
         raise ProvisioningError("No administrator account found")
@@ -517,8 +517,7 @@ def provision_paths_from_lp(lp, dnsdomain):
     paths.keytab = "secrets.keytab"
 
     paths.shareconf = os.path.join(paths.private_dir, "share.ldb")
-    paths.samdb = os.path.join(paths.private_dir,
-        lp.get("sam database") or "samdb.ldb")
+    paths.samdb = os.path.join(paths.private_dir, "sam.ldb")
     paths.idmapdb = os.path.join(paths.private_dir,
         lp.get("idmap database") or "idmap.ldb")
     paths.secrets = os.path.join(paths.private_dir,

diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index a5c627e5b5e48dc78d66e838c90b070590da94ea..55f3536c27f7c5b93642fec9a655665ae643c04c 100644 (file)
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -46,7 +46,7 @@ class SamDB(samba.Ldb):
         if not auto_connect:
             url = None
         elif url is None and lp is not None:
-            url = lp.get("sam database")
+            url = lp.samdb_url()
 
         super(SamDB, self).__init__(url=url, lp=lp, modules_dir=modules_dir,
             session_info=session_info, credentials=credentials, flags=flags,

diff --git a/source4/torture/libnet/libnet_BecomeDC.c b/source4/torture/libnet/libnet_BecomeDC.c
index b532e071c77ee180fcbbe9bd7ccfcba53e90b10b..9f569e6a486b5a8093637e8f881e125c39ccedeb 100644 (file)
--- a/source4/torture/libnet/libnet_BecomeDC.c
+++ b/source4/torture/libnet/libnet_BecomeDC.c
@@ -44,7 +44,7 @@ bool torture_net_become_dc(struct torture_context *torture)
        struct ldb_message *msg;
        int ldb_ret;
        uint32_t i;
-       char *sam_ldb_path;
+       char *private_dir;
        const char *address;
        struct nbt_name name;
        const char *netbios_name;
@@ -144,13 +144,13 @@ bool torture_net_become_dc(struct torture_context *torture)
        talloc_unlink(s, ldb);
 
        lp_ctx = libnet_vampire_cb_lp_ctx(s);
-       sam_ldb_path = talloc_asprintf(s, "%s/%s", location, "private/sam.ldb");
-       lpcfg_set_cmdline(lp_ctx, "sam database", sam_ldb_path);
-       torture_comment(torture, "Reopen the SAM LDB with system credentials and all replicated data: %s\n", sam_ldb_path);
+       private_dir = talloc_asprintf(s, "%s/%s", location, "private");
+       lpcfg_set_cmdline(lp_ctx, "private dir", private_dir);
+       torture_comment(torture, "Reopen the SAM LDB with system credentials and all replicated data: %s\n", private_dir);
        ldb = samdb_connect(s, torture->ev, lp_ctx, system_session(lp_ctx), 0);
        torture_assert_goto(torture, ldb != NULL, ret, cleanup,
                                      talloc_asprintf(torture,
-                                     "Failed to open '%s'\n", sam_ldb_path));
+                                     "Failed to open '%s/sam.ldb'\n", private_dir));
 
        torture_assert_goto(torture, dsdb_uses_global_schema(ldb), ret, cleanup,
                                                "Uses global schema");