Implement matching logic to Windows 2008 on handling of secrets.

This is enforced by the new RPC-LSA test.

Andrew Bartlett

diff --git a/source/rpc_server/lsa/dcesrv_lsa.c b/source/rpc_server/lsa/dcesrv_lsa.c
index 096bba3c9fc5af628fea87b923eca59181a30d71..7ed3b63540b85a1b079c5410e6b981658db20921 100644 (file)
--- a/source/rpc_server/lsa/dcesrv_lsa.c
+++ b/source/rpc_server/lsa/dcesrv_lsa.c
@@ -2011,22 +2011,14 @@ static NTSTATUS dcesrv_lsa_SetSecret(struct dcesrv_call_state *dce_call, TALLOC_
                }
 
                if (!r->in.new_val) {
-                       /* This behaviour varies depending of if this is a local, or a global secret... */
-                       if (secret_state->global) {
-                               /* set old value mtime */
-                               if (samdb_msg_add_uint64(secret_state->sam_ldb, 
-                                                        mem_ctx, msg, "lastSetTime", nt_now) != 0) { 
-                                       return NT_STATUS_NO_MEMORY; 
-                               }
-                       } else {
-                               if (samdb_msg_add_delete(secret_state->sam_ldb, 
-                                                        mem_ctx, msg, "currentValue")) {
-                                       return NT_STATUS_NO_MEMORY;
-                               }
-                               if (samdb_msg_add_delete(secret_state->sam_ldb, 
-                                                        mem_ctx, msg, "lastSetTime")) {
-                                       return NT_STATUS_NO_MEMORY;
-                               }
+                       /* set old value mtime */
+                       if (samdb_msg_add_uint64(secret_state->sam_ldb, 
+                                                mem_ctx, msg, "lastSetTime", nt_now) != 0) { 
+                               return NT_STATUS_NO_MEMORY; 
+                       }
+                       if (samdb_msg_add_delete(secret_state->sam_ldb, 
+                                                mem_ctx, msg, "currentValue")) {
+                               return NT_STATUS_NO_MEMORY;
                        }
                }
        }