svn commit: samba r18364 - in branches/SAMBA_4_0/source/rpc_server/lsa: .

[abartlet]

Author: abartlet
Date: 2006-09-11 06:29:58 +0000 (Mon, 11 Sep 2006)
New Revision: 18364

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18364

Log:
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

Modified:
   branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c


Changeset:
Modified: branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c       2006-09-11 
06:17:12 UTC (rev 18363)
+++ branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c       2006-09-11 
06:29:58 UTC (rev 18364)
@@ -2446,7 +2446,7 @@
                
                /* 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 @@
                                }
                        } 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 @@
                
                /* 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 @@
                        NTTIME last_set_time;
                        struct ldb_message **res;
                        const char *attrs[] = {
-                               "secret",
+                               "currentValue",
                                "lastSetTime",
                                NULL
                        };
@@ -2527,13 +2527,13 @@
                                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 @@
        int ret;
        struct ldb_message **res;
        const char *attrs[] = {
-               "secret",
-               "priorSecret",
+               "currentValue",
+               "priorValue",
                "lastSetTime",
                "priorSetTime", 
                NULL
@@ -2607,7 +2607,7 @@
                        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 @@
                }
 
                /* 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;