summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-09-11 06:29:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:19 -0500
commit2687eeab57ea03671935421b0e7524ed77aa9c6e (patch)
tree7323b22d1c37ee7d7bcdcccc55450cb7e3fb9cc1 /source4
parent72c5be634c1f656039c32406213e69bb5c120952 (diff)
downloadsamba-2687eeab57ea03671935421b0e7524ed77aa9c6e.tar.gz
samba-2687eeab57ea03671935421b0e7524ed77aa9c6e.tar.bz2
samba-2687eeab57ea03671935421b0e7524ed77aa9c6e.zip
r18364: Get us closer to schema compliance. The corrent names for "secret"
and "priorSecret" are "currentValue" and "priorValue". With this, we pass RPC-LSA against OpenLDAP. Andrew Bartlett (This used to be commit 4380bcaaee74a0aa1a83540bf39793c4aeab4068)
Diffstat (limited to 'source4')
-rw-r--r--source4/rpc_server/lsa/dcesrv_lsa.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index a5c1addb5d..7fb62e2e0d 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -2446,7 +2446,7 @@ static NTSTATUS lsa_SetSecret(struct dcesrv_call_state *dce_call, TALLOC_CTX *me
/* set value */
if (samdb_msg_add_value(secret_state->sam_ldb,
- mem_ctx, msg, "priorSecret", &val) != 0) {
+ mem_ctx, msg, "priorValue", &val) != 0) {
return NT_STATUS_NO_MEMORY;
}
@@ -2466,7 +2466,7 @@ static NTSTATUS lsa_SetSecret(struct dcesrv_call_state *dce_call, TALLOC_CTX *me
}
} else {
if (samdb_msg_add_delete(secret_state->sam_ldb,
- mem_ctx, msg, "secret")) {
+ mem_ctx, msg, "currentValue")) {
return NT_STATUS_NO_MEMORY;
}
if (samdb_msg_add_delete(secret_state->sam_ldb,
@@ -2492,7 +2492,7 @@ static NTSTATUS lsa_SetSecret(struct dcesrv_call_state *dce_call, TALLOC_CTX *me
/* set value */
if (samdb_msg_add_value(secret_state->sam_ldb,
- mem_ctx, msg, "secret", &val) != 0) {
+ mem_ctx, msg, "currentValue", &val) != 0) {
return NT_STATUS_NO_MEMORY;
}
@@ -2509,7 +2509,7 @@ static NTSTATUS lsa_SetSecret(struct dcesrv_call_state *dce_call, TALLOC_CTX *me
NTTIME last_set_time;
struct ldb_message **res;
const char *attrs[] = {
- "secret",
+ "currentValue",
"lastSetTime",
NULL
};
@@ -2527,13 +2527,13 @@ static NTSTATUS lsa_SetSecret(struct dcesrv_call_state *dce_call, TALLOC_CTX *me
return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
- new_val = ldb_msg_find_ldb_val(res[0], "secret");
+ new_val = ldb_msg_find_ldb_val(res[0], "currentValue");
last_set_time = ldb_msg_find_attr_as_uint64(res[0], "lastSetTime", 0);
if (new_val) {
/* set value */
if (samdb_msg_add_value(secret_state->sam_ldb,
- mem_ctx, msg, "priorSecret",
+ mem_ctx, msg, "priorValue",
new_val) != 0) {
return NT_STATUS_NO_MEMORY;
}
@@ -2574,8 +2574,8 @@ static NTSTATUS lsa_QuerySecret(struct dcesrv_call_state *dce_call, TALLOC_CTX *
int ret;
struct ldb_message **res;
const char *attrs[] = {
- "secret",
- "priorSecret",
+ "currentValue",
+ "priorValue",
"lastSetTime",
"priorSetTime",
NULL
@@ -2607,7 +2607,7 @@ static NTSTATUS lsa_QuerySecret(struct dcesrv_call_state *dce_call, TALLOC_CTX *
return NT_STATUS_NO_MEMORY;
}
/* Decrypt */
- prior_val = ldb_msg_find_ldb_val(res[0], "priorSecret");
+ prior_val = ldb_msg_find_ldb_val(res[0], "priorValue");
if (prior_val && prior_val->length) {
secret.data = prior_val->data;
@@ -2643,7 +2643,7 @@ static NTSTATUS lsa_QuerySecret(struct dcesrv_call_state *dce_call, TALLOC_CTX *
}
/* Decrypt */
- new_val = ldb_msg_find_ldb_val(res[0], "secret");
+ new_val = ldb_msg_find_ldb_val(res[0], "currentValue");
if (new_val && new_val->length) {
secret.data = new_val->data;