Only set showOnlyInAdvancedView: TRUE when adding default values.

[samba.git] / source4 / dsdb / samdb / ldb_modules / pdc_fsmo.c

diff --git a/source4/dsdb/samdb/ldb_modules/pdc_fsmo.c b/source4/dsdb/samdb/ldb_modules/pdc_fsmo.c
index 16b40ef8d9eac7ef5ef94b3b355935404f5f31a8..0f3293ed1db7a58309e2a436d27466e9b00562a4 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/pdc_fsmo.c
+++ b/source4/dsdb/samdb/ldb_modules/pdc_fsmo.c
@@ -7,7 +7,7 @@
     
    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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    
 */
 
@@ -31,17 +30,12 @@
 #include "librpc/gen_ndr/ndr_drsblobs.h"
 #include "lib/util/dlinklist.h"
 
-struct dsdb_pdc_fsmo {
-       bool we_are_master;
-};
-
 static int pdc_fsmo_init(struct ldb_module *module)
 {
        TALLOC_CTX *mem_ctx;
        struct ldb_dn *pdc_dn;
        struct dsdb_pdc_fsmo *pdc_fsmo;
        struct ldb_result *pdc_res;
-       struct ldb_dn *pdc_master_dn;
        int ret;
        static const char *pdc_attrs[] = {
                "fSMORoleOwner",
@@ -73,9 +67,14 @@ static int pdc_fsmo_init(struct ldb_module *module)
                         LDB_SCOPE_BASE,
                         NULL, pdc_attrs,
                         &pdc_res);
-       if (ret != LDB_SUCCESS) {
+       if (ret == LDB_ERR_NO_SUCH_OBJECT) {
+               ldb_debug(module->ldb, LDB_DEBUG_WARNING,
+                         "pdc_fsmo_init: no domain object present: (skip loading of domain details)\n");
+               talloc_free(mem_ctx);
+               return ldb_next_init(module);
+       } else if (ret != LDB_SUCCESS) {
                ldb_debug_set(module->ldb, LDB_DEBUG_FATAL,
-                             "pdc_fsmo_init: failed to search the domain object: %d:%s\n",
+                             "pdc_fsmo_init: failed to search the domain object: %d:%s",
                              ret, ldb_strerror(ret));
                talloc_free(mem_ctx);
                return ret;
@@ -88,19 +87,26 @@ static int pdc_fsmo_init(struct ldb_module *module)
                return ldb_next_init(module);
        } else if (pdc_res->count > 1) {
                ldb_debug_set(module->ldb, LDB_DEBUG_FATAL,
-                             "pdc_fsmo_init: [%u] domain objects found on a base search\n",
+                             "pdc_fsmo_init: [%u] domain objects found on a base search",
                              pdc_res->count);
                talloc_free(mem_ctx);
                return LDB_ERR_CONSTRAINT_VIOLATION;
        }
 
-       pdc_master_dn = ldb_msg_find_attr_as_dn(module->ldb, mem_ctx, pdc_res->msgs[0], "fSMORoleOwner");
-       if (ldb_dn_compare(samdb_ntds_settings_dn(module->ldb), pdc_master_dn) == 0) {
+       pdc_fsmo->master_dn = ldb_msg_find_attr_as_dn(module->ldb, mem_ctx, pdc_res->msgs[0], "fSMORoleOwner");
+       if (ldb_dn_compare(samdb_ntds_settings_dn(module->ldb), pdc_fsmo->master_dn) == 0) {
                pdc_fsmo->we_are_master = true;
        } else {
                pdc_fsmo->we_are_master = false;
        }
 
+       if (ldb_set_opaque(module->ldb, "dsdb_pdc_fsmo", pdc_fsmo) != LDB_SUCCESS) {
+               ldb_oom(module->ldb);
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
+
+       talloc_steal(module, pdc_fsmo);
+
        ldb_debug(module->ldb, LDB_DEBUG_TRACE,
                          "pdc_fsmo_init: we are master: %s\n",
                          (pdc_fsmo->we_are_master?"yes":"no"));