diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-04 11:05:17 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-07 13:22:01 +1100 |
| commit | f4a1b71b2b6f2fa87581832a6638b88829b539b1 (patch) | |
| tree | 4ac77d91aa243c4919638f88e1b6393acc3bda0e | |
| parent | 9ccb868591b2e4757c9d24fb25899810ebab6285 (diff) | |
| download | samba-f4a1b71b2b6f2fa87581832a6638b88829b539b1.tar.gz samba-f4a1b71b2b6f2fa87581832a6638b88829b539b1.tar.bz2 samba-f4a1b71b2b6f2fa87581832a6638b88829b539b1.zip | |
s4-dsdb: make subtree_rename errors clearer
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/subtree_rename.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/subtree_rename.c b/source4/dsdb/samdb/ldb_modules/subtree_rename.c index cf08a9a41e..f26a99ed09 100644 --- a/source4/dsdb/samdb/ldb_modules/subtree_rename.c +++ b/source4/dsdb/samdb/ldb_modules/subtree_rename.c @@ -226,14 +226,14 @@ static int check_constraints(struct ldb_message *msg, if (ldb_dn_compare(nc_root, ldb_get_schema_basedn(ldb)) == 0) { if (move_op) { ldb_asprintf_errstring(ldb, - "subtree_rename: Cannot move %s, it isn't permitted!", + "subtree_rename: Cannot move %s within schema partition", ldb_dn_get_linearized(olddn)); return LDB_ERR_UNWILLING_TO_PERFORM; } if (rename_op && (systemFlags & SYSTEM_FLAG_SCHEMA_BASE_OBJECT) != 0) { ldb_asprintf_errstring(ldb, - "subtree_rename: Cannot rename %s, it isn't permitted!", + "subtree_rename: Cannot rename %s within schema partition", ldb_dn_get_linearized(olddn)); return LDB_ERR_UNWILLING_TO_PERFORM; } @@ -264,31 +264,31 @@ static int check_constraints(struct ldb_message *msg, if (!limited_move) { ldb_asprintf_errstring(ldb, - "subtree_rename: Cannot move %s, it isn't permitted!", - ldb_dn_get_linearized(olddn)); + "subtree_rename: Cannot move %s to %s in config partition", + ldb_dn_get_linearized(olddn), ldb_dn_get_linearized(newdn)); return LDB_ERR_UNWILLING_TO_PERFORM; } } if (rename_op && (systemFlags & SYSTEM_FLAG_CONFIG_ALLOW_RENAME) == 0) { ldb_asprintf_errstring(ldb, - "subtree_rename: Cannot rename %s, it isn't permitted!", - ldb_dn_get_linearized(olddn)); + "subtree_rename: Cannot rename %s to %s within config partition", + ldb_dn_get_linearized(olddn), ldb_dn_get_linearized(newdn)); return LDB_ERR_UNWILLING_TO_PERFORM; } } else if (ldb_dn_compare(nc_root, ldb_get_default_basedn(ldb)) == 0) { if (move_op && (systemFlags & SYSTEM_FLAG_DOMAIN_DISALLOW_MOVE) != 0) { ldb_asprintf_errstring(ldb, - "subtree_rename: Cannot move %s, it isn't permitted!", - ldb_dn_get_linearized(olddn)); + "subtree_rename: Cannot move %s to %s - DISALLOW_MOVE set", + ldb_dn_get_linearized(olddn), ldb_dn_get_linearized(newdn)); return LDB_ERR_UNWILLING_TO_PERFORM; } if (rename_op && (systemFlags & SYSTEM_FLAG_DOMAIN_DISALLOW_RENAME) != 0) { ldb_asprintf_errstring(ldb, - "subtree_rename: Cannot rename %s, it isn't permitted!", - ldb_dn_get_linearized(olddn)); + "subtree_rename: Cannot rename %s to %s - DISALLOW_RENAME set", + ldb_dn_get_linearized(olddn), ldb_dn_get_linearized(newdn)); return LDB_ERR_UNWILLING_TO_PERFORM; } } |