s3-waf: fix the build after epmapper changes.
[samba.git] / source3 / rpc_server / srv_winreg_nt.c
index 4398d94235b2e42dd2d83581676dbfbe6bbfc9b3..298f33ab705bae4fc98be1877b56ce5faa7d3d23 100644 (file)
@@ -1,51 +1,43 @@
-/* 
+/*
  *  Unix SMB/CIFS implementation.
  *  RPC Pipe client / server routines
- * 
+ *
  *  Copyright (C) Gerald Carter                 2002-2006.
  *
  *  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,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  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/>.
  */
 
 /* Implementation of registry functions. */
 
 #include "includes.h"
-#include "regfio.h"
+#include "../librpc/gen_ndr/srv_winreg.h"
+#include "registry/reg_parse_prs.h"
+#include "registry.h"
+#include "registry/reg_api.h"
+#include "registry/reg_api_regf.h"
+#include "registry/reg_perfcount.h"
+#include "rpc_misc.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
 
-static struct generic_mapping reg_generic_map = 
-       { REG_KEY_READ, REG_KEY_WRITE, REG_KEY_EXECUTE, REG_KEY_ALL };
-
-/******************************************************************
- free() function for struct regkey_info
- *****************************************************************/
-static void free_regkey(void *ptr)
-{
-       struct registry_key *key = (struct registry_key *)ptr;
-       TALLOC_FREE(key);
-}
-
 /******************************************************************
- Find a registry key handle and return a REGISTRY_KEY
+ Find a registry key handle and return a struct registry_key *
  *****************************************************************/
 
-static struct registry_key *find_regkey_by_hnd(pipes_struct *p,
-                                              POLICY_HND *hnd)
+static struct registry_key *find_regkey_by_hnd(struct pipes_struct *p,
+                                              struct policy_handle *hnd)
 {
        struct registry_key *regkey = NULL;
 
@@ -58,71 +50,74 @@ static struct registry_key *find_regkey_by_hnd(pipes_struct *p,
 }
 
 /*******************************************************************
- Function for open a new registry handle and creating a handle 
+ Function for open a new registry handle and creating a handle
  Note that P should be valid & hnd should already have space
- When we open a key, we store the full path to the key as 
+
+ When we open a key, we store the full path to the key as
  HK[LM|U]\<key>\<key>\...
  *******************************************************************/
-static WERROR open_registry_key( pipes_struct *p, POLICY_HND *hnd, 
-                                struct registry_key *parent,
-                                const char *subkeyname,
-                                uint32 access_desired  )
+
+static WERROR open_registry_key(struct pipes_struct *p,
+                               struct policy_handle *hnd,
+                               struct registry_key *parent,
+                               const char *subkeyname,
+                               uint32_t access_desired)
 {
        WERROR result = WERR_OK;
        struct registry_key *key;
 
        if (parent == NULL) {
-               result = reg_openhive(NULL, subkeyname, access_desired,
-                                     p->pipe_user.nt_user_token, &key);
+               result = reg_openhive(p->mem_ctx, subkeyname, access_desired,
+                                     p->server_info->ptok, &key);
        }
        else {
-               result = reg_openkey(NULL, parent, subkeyname, access_desired,
-                                    &key);
+               result = reg_openkey(p->mem_ctx, parent, subkeyname,
+                                    access_desired, &key);
        }
 
        if ( !W_ERROR_IS_OK(result) ) {
                return result;
        }
-       
-       if ( !create_policy_hnd( p, hnd, free_regkey, key ) ) {
-               return WERR_BADFILE; 
+
+       if ( !create_policy_hnd( p, hnd, key ) ) {
+               return WERR_BADFILE;
        }
-       
-       return WERR_OK;;
+
+       return WERR_OK;
 }
 
 /*******************************************************************
- Function for open a new registry handle and creating a handle 
+ Function for open a new registry handle and creating a handle
  Note that P should be valid & hnd should already have space
  *******************************************************************/
 
-static BOOL close_registry_key(pipes_struct *p, POLICY_HND *hnd)
+static bool close_registry_key(struct pipes_struct *p,
+                              struct policy_handle *hnd)
 {
        struct registry_key *regkey = find_regkey_by_hnd(p, hnd);
-       
+
        if ( !regkey ) {
                DEBUG(2,("close_registry_key: Invalid handle (%s:%u:%u)\n",
                         OUR_HANDLE(hnd)));
                return False;
        }
-       
+
        close_policy_hnd(p, hnd);
-       
+
        return True;
 }
 
 /********************************************************************
- reg_close
+ _winreg_CloseKey
  ********************************************************************/
 
-WERROR _winreg_CloseKey(pipes_struct *p, struct winreg_CloseKey *r)
+WERROR _winreg_CloseKey(struct pipes_struct *p,
+                       struct winreg_CloseKey *r)
 {
        /* close the policy handle */
 
        if (!close_registry_key(p, r->in.handle))
-               return WERR_BADFID; 
+               return WERR_BADFID;
 
        ZERO_STRUCTP(r->out.handle);
 
@@ -130,82 +125,101 @@ WERROR _winreg_CloseKey(pipes_struct *p, struct winreg_CloseKey *r)
 }
 
 /*******************************************************************
+ _winreg_OpenHKLM
  ********************************************************************/
 
-WERROR _winreg_OpenHKLM(pipes_struct *p, struct winreg_OpenHKLM *r)
+WERROR _winreg_OpenHKLM(struct pipes_struct *p,
+                       struct winreg_OpenHKLM *r)
 {
        return open_registry_key(p, r->out.handle, NULL, KEY_HKLM, r->in.access_mask);
 }
 
 /*******************************************************************
+ _winreg_OpenHKPD
  ********************************************************************/
 
-WERROR _winreg_OpenHKPD(pipes_struct *p, struct winreg_OpenHKPD *r)
+WERROR _winreg_OpenHKPD(struct pipes_struct *p,
+                       struct winreg_OpenHKPD *r)
 {
        return open_registry_key(p, r->out.handle, NULL, KEY_HKPD, r->in.access_mask);
 }
 
 /*******************************************************************
+ _winreg_OpenHKPT
  ********************************************************************/
 
-WERROR _winreg_OpenHKPT(pipes_struct *p, struct winreg_OpenHKPT *r)
+WERROR _winreg_OpenHKPT(struct pipes_struct *p,
+                       struct winreg_OpenHKPT *r)
 {
        return open_registry_key(p, r->out.handle, NULL, KEY_HKPT, r->in.access_mask);
 }
 
 /*******************************************************************
+ _winreg_OpenHKCR
  ********************************************************************/
 
-WERROR _winreg_OpenHKCR(pipes_struct *p, struct winreg_OpenHKCR *r)
+WERROR _winreg_OpenHKCR(struct pipes_struct *p,
+                       struct winreg_OpenHKCR *r)
 {
        return open_registry_key(p, r->out.handle, NULL, KEY_HKCR, r->in.access_mask);
 }
 
 /*******************************************************************
+ _winreg_OpenHKU
  ********************************************************************/
 
-WERROR _winreg_OpenHKU(pipes_struct *p, struct winreg_OpenHKU *r)
+WERROR _winreg_OpenHKU(struct pipes_struct *p,
+                      struct winreg_OpenHKU *r)
 {
        return open_registry_key(p, r->out.handle, NULL, KEY_HKU, r->in.access_mask);
 }
 
 /*******************************************************************
+ _winreg_OpenHKCU
  ********************************************************************/
 
-WERROR _winreg_OpenHKCU(pipes_struct *p, struct winreg_OpenHKCU *r)
+WERROR _winreg_OpenHKCU(struct pipes_struct *p,
+                       struct winreg_OpenHKCU *r)
 {
        return open_registry_key(p, r->out.handle, NULL, KEY_HKCU, r->in.access_mask);
 }
 
 /*******************************************************************
+ _winreg_OpenHKCC
  ********************************************************************/
 
-WERROR _winreg_OpenHKCC(pipes_struct *p, struct winreg_OpenHKCC *r)
+WERROR _winreg_OpenHKCC(struct pipes_struct *p,
+                       struct winreg_OpenHKCC *r)
 {
        return open_registry_key(p, r->out.handle, NULL, KEY_HKCC, r->in.access_mask);
 }
 
 /*******************************************************************
+ _winreg_OpenHKDD
  ********************************************************************/
 
-WERROR _winreg_OpenHKDD(pipes_struct *p, struct winreg_OpenHKDD *r)
+WERROR _winreg_OpenHKDD(struct pipes_struct *p,
+                       struct winreg_OpenHKDD *r)
 {
        return open_registry_key(p, r->out.handle, NULL, KEY_HKDD, r->in.access_mask);
 }
 
 /*******************************************************************
+ _winreg_OpenHKPN
  ********************************************************************/
 
-WERROR _winreg_OpenHKPN(pipes_struct *p, struct winreg_OpenHKPN *r)
+WERROR _winreg_OpenHKPN(struct pipes_struct *p,
+                       struct winreg_OpenHKPN *r)
 {
        return open_registry_key(p, r->out.handle, NULL, KEY_HKPN, r->in.access_mask);
 }
 
 /*******************************************************************
reg_reply_open_entry
_winreg_OpenKey
  ********************************************************************/
 
-WERROR _winreg_OpenKey(pipes_struct *p, struct winreg_OpenKey *r)
+WERROR _winreg_OpenKey(struct pipes_struct *p,
+                      struct winreg_OpenKey *r)
 {
        struct registry_key *parent = find_regkey_by_hnd(p, r->in.parent_handle );
 
@@ -216,65 +230,73 @@ WERROR _winreg_OpenKey(pipes_struct *p, struct winreg_OpenKey *r)
 }
 
 /*******************************************************************
- reg_reply_info
+ _winreg_QueryValue
  ********************************************************************/
 
-WERROR _winreg_QueryValue(pipes_struct *p, struct winreg_QueryValue *r)
+WERROR _winreg_QueryValue(struct pipes_struct *p,
+                         struct winreg_QueryValue *r)
 {
        WERROR        status = WERR_BADFILE;
        struct registry_key *regkey = find_regkey_by_hnd( p, r->in.handle );
        prs_struct    prs_hkpd;
 
-       uint8_t *outbuf;
-       uint32_t outbuf_size;
+       uint8_t *outbuf = NULL;
+       uint32_t outbuf_size = 0;
 
-       DATA_BLOB val_blob;
-       BOOL free_buf = False;
-       BOOL free_prs = False;
+       bool free_buf = False;
+       bool free_prs = False;
 
        if ( !regkey )
                return WERR_BADFID;
 
-       *r->out.value_length = *r->out.type = 0;
-       
-       DEBUG(7,("_reg_info: policy key name = [%s]\n", regkey->key->name));
-       DEBUG(7,("_reg_info: policy key type = [%08x]\n", regkey->key->type));
-       
+       if (r->in.value_name->name == NULL) {
+               return WERR_INVALID_PARAM;
+       }
+
+       if ((r->out.data_length == NULL) || (r->out.type == NULL) || (r->out.data_size == NULL)) {
+               return WERR_INVALID_PARAM;
+       }
+
+       DEBUG(7,("_winreg_QueryValue: policy key name = [%s]\n", regkey->key->name));
+       DEBUG(7,("_winreg_QueryValue: policy key type = [%08x]\n", regkey->key->type));
+
        /* Handle QueryValue calls on HKEY_PERFORMANCE_DATA */
-       if(regkey->key->type == REG_KEY_HKPD) 
+       if(regkey->key->type == REG_KEY_HKPD)
        {
-               if(strequal(r->in.value_name.name, "Global"))   {
-                       prs_init(&prs_hkpd, *r->in.data_size, p->mem_ctx, MARSHALL);
+               if (strequal(r->in.value_name->name, "Global")) {
+                       if (!prs_init(&prs_hkpd, *r->in.data_size, p->mem_ctx, MARSHALL))
+                               return WERR_NOMEM;
                        status = reg_perfcount_get_hkpd(
                                &prs_hkpd, *r->in.data_size, &outbuf_size, NULL);
                        outbuf = (uint8_t *)prs_hkpd.data_p;
                        free_prs = True;
                }
-               else if(strequal(r->in.value_name.name, "Counter 009")) {
+               else if (strequal(r->in.value_name->name, "Counter 009")) {
                        outbuf_size = reg_perfcount_get_counter_names(
                                reg_perfcount_get_base_index(),
                                (char **)(void *)&outbuf);
                        free_buf = True;
                }
-               else if(strequal(r->in.value_name.name, "Explain 009")) {
+               else if (strequal(r->in.value_name->name, "Explain 009")) {
                        outbuf_size = reg_perfcount_get_counter_help(
                                reg_perfcount_get_base_index(),
                                (char **)(void *)&outbuf);
                        free_buf = True;
                }
-               else if(isdigit(r->in.value_name.name[0])) {
+               else if (isdigit(r->in.value_name->name[0])) {
                        /* we probably have a request for a specific object
                         * here */
-                       prs_init(&prs_hkpd, *r->in.data_size, p->mem_ctx, MARSHALL);
+                       if (!prs_init(&prs_hkpd, *r->in.data_size, p->mem_ctx, MARSHALL))
+                               return WERR_NOMEM;
                        status = reg_perfcount_get_hkpd(
                                &prs_hkpd, *r->in.data_size, &outbuf_size,
-                               r->in.value_name.name);
+                               r->in.value_name->name);
                        outbuf = (uint8_t *)prs_hkpd.data_p;
                        free_prs = True;
                }
                else {
                        DEBUG(3,("Unsupported key name [%s] for HKPD.\n",
-                                r->in.value_name.name));
+                                r->in.value_name->name));
                        return WERR_BADFILE;
                }
 
@@ -283,41 +305,41 @@ WERROR _winreg_QueryValue(pipes_struct *p, struct winreg_QueryValue *r)
        else {
                struct registry_value *val;
 
-               status = reg_queryvalue(p->mem_ctx, regkey, r->in.value_name.name,
+               status = reg_queryvalue(p->mem_ctx, regkey, r->in.value_name->name,
                                        &val);
                if (!W_ERROR_IS_OK(status)) {
+
+                       DEBUG(10,("_winreg_QueryValue: reg_queryvalue failed with: %s\n",
+                               win_errstr(status)));
+
                        if (r->out.data_size) {
                                *r->out.data_size = 0;
                        }
-                       if (r->out.value_length) {
-                               *r->out.value_length = 0;
+                       if (r->out.data_length) {
+                               *r->out.data_length = 0;
                        }
                        return status;
                }
 
-               status = registry_push_value(p->mem_ctx, val, &val_blob);
-               if (!W_ERROR_IS_OK(status)) {
-                       return status;
-               }
-
-               outbuf = val_blob.data;
-               outbuf_size = val_blob.length;
+               outbuf = val->data.data;
+               outbuf_size = val->data.length;
                *r->out.type = val->type;
        }
 
-       *r->out.value_length = outbuf_size;
+       status = WERR_BADFILE;
 
-       if ( *r->in.data_size == 0 || !r->out.data ) {
-               status = WERR_OK;
-       } else if ( *r->out.value_length > *r->in.data_size ) {
-               status = WERR_MORE_DATA;
+       if (*r->in.data_size < outbuf_size) {
+               *r->out.data_size = outbuf_size;
+               status = r->in.data ? WERR_MORE_DATA : WERR_OK;
        } else {
-               memcpy( r->out.data, outbuf, *r->out.value_length );
+               *r->out.data_length = outbuf_size;
+               *r->out.data_size = outbuf_size;
+               if (r->out.data) {
+                       memcpy(r->out.data, outbuf, outbuf_size);
+               }
                status = WERR_OK;
        }
 
-       *r->out.data_size = *r->out.value_length;
-
        if (free_prs) prs_mem_free(&prs_hkpd);
        if (free_buf) SAFE_FREE(outbuf);
 
@@ -325,14 +347,15 @@ WERROR _winreg_QueryValue(pipes_struct *p, struct winreg_QueryValue *r)
 }
 
 /*****************************************************************************
- Implementation of REG_QUERY_KEY
+ _winreg_QueryInfoKey
  ****************************************************************************/
 
-WERROR _winreg_QueryInfoKey(pipes_struct *p, struct winreg_QueryInfoKey *r)
+WERROR _winreg_QueryInfoKey(struct pipes_struct *p,
+                           struct winreg_QueryInfoKey *r)
 {
        WERROR  status = WERR_OK;
        struct registry_key *regkey = find_regkey_by_hnd( p, r->in.handle );
-       
+
        if ( !regkey )
                return WERR_BADFID;
 
@@ -355,44 +378,44 @@ WERROR _winreg_QueryInfoKey(pipes_struct *p, struct winreg_QueryInfoKey *r)
 
        *r->out.max_valnamelen += 1;
        *r->out.max_valnamelen *= 2;
-       
+
        return WERR_OK;
 }
 
 
 /*****************************************************************************
- Implementation of REG_GETVERSION
+ _winreg_GetVersion
  ****************************************************************************/
-WERROR _winreg_GetVersion(pipes_struct *p, struct winreg_GetVersion *r)
+
+WERROR _winreg_GetVersion(struct pipes_struct *p,
+                         struct winreg_GetVersion *r)
 {
        struct registry_key *regkey = find_regkey_by_hnd( p, r->in.handle );
-       
+
        if ( !regkey )
                return WERR_BADFID;
-       
-       *r->out.version = 0x00000005;   /* Windows 2000 registry API version */
-       
-       return WERR_OK;
+
+       return reg_getversion(r->out.version);
 }
 
 
 /*****************************************************************************
- Implementation of REG_ENUM_KEY
+ _winreg_EnumKey
  ****************************************************************************/
-WERROR _winreg_EnumKey(pipes_struct *p, struct winreg_EnumKey *r)
+
+WERROR _winreg_EnumKey(struct pipes_struct *p,
+                      struct winreg_EnumKey *r)
 {
-       WERROR err;
+       WERROR err = WERR_OK;
        struct registry_key *key = find_regkey_by_hnd( p, r->in.handle );
-       
+
        if ( !key )
-               return WERR_BADFID; 
+               return WERR_BADFID;
 
        if ( !r->in.name || !r->in.keyclass )
                return WERR_INVALID_PARAM;
 
-       DEBUG(8,("_reg_enum_key: enumerating key [%s]\n", key->key->name));
+       DEBUG(8,("_winreg_EnumKey: enumerating key [%s]\n", key->key->name));
 
        err = reg_enumkey(p->mem_ctx, key, r->in.enum_index, (char **)&r->out.name->name,
                          r->out.last_changed_time);
@@ -404,17 +427,17 @@ WERROR _winreg_EnumKey(pipes_struct *p, struct winreg_EnumKey *r)
 }
 
 /*****************************************************************************
- Implementation of REG_ENUM_VALUE
+ _winreg_EnumValue
  ****************************************************************************/
 
-WERROR _winreg_EnumValue(pipes_struct *p, struct winreg_EnumValue *r)
+WERROR _winreg_EnumValue(struct pipes_struct *p,
+                        struct winreg_EnumValue *r)
 {
-       WERROR err;
+       WERROR err = WERR_OK;
        struct registry_key *key = find_regkey_by_hnd( p, r->in.handle );
-       char *valname;
-       struct registry_value *val;
-       DATA_BLOB value_blob;
-       
+       char *valname = NULL;
+       struct registry_value *val = NULL;
+
        if ( !key )
                return WERR_BADFID;
 
@@ -429,11 +452,6 @@ WERROR _winreg_EnumValue(pipes_struct *p, struct winreg_EnumValue *r)
                return err;
        }
 
-       err = registry_push_value(p->mem_ctx, val, &value_blob);
-       if (!W_ERROR_IS_OK(err)) {
-               return err;
-       }
-
        if (r->out.name != NULL) {
                r->out.name->name = valname;
        }
@@ -447,28 +465,29 @@ WERROR _winreg_EnumValue(pipes_struct *p, struct winreg_EnumValue *r)
                        return WERR_INVALID_PARAM;
                }
 
-               if (value_blob.length > *r->out.size) {
+               if (val->data.length > *r->out.size) {
                        return WERR_MORE_DATA;
                }
 
-               memcpy( r->out.value, value_blob.data, value_blob.length );
+               memcpy( r->out.value, val->data.data, val->data.length );
        }
 
        if (r->out.length != NULL) {
-               *r->out.length = value_blob.length;
+               *r->out.length = val->data.length;
        }
        if (r->out.size != NULL) {
-               *r->out.size = value_blob.length;
+               *r->out.size = val->data.length;
        }
 
        return WERR_OK;
 }
 
 /*******************************************************************
reg_shutdwon
_winreg_InitiateSystemShutdown
  ********************************************************************/
 
-WERROR _winreg_InitiateSystemShutdown(pipes_struct *p, struct winreg_InitiateSystemShutdown *r)
+WERROR _winreg_InitiateSystemShutdown(struct pipes_struct *p,
+                                     struct winreg_InitiateSystemShutdown *r)
 {
        struct winreg_InitiateSystemShutdownEx s;
 
@@ -476,122 +495,141 @@ WERROR _winreg_InitiateSystemShutdown(pipes_struct *p, struct winreg_InitiateSys
        s.in.message = r->in.message;
        s.in.timeout = r->in.timeout;
        s.in.force_apps = r->in.force_apps;
-       s.in.reboot = r->in.reboot;
+       s.in.do_reboot = r->in.do_reboot;
        s.in.reason = 0;
 
-       /* thunk down to _winreg_InitiateSystemShutdownEx() 
+       /* thunk down to _winreg_InitiateSystemShutdownEx()
           (just returns a status) */
-       
+
        return _winreg_InitiateSystemShutdownEx( p, &s );
 }
 
 /*******************************************************************
reg_shutdown_ex
_winreg_InitiateSystemShutdownEx
  ********************************************************************/
 
 #define SHUTDOWN_R_STRING "-r"
 #define SHUTDOWN_F_STRING "-f"
 
 
-WERROR _winreg_InitiateSystemShutdownEx(pipes_struct *p, struct winreg_InitiateSystemShutdownEx *r)
+WERROR _winreg_InitiateSystemShutdownEx(struct pipes_struct *p,
+                                       struct winreg_InitiateSystemShutdownEx *r)
 {
-       pstring shutdown_script;
+       char *shutdown_script = NULL;
        char *msg = NULL;
-       pstring chkmsg;
+       char *chkmsg = NULL;
        fstring str_timeout;
        fstring str_reason;
-       fstring reboot;
+       fstring do_reboot;
        fstring f;
-       int ret;
-       BOOL can_shutdown;
-       
+       int ret = -1;
+       bool can_shutdown = false;
 
-       pstrcpy(shutdown_script, lp_shutdown_script());
-       
-       if ( !*shutdown_script )
+       shutdown_script = talloc_strdup(p->mem_ctx, lp_shutdown_script());
+       if (!shutdown_script) {
+               return WERR_NOMEM;
+       }
+       if (!*shutdown_script) {
                return WERR_ACCESS_DENIED;
+       }
 
        /* pull the message string and perform necessary sanity checks on it */
 
-       chkmsg[0] = '\0';
-
-       if ( r->in.message && r->in.message->name && r->in.message->name->name ) {
-               if ( (msg = talloc_strdup(p->mem_ctx, r->in.message->name->name )) == NULL ) {
+       if ( r->in.message && r->in.message->string ) {
+               if ( (msg = talloc_strdup(p->mem_ctx, r->in.message->string )) == NULL ) {
                        return WERR_NOMEM;
                }
-               alpha_strcpy (chkmsg, msg, NULL, sizeof(chkmsg));
-       } 
-               
+               chkmsg = TALLOC_ARRAY(p->mem_ctx, char, strlen(msg)+1);
+               if (!chkmsg) {
+                       return WERR_NOMEM;
+               }
+               alpha_strcpy(chkmsg, msg, NULL, strlen(msg)+1);
+       }
+
        fstr_sprintf(str_timeout, "%d", r->in.timeout);
-       fstr_sprintf(reboot, r->in.reboot ? SHUTDOWN_R_STRING : "");
+       fstr_sprintf(do_reboot, r->in.do_reboot ? SHUTDOWN_R_STRING : "");
        fstr_sprintf(f, r->in.force_apps ? SHUTDOWN_F_STRING : "");
        fstr_sprintf(str_reason, "%d", r->in.reason );
 
-       all_string_sub( shutdown_script, "%z", chkmsg, sizeof(shutdown_script) );
-       all_string_sub( shutdown_script, "%t", str_timeout, sizeof(shutdown_script) );
-       all_string_sub( shutdown_script, "%r", reboot, sizeof(shutdown_script) );
-       all_string_sub( shutdown_script, "%f", f, sizeof(shutdown_script) );
-       all_string_sub( shutdown_script, "%x", str_reason, sizeof(shutdown_script) );
+       shutdown_script = talloc_all_string_sub(p->mem_ctx,
+                               shutdown_script, "%z", chkmsg ? chkmsg : "");
+       if (!shutdown_script) {
+               return WERR_NOMEM;
+       }
+       shutdown_script = talloc_all_string_sub(p->mem_ctx,
+                                       shutdown_script, "%t", str_timeout);
+       if (!shutdown_script) {
+               return WERR_NOMEM;
+       }
+       shutdown_script = talloc_all_string_sub(p->mem_ctx,
+                                               shutdown_script, "%r", do_reboot);
+       if (!shutdown_script) {
+               return WERR_NOMEM;
+       }
+       shutdown_script = talloc_all_string_sub(p->mem_ctx,
+                                               shutdown_script, "%f", f);
+       if (!shutdown_script) {
+               return WERR_NOMEM;
+       }
+       shutdown_script = talloc_all_string_sub(p->mem_ctx,
+                                       shutdown_script, "%x", str_reason);
+       if (!shutdown_script) {
+               return WERR_NOMEM;
+       }
+
+       can_shutdown = security_token_has_privilege(p->server_info->ptok, SEC_PRIV_REMOTE_SHUTDOWN);
 
-       can_shutdown = user_has_privileges( p->pipe_user.nt_user_token, &se_remote_shutdown );
-               
        /* IF someone has privs, run the shutdown script as root. OTHERWISE run it as not root
           Take the error return from the script and provide it as the Windows return code. */
-          
+
        /********** BEGIN SeRemoteShutdownPrivilege BLOCK **********/
-       
-       if ( can_shutdown ) 
+
+       if ( can_shutdown )
                become_root();
 
        ret = smbrun( shutdown_script, NULL );
-               
+
        if ( can_shutdown )
                unbecome_root();
 
        /********** END SeRemoteShutdownPrivilege BLOCK **********/
-       
+
        DEBUG(3,("_reg_shutdown_ex: Running the command `%s' gave %d\n",
                shutdown_script, ret));
-               
 
        return (ret == 0) ? WERR_OK : WERR_ACCESS_DENIED;
 }
 
-
-
-
 /*******************************************************************
reg_abort_shutdwon
_winreg_AbortSystemShutdown
  ********************************************************************/
 
-WERROR _winreg_AbortSystemShutdown(pipes_struct *p, struct winreg_AbortSystemShutdown *r)
+WERROR _winreg_AbortSystemShutdown(struct pipes_struct *p,
+                                  struct winreg_AbortSystemShutdown *r)
 {
-       pstring abort_shutdown_script;
-       int ret;
-       BOOL can_shutdown;
+       const char *abort_shutdown_script = lp_abort_shutdown_script();
+       int ret = -1;
+       bool can_shutdown = false;
 
-       pstrcpy(abort_shutdown_script, lp_abort_shutdown_script());
-
-       if ( !*abort_shutdown_script )
+       if (!*abort_shutdown_script)
                return WERR_ACCESS_DENIED;
-               
-       can_shutdown = user_has_privileges( p->pipe_user.nt_user_token, &se_remote_shutdown );
-               
+
+       can_shutdown = security_token_has_privilege(p->server_info->ptok, SEC_PRIV_REMOTE_SHUTDOWN);
+
        /********** BEGIN SeRemoteShutdownPrivilege BLOCK **********/
-       
+
        if ( can_shutdown )
                become_root();
-               
+
        ret = smbrun( abort_shutdown_script, NULL );
-       
+
        if ( can_shutdown )
                unbecome_root();
-               
+
        /********** END SeRemoteShutdownPrivilege BLOCK **********/
 
-       DEBUG(3,("_reg_abort_shutdown: Running the command `%s' gave %d\n",
+       DEBUG(3,("_winreg_AbortSystemShutdown: Running the command `%s' gave %d\n",
                abort_shutdown_script, ret));
-               
 
        return (ret == 0) ? WERR_OK : WERR_ACCESS_DENIED;
 }
@@ -599,373 +637,123 @@ WERROR _winreg_AbortSystemShutdown(pipes_struct *p, struct winreg_AbortSystemShu
 /*******************************************************************
  ********************************************************************/
 
-static int validate_reg_filename( pstring fname )
+static int validate_reg_filename(TALLOC_CTX *ctx, char **pp_fname )
 {
-       char *p;
+       char *p = NULL;
        int num_services = lp_numservices();
-       int snum;
-       pstring share_path;
-       pstring unix_fname;
-       
+       int snum = -1;
+       const char *share_path = NULL;
+       char *fname = *pp_fname;
+
        /* convert to a unix path, stripping the C:\ along the way */
-       
-       if ( !(p = valid_share_pathname( fname ) ))
+
+       if (!(p = valid_share_pathname(ctx, fname))) {
                return -1;
+       }
 
        /* has to exist within a valid file share */
-                       
-       for ( snum=0; snum<num_services; snum++ ) {
-       
-               if ( !lp_snum_ok(snum) || lp_print_ok(snum) )
-                       continue;
-               
-               pstrcpy( share_path, lp_pathname(snum) );
-
-               /* make sure we have a path (e.g. [homes] ) */
 
-               if ( strlen( share_path ) == 0 )
+       for (snum=0; snum<num_services; snum++) {
+               if (!lp_snum_ok(snum) || lp_print_ok(snum)) {
                        continue;
+               }
 
-               if ( strncmp( share_path, p, strlen( share_path )) == 0 )
-                       break;
-       }
-       
-       /* p and fname are overlapping memory so copy out and back in again */
-       
-       pstrcpy( unix_fname, p );
-       pstrcpy( fname, unix_fname );
-       
-       return (snum < num_services) ? snum : -1;
-}
-
-/*******************************************************************
- Note: topkeypat is the *full* path that this *key will be 
- loaded into (including the name of the key)
- ********************************************************************/
-
-static WERROR reg_load_tree( REGF_FILE *regfile, const char *topkeypath,
-                             REGF_NK_REC *key )
-{
-       REGF_NK_REC *subkey;
-       REGISTRY_KEY registry_key;
-       REGVAL_CTR *values;
-       REGSUBKEY_CTR *subkeys;
-       int i;
-       pstring path;
-       WERROR result = WERR_OK;
-       
-       /* initialize the REGISTRY_KEY structure */
-       
-       if ( !(registry_key.hook = reghook_cache_find(topkeypath)) ) {
-               DEBUG(0,("reg_load_tree: Failed to assigned a REGISTRY_HOOK to [%s]\n",
-                       topkeypath ));
-               return WERR_BADFILE;
-       }
-       pstrcpy( registry_key.name, topkeypath );
-       
-       /* now start parsing the values and subkeys */
-
-       if ( !(subkeys = TALLOC_ZERO_P( regfile->mem_ctx, REGSUBKEY_CTR )) )
-               return WERR_NOMEM;
-       
-       if ( !(values = TALLOC_ZERO_P( subkeys, REGVAL_CTR )) )
-               return WERR_NOMEM;
+               share_path = lp_pathname(snum);
 
-       /* copy values into the REGVAL_CTR */
-       
-       for ( i=0; i<key->num_values; i++ ) {
-               regval_ctr_addvalue( values, key->values[i].valuename, key->values[i].type,
-                       (char*)key->values[i].data, (key->values[i].data_size & ~VK_DATA_IN_OFFSET) );
-       }
+               /* make sure we have a path (e.g. [homes] ) */
+               if (strlen(share_path) == 0) {
+                       continue;
+               }
 
-       /* copy subkeys into the REGSUBKEY_CTR */
-       
-       key->subkey_index = 0;
-       while ( (subkey = regfio_fetch_subkey( regfile, key )) ) {
-               regsubkey_ctr_addkey( subkeys, subkey->keyname );
-       }
-       
-       /* write this key and values out */
-       
-       if ( !store_reg_values( &registry_key, values ) 
-               || !store_reg_keys( &registry_key, subkeys ) )
-       {
-               DEBUG(0,("reg_load_tree: Failed to load %s!\n", topkeypath));
-               result = WERR_REG_IO_FAILURE;
-       }
-       
-       TALLOC_FREE( subkeys );
-       
-       if ( !W_ERROR_IS_OK(result) )
-               return result;
-       
-       /* now continue to load each subkey registry tree */
-
-       key->subkey_index = 0;
-       while ( (subkey = regfio_fetch_subkey( regfile, key )) ) {
-               pstr_sprintf( path, "%s%s%s", topkeypath, "\\", subkey->keyname );
-               result = reg_load_tree( regfile, path, subkey );
-               if ( !W_ERROR_IS_OK(result) )
+               if (strncmp(share_path, p, strlen(share_path)) == 0) {
                        break;
+               }
        }
 
-       return result;
-}
-
-/*******************************************************************
- ********************************************************************/
-
-static WERROR restore_registry_key ( REGISTRY_KEY *krecord, const char *fname )
-{
-       REGF_FILE *regfile;
-       REGF_NK_REC *rootkey;
-       WERROR result;
-               
-       /* open the registry file....fail if the file already exists */
-       
-       if ( !(regfile = regfio_open( fname, (O_RDONLY), 0 )) ) {
-                DEBUG(0,("restore_registry_key: failed to open \"%s\" (%s)\n", 
-                       fname, strerror(errno) ));
-               return ( ntstatus_to_werror(map_nt_error_from_unix( errno )) );
-        }
-       
-       /* get the rootkey from the regf file and then load the tree
-          via recursive calls */
-          
-       if ( !(rootkey = regfio_rootkey( regfile )) ) {
-               regfio_close( regfile );
-               return WERR_REG_FILE_INVALID;
-       }
-       
-       result = reg_load_tree( regfile, krecord->name, rootkey );
-               
-       /* cleanup */
-       
-       regfio_close( regfile );
-       
-       return result;
+       *pp_fname = p;
+       return (snum < num_services) ? snum : -1;
 }
 
 /*******************************************************************
+ _winreg_RestoreKey
  ********************************************************************/
 
-WERROR _winreg_RestoreKey(pipes_struct *p, struct winreg_RestoreKey *r)
+WERROR _winreg_RestoreKey(struct pipes_struct *p,
+                         struct winreg_RestoreKey *r)
 {
        struct registry_key *regkey = find_regkey_by_hnd( p, r->in.handle );
-       pstring         fname;
-       int             snum;
-       
+       char *fname = NULL;
+       int snum = -1;
+
        if ( !regkey )
-               return WERR_BADFID; 
+               return WERR_BADFID;
 
        if ( !r->in.filename || !r->in.filename->name )
                return WERR_INVALID_PARAM;
 
-       pstrcpy( fname, r->in.filename->name );
+       fname = talloc_strdup(p->mem_ctx, r->in.filename->name);
+       if (!fname) {
+               return WERR_NOMEM;
+       }
 
        DEBUG(8,("_winreg_RestoreKey: verifying restore of key [%s] from "
                 "\"%s\"\n", regkey->key->name, fname));
 
-       if ( (snum = validate_reg_filename( fname )) == -1 )
+       if ((snum = validate_reg_filename(p->mem_ctx, &fname)) == -1)
                return WERR_OBJECT_PATH_INVALID;
-               
-       /* user must posses SeRestorePrivilege for this this proceed */
-       
-       if ( !user_has_privileges( p->pipe_user.nt_user_token, &se_restore ) )
-               return WERR_ACCESS_DENIED;
-               
-       DEBUG(2,("_winreg_RestoreKey: Restoring [%s] from %s in share %s\n",
-                regkey->key->name, fname, lp_servicename(snum) ));
 
-       return restore_registry_key( regkey->key, fname );
-}
-
-/********************************************************************
-********************************************************************/
-
-static WERROR reg_write_tree( REGF_FILE *regfile, const char *keypath,
-                              REGF_NK_REC *parent, SEC_DESC *sec_desc )
-{
-       REGF_NK_REC *key;
-       REGVAL_CTR *values;
-       REGSUBKEY_CTR *subkeys;
-       int i, num_subkeys;
-       pstring key_tmp;
-       char *keyname, *parentpath;
-       pstring subkeypath;
-       char *subkeyname;
-       REGISTRY_KEY registry_key;
-       WERROR result = WERR_OK;
-       
-       if ( !regfile )
-               return WERR_GENERAL_FAILURE;
-               
-       if ( !keypath )
-               return WERR_OBJECT_PATH_INVALID;
-               
-       /* split up the registry key path */
-       
-       pstrcpy( key_tmp, keypath );
-       if ( !reg_split_key( key_tmp, &parentpath, &keyname ) )
-               return WERR_OBJECT_PATH_INVALID;
-
-       if ( !keyname )
-               keyname = parentpath;
-
-       /* we need a REGISTRY_KEY object here to enumerate subkeys and values */
-       
-       ZERO_STRUCT( registry_key );
-
-       if ( (registry_key.name = talloc_strdup(regfile->mem_ctx, keypath)) == NULL )
-               return WERR_NOMEM;
-
-       if ( (registry_key.hook = reghook_cache_find( registry_key.name )) == NULL )
-               return WERR_BADFILE;
-
-       /* lookup the values and subkeys */
-       
-       if ( !(subkeys = TALLOC_ZERO_P( regfile->mem_ctx, REGSUBKEY_CTR )) ) 
-               return WERR_NOMEM;
-
-       if ( !(values = TALLOC_ZERO_P( subkeys, REGVAL_CTR )) )
-               return WERR_NOMEM;
-
-       fetch_reg_keys( &registry_key, subkeys );
-       fetch_reg_values( &registry_key, values );
-
-       /* write out this key */
-               
-       if ( !(key = regfio_write_key( regfile, keyname, values, subkeys, sec_desc, parent )) ) {
-               result = WERR_CAN_NOT_COMPLETE;
-               goto done;
-       }
-
-       /* write each one of the subkeys out */
+       /* user must posses SeRestorePrivilege for this this proceed */
 
-       num_subkeys = regsubkey_ctr_numkeys( subkeys );
-       for ( i=0; i<num_subkeys; i++ ) {
-               subkeyname = regsubkey_ctr_specific_key( subkeys, i );
-               pstr_sprintf( subkeypath, "%s\\%s", keypath, subkeyname );
-               result = reg_write_tree( regfile, subkeypath, key, sec_desc );
-               if ( !W_ERROR_IS_OK(result) )
-                       goto done;
+       if ( !security_token_has_privilege(p->server_info->ptok, SEC_PRIV_RESTORE)) {
+               return WERR_ACCESS_DENIED;
        }
 
-       DEBUG(6,("reg_write_tree: wrote key [%s]\n", keypath ));
-
-done:
-       TALLOC_FREE( subkeys );
-       TALLOC_FREE( registry_key.name );
-
-       return result;
-}
-
-/*******************************************************************
- ********************************************************************/
-
-static WERROR make_default_reg_sd( TALLOC_CTX *ctx, SEC_DESC **psd )
-{
-       DOM_SID adm_sid, owner_sid;
-       SEC_ACE ace[2];         /* at most 2 entries */
-       SEC_ACCESS mask;
-       SEC_ACL *psa = NULL;
-       size_t sd_size;
-
-       /* set the owner to BUILTIN\Administrator */
-
-       sid_copy(&owner_sid, &global_sid_Builtin);
-       sid_append_rid(&owner_sid, DOMAIN_USER_RID_ADMIN );
-       
-
-       /* basic access for Everyone */
-
-       init_sec_access(&mask, reg_generic_map.generic_execute | reg_generic_map.generic_read );
-       init_sec_ace(&ace[0], &global_sid_World, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
-
-       /* add Full Access 'BUILTIN\Administrators' */
-
-       init_sec_access(&mask, reg_generic_map.generic_all);
-       sid_copy(&adm_sid, &global_sid_Builtin);
-       sid_append_rid(&adm_sid, BUILTIN_ALIAS_RID_ADMINS);
-       init_sec_ace(&ace[1], &adm_sid, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
-
-        /* create the security descriptor */
-
-        if ((psa = make_sec_acl(ctx, NT4_ACL_REVISION, 2, ace)) == NULL)
-                return WERR_NOMEM;
-
-        if ((*psd = make_sec_desc(ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE, &owner_sid, NULL, NULL, psa, &sd_size)) == NULL)
-                return WERR_NOMEM;
+       DEBUG(2,("_winreg_RestoreKey: Restoring [%s] from %s in share %s\n",
+                regkey->key->name, fname, lp_servicename(snum) ));
 
-       return WERR_OK;
+       return reg_restorekey(regkey, fname);
 }
 
 /*******************************************************************
+ _winreg_SaveKey
  ********************************************************************/
 
-static WERROR backup_registry_key ( REGISTRY_KEY *krecord, const char *fname )
-{
-       REGF_FILE *regfile;
-       WERROR result;
-       SEC_DESC *sd = NULL;
-       
-       /* open the registry file....fail if the file already exists */
-       
-       if ( !(regfile = regfio_open( fname, (O_RDWR|O_CREAT|O_EXCL), (S_IREAD|S_IWRITE) )) ) {
-                DEBUG(0,("backup_registry_key: failed to open \"%s\" (%s)\n", 
-                       fname, strerror(errno) ));
-               return ( ntstatus_to_werror(map_nt_error_from_unix( errno )) );
-        }
-       
-       if ( !W_ERROR_IS_OK(result = make_default_reg_sd( regfile->mem_ctx, &sd )) ) {
-               regfio_close( regfile );
-               return result;
-       }
-               
-       /* write the registry tree to the file  */
-       
-       result = reg_write_tree( regfile, krecord->name, NULL, sd );
-               
-       /* cleanup */
-       
-       regfio_close( regfile );
-       
-       return result;
-}
-
-/*******************************************************************
- ********************************************************************/
-
-WERROR _winreg_SaveKey(pipes_struct *p, struct winreg_SaveKey *r)
+WERROR _winreg_SaveKey(struct pipes_struct *p,
+                      struct winreg_SaveKey *r)
 {
        struct registry_key *regkey = find_regkey_by_hnd( p, r->in.handle );
-       pstring         fname;
-       int             snum;
-       
+       char *fname = NULL;
+       int snum = -1;
+
        if ( !regkey )
-               return WERR_BADFID; 
+               return WERR_BADFID;
 
        if ( !r->in.filename || !r->in.filename->name )
                return WERR_INVALID_PARAM;
 
-       pstrcpy( fname, r->in.filename->name );
+       fname = talloc_strdup(p->mem_ctx, r->in.filename->name);
+       if (!fname) {
+               return WERR_NOMEM;
+       }
 
        DEBUG(8,("_winreg_SaveKey: verifying backup of key [%s] to \"%s\"\n",
                 regkey->key->name, fname));
-       
-       if ( (snum = validate_reg_filename( fname )) == -1 )
+
+       if ((snum = validate_reg_filename(p->mem_ctx, &fname)) == -1 )
                return WERR_OBJECT_PATH_INVALID;
-               
+
        DEBUG(2,("_winreg_SaveKey: Saving [%s] to %s in share %s\n",
                 regkey->key->name, fname, lp_servicename(snum) ));
-               
-       return backup_registry_key( regkey->key, fname );
+
+       return reg_savekey(regkey, fname);
 }
 
 /*******************************************************************
+ _winreg_SaveKeyEx
  ********************************************************************/
 
-WERROR _winreg_SaveKeyEx(pipes_struct *p, struct winreg_SaveKeyEx *r)
+WERROR _winreg_SaveKeyEx(struct pipes_struct *p,
+                        struct winreg_SaveKeyEx *r)
 {
        /* fill in your code here if you think this call should
           do anything */
@@ -975,24 +763,29 @@ WERROR _winreg_SaveKeyEx(pipes_struct *p, struct winreg_SaveKeyEx *r)
 }
 
 /*******************************************************************
+ _winreg_CreateKey
  ********************************************************************/
 
-WERROR _winreg_CreateKey( pipes_struct *p, struct winreg_CreateKey *r)
+WERROR _winreg_CreateKey(struct pipes_struct *p,
+                        struct winreg_CreateKey *r)
 {
        struct registry_key *parent = find_regkey_by_hnd(p, r->in.handle);
-       struct registry_key *new_key;
-       WERROR result;
+       struct registry_key *new_key = NULL;
+       WERROR result = WERR_OK;
 
        if ( !parent )
                return WERR_BADFID;
 
+       DEBUG(10, ("_winreg_CreateKey called with parent key '%s' and "
+                  "subkey name '%s'\n", parent->key->name, r->in.name.name));
+
        result = reg_createkey(NULL, parent, r->in.name.name, r->in.access_mask,
                               &new_key, r->out.action_taken);
        if (!W_ERROR_IS_OK(result)) {
                return result;
        }
 
-       if (!create_policy_hnd(p, r->out.new_handle, free_regkey, new_key)) {
+       if (!create_policy_hnd(p, r->out.new_handle, new_key)) {
                TALLOC_FREE(new_key);
                return WERR_BADFILE;
        }
@@ -1001,33 +794,38 @@ WERROR _winreg_CreateKey( pipes_struct *p, struct winreg_CreateKey *r)
 }
 
 /*******************************************************************
+ _winreg_SetValue
  ********************************************************************/
 
-WERROR _winreg_SetValue(pipes_struct *p, struct winreg_SetValue *r)
+WERROR _winreg_SetValue(struct pipes_struct *p,
+                       struct winreg_SetValue *r)
 {
        struct registry_key *key = find_regkey_by_hnd(p, r->in.handle);
-       struct registry_value *val;
-       WERROR status;
+       struct registry_value *val = NULL;
 
        if ( !key )
                return WERR_BADFID;
 
-       DEBUG(8,("_reg_set_value: Setting value for [%s:%s]\n", 
+       DEBUG(8,("_winreg_SetValue: Setting value for [%s:%s]\n",
                         key->key->name, r->in.name.name));
 
-       status = registry_pull_value(p->mem_ctx, &val, r->in.type, r->in.data, 
-                                                                r->in.size, r->in.size);
-       if (!W_ERROR_IS_OK(status)) {
-               return status;
+       val = talloc_zero(p->mem_ctx, struct registry_value);
+       if (val == NULL) {
+               return WERR_NOMEM;
        }
 
+       val->type = r->in.type;
+       val->data = data_blob_talloc(p->mem_ctx, r->in.data, r->in.size);
+
        return reg_setvalue(key, r->in.name.name, val);
 }
 
 /*******************************************************************
+ _winreg_DeleteKey
  ********************************************************************/
 
-WERROR _winreg_DeleteKey(pipes_struct *p, struct winreg_DeleteKey *r)
+WERROR _winreg_DeleteKey(struct pipes_struct *p,
+                        struct winreg_DeleteKey *r)
 {
        struct registry_key *parent = find_regkey_by_hnd(p, r->in.handle);
 
@@ -1039,12 +837,14 @@ WERROR _winreg_DeleteKey(pipes_struct *p, struct winreg_DeleteKey *r)
 
 
 /*******************************************************************
+ _winreg_DeleteValue
  ********************************************************************/
 
-WERROR _winreg_DeleteValue(pipes_struct *p, struct winreg_DeleteValue *r)
+WERROR _winreg_DeleteValue(struct pipes_struct *p,
+                          struct winreg_DeleteValue *r)
 {
        struct registry_key *key = find_regkey_by_hnd(p, r->in.handle);
-       
+
        if ( !key )
                return WERR_BADFID;
 
@@ -1052,25 +852,27 @@ WERROR _winreg_DeleteValue(pipes_struct *p, struct winreg_DeleteValue *r)
 }
 
 /*******************************************************************
+ _winreg_GetKeySecurity
  ********************************************************************/
 
-WERROR _winreg_GetKeySecurity(pipes_struct *p, struct winreg_GetKeySecurity *r)
+WERROR _winreg_GetKeySecurity(struct pipes_struct *p,
+                             struct winreg_GetKeySecurity *r)
 {
        struct registry_key *key = find_regkey_by_hnd(p, r->in.handle);
-       WERROR err;
-       struct security_descriptor *secdesc;
-       uint8 *data;
-       size_t len;
+       WERROR err = WERR_OK;
+       struct security_descriptor *secdesc = NULL;
+       uint8 *data = NULL;
+       size_t len = 0;
 
        if ( !key )
                return WERR_BADFID;
-               
+
        /* access checks first */
-       
-       if ( !(key->key->access_granted & STD_RIGHT_READ_CONTROL_ACCESS) )
+
+       if ( !(key->key->access_granted & SEC_STD_READ_CONTROL) )
                return WERR_ACCESS_DENIED;
 
-       err = regkey_get_secdesc(p->mem_ctx, key->key, &secdesc);
+       err = reg_getkeysecurity(p->mem_ctx, key, &secdesc);
        if (!W_ERROR_IS_OK(err)) {
                return err;
        }
@@ -1089,25 +891,27 @@ WERROR _winreg_GetKeySecurity(pipes_struct *p, struct winreg_GetKeySecurity *r)
        r->out.sd->size = len;
        r->out.sd->len = len;
        r->out.sd->data = data;
-               
+
        return WERR_OK;
 }
 
 /*******************************************************************
+ _winreg_SetKeySecurity
  ********************************************************************/
 
-WERROR _winreg_SetKeySecurity(pipes_struct *p, struct winreg_SetKeySecurity *r)
+WERROR _winreg_SetKeySecurity(struct pipes_struct *p,
+                             struct winreg_SetKeySecurity *r)
 {
        struct registry_key *key = find_regkey_by_hnd(p, r->in.handle);
-       struct security_descriptor *secdesc;
-       WERROR err;
+       struct security_descriptor *secdesc = NULL;
+       WERROR err = WERR_OK;
 
        if ( !key )
                return WERR_BADFID;
-               
+
        /* access checks first */
-       
-       if ( !(key->key->access_granted & STD_RIGHT_WRITE_DAC_ACCESS) )
+
+       if ( !(key->key->access_granted & SEC_STD_WRITE_DAC) )
                return WERR_ACCESS_DENIED;
 
        err = ntstatus_to_werror(unmarshall_sec_desc(p->mem_ctx, r->in.sd->data,
@@ -1116,24 +920,28 @@ WERROR _winreg_SetKeySecurity(pipes_struct *p, struct winreg_SetKeySecurity *r)
                return err;
        }
 
-       return regkey_set_secdesc(key->key, secdesc);
+       return reg_setkeysecurity(key, secdesc);
 }
 
 /*******************************************************************
+ _winreg_FlushKey
  ********************************************************************/
 
-WERROR _winreg_FlushKey(pipes_struct *p, struct winreg_FlushKey *r)
+WERROR _winreg_FlushKey(struct pipes_struct *p,
+                       struct winreg_FlushKey *r)
 {
-       /* I'm just replying OK because there's not a lot 
+       /* I'm just replying OK because there's not a lot
           here I see to do i  --jerry */
-       
+
        return WERR_OK;
 }
 
 /*******************************************************************
+ _winreg_UnLoadKey
  ********************************************************************/
 
-WERROR _winreg_UnLoadKey(pipes_struct *p, struct winreg_UnLoadKey *r)
+WERROR _winreg_UnLoadKey(struct pipes_struct *p,
+                        struct winreg_UnLoadKey *r)
 {
        /* fill in your code here if you think this call should
           do anything */
@@ -1143,9 +951,11 @@ WERROR _winreg_UnLoadKey(pipes_struct *p, struct winreg_UnLoadKey *r)
 }
 
 /*******************************************************************
+ _winreg_ReplaceKey
  ********************************************************************/
 
-WERROR _winreg_ReplaceKey(pipes_struct *p, struct winreg_ReplaceKey *r)
+WERROR _winreg_ReplaceKey(struct pipes_struct *p,
+                         struct winreg_ReplaceKey *r)
 {
        /* fill in your code here if you think this call should
           do anything */
@@ -1155,9 +965,11 @@ WERROR _winreg_ReplaceKey(pipes_struct *p, struct winreg_ReplaceKey *r)
 }
 
 /*******************************************************************
+ _winreg_LoadKey
  ********************************************************************/
 
-WERROR _winreg_LoadKey(pipes_struct *p, struct winreg_LoadKey *r)
+WERROR _winreg_LoadKey(struct pipes_struct *p,
+                      struct winreg_LoadKey *r)
 {
        /* fill in your code here if you think this call should
           do anything */
@@ -1167,33 +979,160 @@ WERROR _winreg_LoadKey(pipes_struct *p, struct winreg_LoadKey *r)
 }
 
 /*******************************************************************
+ _winreg_NotifyChangeKeyValue
  ********************************************************************/
 
-WERROR _winreg_NotifyChangeKeyValue(pipes_struct *p, struct winreg_NotifyChangeKeyValue *r)
+WERROR _winreg_NotifyChangeKeyValue(struct pipes_struct *p,
+                                   struct winreg_NotifyChangeKeyValue *r)
 {
-       /* fill in your code here if you think this call should
-          do anything */
-
-       p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
 
 /*******************************************************************
+ _winreg_QueryMultipleValues
  ********************************************************************/
 
-WERROR _winreg_QueryMultipleValues(pipes_struct *p, struct winreg_QueryMultipleValues *r)
+WERROR _winreg_QueryMultipleValues(struct pipes_struct *p,
+                                  struct winreg_QueryMultipleValues *r)
 {
-       /* fill in your code here if you think this call should
-          do anything */
+       struct winreg_QueryMultipleValues2 r2;
+       uint32_t needed = 0;
+
+       r2.in.key_handle        = r->in.key_handle;
+       r2.in.values_in         = r->in.values_in;
+       r2.in.num_values        = r->in.num_values;
+       r2.in.offered           = r->in.buffer_size;
+       r2.in.buffer            = r->in.buffer;
+       r2.out.values_out       = r->out.values_out;
+       r2.out.needed           = &needed;
+       r2.out.buffer           = r->out.buffer;
+
+       return _winreg_QueryMultipleValues2(p, &r2);
+}
 
-       p->rng_fault_state = True;
-       return WERR_NOT_SUPPORTED;
+/*******************************************************************
+ ********************************************************************/
+
+static WERROR construct_multiple_entry(TALLOC_CTX *mem_ctx,
+                                      const char *valuename,
+                                      uint32_t value_length,
+                                      uint32_t offset,
+                                      enum winreg_Type type,
+                                      struct QueryMultipleValue *r)
+{
+       r->ve_valuename = talloc_zero(mem_ctx, struct winreg_ValNameBuf);
+       if (r->ve_valuename == NULL) {
+               return WERR_NOMEM;
+       }
+
+       r->ve_valuename->name = talloc_strdup(r->ve_valuename, valuename ? valuename : "");
+       if (r->ve_valuename->name == NULL) {
+               return WERR_NOMEM;
+       }
+
+       r->ve_valuename->size = strlen_m_term(r->ve_valuename->name)*2;
+       r->ve_valuelen = value_length;
+       r->ve_valueptr = offset;
+       r->ve_type = type;
+
+       return WERR_OK;
 }
 
 /*******************************************************************
+ _winreg_QueryMultipleValues2
  ********************************************************************/
 
-WERROR _winreg_QueryMultipleValues2(pipes_struct *p, struct winreg_QueryMultipleValues2 *r)
+WERROR _winreg_QueryMultipleValues2(struct pipes_struct *p,
+                                   struct winreg_QueryMultipleValues2 *r)
+{
+       struct registry_key *regkey = find_regkey_by_hnd(p, r->in.key_handle);
+       struct registry_value *vals = NULL;
+       const char **names = NULL;
+       uint32_t offset = 0, num_vals = 0;
+       DATA_BLOB result = data_blob_null;
+       int i = 0;
+       WERROR err = WERR_OK;
+
+       if (!regkey) {
+               return WERR_BADFID;
+       }
+
+       names = talloc_zero_array(p->mem_ctx, const char *, r->in.num_values);
+       if (names == NULL) {
+               return WERR_NOMEM;
+       }
+
+       for (i=0; i < r->in.num_values; i++) {
+               if (r->in.values_in[i].ve_valuename &&
+                   r->in.values_in[i].ve_valuename->name) {
+                       names[i] = talloc_strdup(names,
+                               r->in.values_in[i].ve_valuename->name);
+                       if (names[i] == NULL) {
+                               return WERR_NOMEM;
+                       }
+               }
+       }
+
+       err = reg_querymultiplevalues(p->mem_ctx, regkey,
+                                     r->in.num_values, names,
+                                     &num_vals, &vals);
+       if (!W_ERROR_IS_OK(err)) {
+               return err;
+       }
+
+       result = data_blob_talloc(p->mem_ctx, NULL, 0);
+
+       for (i=0; i < r->in.num_values; i++) {
+               const char *valuename = NULL;
+
+               if (vals[i].data.length > 0) {
+                       if (!data_blob_append(p->mem_ctx, &result,
+                                             vals[i].data.data,
+                                             vals[i].data.length)) {
+                               return WERR_NOMEM;
+                       }
+               }
+
+               if (r->in.values_in[i].ve_valuename &&
+                   r->in.values_in[i].ve_valuename->name) {
+                       valuename = r->in.values_in[i].ve_valuename->name;
+               }
+
+               err = construct_multiple_entry(r->out.values_out,
+                                              valuename,
+                                              vals[i].data.length,
+                                              offset,
+                                              vals[i].type,
+                                              &r->out.values_out[i]);
+               if (!W_ERROR_IS_OK(err)) {
+                       return err;
+               }
+
+               offset += vals[i].data.length;
+       }
+
+       *r->out.needed = result.length;
+
+       if (r->in.num_values != num_vals) {
+               return WERR_BADFILE;
+       }
+
+       if (*r->in.offered >= *r->out.needed) {
+               if (r->out.buffer) {
+                       memcpy(r->out.buffer, result.data, MIN(result.length, *r->in.offered));
+               }
+               return WERR_OK;
+       } else {
+               return WERR_MORE_DATA;
+       }
+}
+
+/*******************************************************************
+ _winreg_DeleteKeyEx
+ ********************************************************************/
+
+WERROR _winreg_DeleteKeyEx(struct pipes_struct *p,
+                          struct winreg_DeleteKeyEx *r)
 {
        /* fill in your code here if you think this call should
           do anything */
@@ -1201,4 +1140,3 @@ WERROR _winreg_QueryMultipleValues2(pipes_struct *p, struct winreg_QueryMultiple
        p->rng_fault_state = True;
        return WERR_NOT_SUPPORTED;
 }
-