diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-04-13 08:41:10 +0200 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-04-13 08:55:15 +0200 |
| commit | ad9e4073574125b01b3992081be9b2a4d6852cbf (patch) | |
| tree | 4bde84e3f1962d64200366a1ddb3d7bcef6e42c8 /source4/dsdb/samdb/ldb_modules/rootdse.c | |
| parent | 8e4c34880a11b2b8a7b5fbb228c26301865a4b4d (diff) | |
| download | samba-ad9e4073574125b01b3992081be9b2a4d6852cbf.tar.gz samba-ad9e4073574125b01b3992081be9b2a4d6852cbf.tar.bz2 samba-ad9e4073574125b01b3992081be9b2a4d6852cbf.zip | |
Revert "s4:prefer "samdb_*_dn" basedn calls over the "ldb_get_*_dn" functions"
We should use the "ldb_get_*_basedn" calls since they are available in the LDB
library.
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/rootdse.c')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/rootdse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c index e99fcaa516..d18e41c294 100644 --- a/source4/dsdb/samdb/ldb_modules/rootdse.c +++ b/source4/dsdb/samdb/ldb_modules/rootdse.c @@ -288,7 +288,7 @@ static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_message *ms const char *dn_str; if (schema && schema->fsmo.we_are_master) { - dn_str = ldb_dn_get_linearized(samdb_schema_dn(ldb)); + dn_str = ldb_dn_get_linearized(ldb_get_schema_basedn(ldb)); if (dn_str && dn_str[0]) { if (ldb_msg_add_fmt(msg, "validFSMOs", "%s", dn_str) != 0) { goto failed; @@ -310,7 +310,7 @@ static int rootdse_add_dynamic(struct ldb_module *module, struct ldb_message *ms pdc_fsmo = talloc_get_type(ldb_get_opaque(ldb, "dsdb_pdc_fsmo"), struct dsdb_pdc_fsmo); if (pdc_fsmo && pdc_fsmo->we_are_master) { - dn_str = ldb_dn_get_linearized(samdb_base_dn(ldb)); + dn_str = ldb_dn_get_linearized(ldb_get_default_basedn(ldb)); if (dn_str && dn_str[0]) { if (ldb_msg_add_fmt(msg, "validFSMOs", "%s", dn_str) != 0) { goto failed; @@ -937,7 +937,7 @@ static int rootdse_schemaupdatenow(struct ldb_module *module, struct ldb_request int ret; struct ldb_dn *schema_dn; - schema_dn = samdb_schema_dn(ldb); + schema_dn = ldb_get_schema_basedn(ldb); if (!schema_dn) { ldb_reset_err_string(ldb); ldb_debug(ldb, LDB_DEBUG_WARNING, |