s3: fix s3 winreg server after idl changes.
[kai/samba.git] / source3 / rpc_server / srv_winreg_nt.c
index cac06888e4d08d74b05cd65a00b3fa13d82a56c8..7e842ed54d3a8c5bed32c855e55fe6b5e7d075df 100644 (file)
@@ -6,7 +6,7 @@
  *
  *  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,
  *  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"
 
 #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 };
-
-struct regkey_info {
-       REGISTRY_KEY *key;
-       REGVAL_CTR *value_cache;
-       REGSUBKEY_CTR *subkey_cache;
-};
-
 /******************************************************************
- free() function for struct regkey_info
+ free() function for struct registry_key
  *****************************************************************/
  
-static void free_regkey_info(void *ptr)
+static void free_regkey(void *ptr)
 {
-       struct regkey_info *info = (struct regkey_info *)ptr;
-       regkey_close_internal( info->key );
-       TALLOC_FREE(info);
+       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 regkey_info *find_regkey_info_by_hnd(pipes_struct *p,
-                                                  POLICY_HND *hnd)
+static struct registry_key *find_regkey_by_hnd(pipes_struct *p,
+                                              POLICY_HND *hnd)
 {
-       struct regkey_info *regkey = NULL;
+       struct registry_key *regkey = NULL;
 
        if(!find_policy_by_hnd(p,hnd,(void **)(void *)&regkey)) {
                DEBUG(2,("find_regkey_index_by_hnd: Registry Key not found: "));
@@ -64,35 +52,6 @@ static struct regkey_info *find_regkey_info_by_hnd(pipes_struct *p,
        return regkey;
 }
 
-static REGISTRY_KEY *find_regkey_by_hnd(pipes_struct *p, POLICY_HND *hnd)
-{
-       struct regkey_info *regkey = find_regkey_info_by_hnd(p, hnd);
-
-       if (regkey == NULL) {
-               return NULL;
-       }
-
-       return regkey->key;
-}
-
-static WERROR fill_value_cache(struct regkey_info *info)
-{
-       if (info->value_cache != NULL) {
-               return WERR_OK;
-       }
-
-       if (!(info->value_cache = TALLOC_ZERO_P(info, REGVAL_CTR))) {
-               return WERR_NOMEM;
-       }
-
-       if (fetch_reg_values(info->key, info->value_cache) == -1) {
-               TALLOC_FREE(info->value_cache);
-               return WERR_BADFILE;
-       }
-
-       return WERR_OK;
-}
-
 /*******************************************************************
  Function for open a new registry handle and creating a handle 
  Note that P should be valid & hnd should already have space
@@ -102,58 +61,31 @@ static WERROR fill_value_cache(struct regkey_info *info)
  *******************************************************************/
  
 static WERROR open_registry_key( pipes_struct *p, POLICY_HND *hnd, 
-                                 struct regkey_info **pinfo,
-                                REGISTRY_KEY *parent,
+                                struct registry_key *parent,
                                 const char *subkeyname,
                                 uint32 access_desired  )
 {
-       char           *keypath;
-       int             path_len;
-       WERROR          result = WERR_OK;
-       struct regkey_info *info;
-
-       /* create a full registry path and strip any trailing '\' 
-          characters */
-
-       if (asprintf(&keypath, "%s%s%s", 
-                    parent ? parent->name : "",
-                    parent ? "\\" : "", 
-                    subkeyname) == -1) {
-               return WERR_NOMEM;
-       }
-
-       path_len = strlen( keypath );
-       if ( path_len && keypath[path_len-1] == '\\' )
-               keypath[path_len-1] = '\0';
+       WERROR result = WERR_OK;
+       struct registry_key *key;
 
-       if (!(info = TALLOC_ZERO_P(NULL, struct regkey_info))) {
-               SAFE_FREE(keypath);
-               return WERR_NOMEM;
+       if (parent == NULL) {
+               result = reg_openhive(NULL, subkeyname, access_desired,
+                                     p->pipe_user.nt_user_token, &key);
+       }
+       else {
+               result = reg_openkey(NULL, parent, subkeyname, access_desired,
+                                    &key);
        }
-       
-       /* now do the internal open */
-               
-       result = regkey_open_internal( &info->key, keypath,
-                                      p->pipe_user.nt_user_token,
-                                      access_desired );
-       SAFE_FREE(keypath);
 
        if ( !W_ERROR_IS_OK(result) ) {
-               TALLOC_FREE(info);
                return result;
        }
        
-       if ( !create_policy_hnd( p, hnd, free_regkey_info, info ) ) {
-               regkey_close_internal( info->key );
-               TALLOC_FREE(info);
+       if ( !create_policy_hnd( p, hnd, free_regkey, key ) ) {
                return WERR_BADFILE; 
        }
-
-       if (pinfo) {
-               *pinfo = info;
-       }
        
-       return WERR_OK;;
+       return WERR_OK;
 }
 
 /*******************************************************************
@@ -161,12 +93,13 @@ static WERROR open_registry_key( pipes_struct *p, POLICY_HND *hnd,
  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(pipes_struct *p, POLICY_HND *hnd)
 {
-       REGISTRY_KEY *regkey = find_regkey_by_hnd(p, 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)));
+               DEBUG(2,("close_registry_key: Invalid handle (%s:%u:%u)\n",
+                        OUR_HANDLE(hnd)));
                return False;
        }
        
@@ -175,337 +108,216 @@ static BOOL close_registry_key(pipes_struct *p, POLICY_HND *hnd)
        return True;
 }
 
-/********************************************************************
- retrieve information about the subkeys
- *******************************************************************/
-static BOOL get_subkey_information( REGISTRY_KEY *key, uint32 *maxnum, uint32 *maxlen )
-{
-       int             num_subkeys, i;
-       uint32          max_len;
-       REGSUBKEY_CTR   *subkeys;
-       uint32          len;
-       
-       if ( !key )
-               return False;
-
-       if ( !(subkeys = TALLOC_ZERO_P( NULL, REGSUBKEY_CTR )) )
-               return False;
-
-       if ( fetch_reg_keys( key, subkeys ) == -1 )
-               return False;
-
-       /* find the longest string */
-       
-       max_len = 0;
-       num_subkeys = regsubkey_ctr_numkeys( subkeys );
-       
-       for ( i=0; i<num_subkeys; i++ ) {
-               len = strlen( regsubkey_ctr_specific_key(subkeys, i) );
-               max_len = MAX(max_len, len);
-       }
-
-       *maxnum = num_subkeys;
-       *maxlen = max_len*2;
-       
-       TALLOC_FREE( subkeys );
-       
-       return True;
-}
-
-/********************************************************************
- retrieve information about the values.  
- *******************************************************************/
-static BOOL get_value_information( REGISTRY_KEY *key, uint32 *maxnum, 
-                                    uint32 *maxlen, uint32 *maxsize )
-{
-       REGVAL_CTR      *values;
-       uint32          sizemax, lenmax;
-       int             i, num_values;
-       
-       if ( !key )
-               return False;
-
-       if ( !(values = TALLOC_ZERO_P( NULL, REGVAL_CTR )) )
-               return False;
-       
-       if ( fetch_reg_values( key, values ) == -1 )
-               return False;
-       
-       lenmax = sizemax = 0;
-       num_values = regval_ctr_numvals( values );
-
-       for ( i=0; i<num_values; i++ ) {
-               REGISTRY_VALUE *val;
-
-               if (!(val = regval_ctr_specific_value( values, i ))) {
-                       break;
-               }
-
-               lenmax  = MAX(lenmax, val->valuename ?
-                             strlen(val->valuename)+1 : 0 );
-               sizemax = MAX(sizemax, val->size );
-       }
-
-       *maxnum   = num_values;
-       *maxlen   = lenmax*2;
-       *maxsize  = sizemax;
-       
-       TALLOC_FREE( values );
-       
-       return True;
-}
-
-
 /********************************************************************
  reg_close
  ********************************************************************/
 
-WERROR _winreg_CloseKey(pipes_struct *p, struct policy_handle *handle)
+WERROR _winreg_CloseKey(pipes_struct *p, struct winreg_CloseKey *r)
 {
        /* close the policy handle */
 
-       if (!close_registry_key(p, handle))
+       if (!close_registry_key(p, r->in.handle))
                return WERR_BADFID; 
 
+       ZERO_STRUCTP(r->out.handle);
+
        return WERR_OK;
 }
 
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_OpenHKLM(pipes_struct *p, uint16_t *system_name, uint32_t access_mask, struct policy_handle *handle)
+WERROR _winreg_OpenHKLM(pipes_struct *p, struct winreg_OpenHKLM *r)
 {
-       return open_registry_key(p, handle, NULL, NULL, KEY_HKLM, access_mask);
+       return open_registry_key(p, r->out.handle, NULL, KEY_HKLM, r->in.access_mask);
 }
 
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_OpenHKPD(pipes_struct *p, uint16_t *system_name,
-                       uint32_t access_mask, struct policy_handle *handle)
+WERROR _winreg_OpenHKPD(pipes_struct *p, struct winreg_OpenHKPD *r)
 {
-       return open_registry_key(p, handle, NULL, NULL, KEY_HKPD, access_mask);
+       return open_registry_key(p, r->out.handle, NULL, KEY_HKPD, r->in.access_mask);
 }
 
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_OpenHKPT(pipes_struct *p, uint16_t *system_name,
-                       uint32_t access_mask, struct policy_handle *handle)
+WERROR _winreg_OpenHKPT(pipes_struct *p, struct winreg_OpenHKPT *r)
 {
-       return open_registry_key(p, handle, NULL, NULL, KEY_HKPT, access_mask);
+       return open_registry_key(p, r->out.handle, NULL, KEY_HKPT, r->in.access_mask);
 }
 
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_OpenHKCR(pipes_struct *p, uint16_t *system_name,
-                       uint32_t access_mask, struct policy_handle *handle)
+WERROR _winreg_OpenHKCR(pipes_struct *p, struct winreg_OpenHKCR *r)
 {
-       return open_registry_key(p, handle, NULL, NULL, KEY_HKCR, access_mask);
+       return open_registry_key(p, r->out.handle, NULL, KEY_HKCR, r->in.access_mask);
 }
 
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_OpenHKU(pipes_struct *p, uint16_t *system_name,
-                      uint32_t access_mask, struct policy_handle *handle)
+WERROR _winreg_OpenHKU(pipes_struct *p, struct winreg_OpenHKU *r)
 {
-       return open_registry_key(p, handle, NULL, NULL, KEY_HKU, access_mask);
+       return open_registry_key(p, r->out.handle, NULL, KEY_HKU, r->in.access_mask);
 }
 
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_OpenHKCU(pipes_struct *p, uint16_t *system_name,
-                       uint32_t access_mask, struct policy_handle *handle)
+WERROR _winreg_OpenHKCU(pipes_struct *p, struct winreg_OpenHKCU *r)
 {
-       return open_registry_key(p, handle, NULL, NULL, KEY_HKCU, access_mask);
+       return open_registry_key(p, r->out.handle, NULL, KEY_HKCU, r->in.access_mask);
 }
 
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_OpenHKCC(pipes_struct *p, uint16_t *system_name,
-                       uint32_t access_mask, struct policy_handle *handle)
+WERROR _winreg_OpenHKCC(pipes_struct *p, struct winreg_OpenHKCC *r)
 {
-       return open_registry_key(p, handle, NULL, NULL, KEY_HKCC, access_mask);
+       return open_registry_key(p, r->out.handle, NULL, KEY_HKCC, r->in.access_mask);
 }
 
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_OpenHKDD(pipes_struct *p, uint16_t *system_name,
-                       uint32_t access_mask, struct policy_handle *handle)
+WERROR _winreg_OpenHKDD(pipes_struct *p, struct winreg_OpenHKDD *r)
 {
-       return open_registry_key(p, handle, NULL, NULL, KEY_HKDD, access_mask);
+       return open_registry_key(p, r->out.handle, NULL, KEY_HKDD, r->in.access_mask);
 }
 
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_OpenHKPN(pipes_struct *p, uint16_t *system_name,
-                       uint32_t access_mask, struct policy_handle *handle)
+WERROR _winreg_OpenHKPN(pipes_struct *p, struct winreg_OpenHKPN *r)
 {
-       return open_registry_key(p, handle, NULL, NULL, KEY_HKPN, access_mask);
+       return open_registry_key(p, r->out.handle, NULL, KEY_HKPN, r->in.access_mask);
 }
 
 /*******************************************************************
  reg_reply_open_entry
  ********************************************************************/
 
-WERROR _winreg_OpenKey(pipes_struct *p, struct policy_handle *parent_handle, struct winreg_String keyname, uint32_t unknown, uint32_t access_mask, struct policy_handle *handle)
+WERROR _winreg_OpenKey(pipes_struct *p, struct winreg_OpenKey *r)
 {
-       char *name;
-       REGISTRY_KEY *parent = find_regkey_by_hnd(p, parent_handle );
-       uint32 check_rights;
+       struct registry_key *parent = find_regkey_by_hnd(p, r->in.parent_handle );
 
        if ( !parent )
                return WERR_BADFID;
 
-       if ( (name = talloc_strdup( p->mem_ctx, keyname.name )) == NULL ) {
-               return WERR_INVALID_PARAM;
-       }
-       
-       /* check granted access first; what is the correct mask here? */
-
-       check_rights = ( SEC_RIGHTS_ENUM_SUBKEYS|
-                         SEC_RIGHTS_CREATE_SUBKEY|
-                        SEC_RIGHTS_QUERY_VALUE|
-                        SEC_RIGHTS_SET_VALUE);
-
-       if ( !(parent->access_granted & check_rights) ) {
-               DEBUG(8,("Rights check failed, parent had %04x, check_rights %04x\n",parent->access_granted, check_rights));
-               return WERR_ACCESS_DENIED;
-       }
-       
-       /* 
-        * very crazy, but regedit.exe on Win2k will attempt to call 
-        * REG_OPEN_ENTRY with a keyname of "".  We should return a new 
-        * (second) handle here on the key->name.  regedt32.exe does 
-        * not do this stupidity.   --jerry
-        */
-        
-       return open_registry_key( p, handle, NULL, parent, name, access_mask );
+       return open_registry_key(p, r->out.handle, parent, r->in.keyname.name, r->in.access_mask);
 }
 
 /*******************************************************************
  reg_reply_info
  ********************************************************************/
 
-WERROR _winreg_QueryValue(pipes_struct *p, struct policy_handle *handle,
-                         struct winreg_String value_name,
-                         enum winreg_Type *type, uint8_t *data,
-                         uint32_t *data_size, uint32_t *value_length)
+WERROR _winreg_QueryValue(pipes_struct *p, struct winreg_QueryValue *r)
 {
        WERROR        status = WERR_BADFILE;
-       struct regkey_info *info = find_regkey_info_by_hnd( p, handle );
-       REGISTRY_KEY *regkey;
+       struct registry_key *regkey = find_regkey_by_hnd( p, r->in.handle );
        prs_struct    prs_hkpd;
 
        uint8_t *outbuf;
        uint32_t outbuf_size;
 
-       BOOL free_buf = False;
-       BOOL free_prs = False;
+       DATA_BLOB val_blob;
+       bool free_buf = False;
+       bool free_prs = False;
 
-       if ( !info )
+       if ( !regkey )
                return WERR_BADFID;
 
-       regkey = info->key;
+       if ((r->out.data_length == NULL) || (r->out.type == NULL)) {
+               return WERR_INVALID_PARAM;
+       }
 
-       *value_length = *type = 0;
+       *r->out.data_length = *r->out.type = REG_NONE;
        
-       DEBUG(7,("_reg_info: policy key name = [%s]\n", regkey->name));
-       DEBUG(7,("_reg_info: policy key type = [%08x]\n", regkey->type));
+       DEBUG(7,("_reg_info: policy key name = [%s]\n", regkey->key->name));
+       DEBUG(7,("_reg_info: policy key type = [%08x]\n", regkey->key->type));
        
        /* Handle QueryValue calls on HKEY_PERFORMANCE_DATA */
-       if(regkey->type == REG_KEY_HKPD) 
+       if(regkey->key->type == REG_KEY_HKPD) 
        {
-               if(strequal(value_name.name, "Global")) {
-                       prs_init(&prs_hkpd, *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, *data_size, &outbuf_size, NULL);
+                               &prs_hkpd, *r->in.data_size, &outbuf_size, NULL);
                        outbuf = (uint8_t *)prs_hkpd.data_p;
                        free_prs = True;
                }
-               else if(strequal(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 **)&outbuf);
+                               (char **)(void *)&outbuf);
                        free_buf = True;
                }
-               else if(strequal(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 **)&outbuf);
+                               (char **)(void *)&outbuf);
                        free_buf = True;
                }
-               else if(isdigit(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, *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, *data_size, &outbuf_size,
-                               value_name.name);
+                               &prs_hkpd, *r->in.data_size, &outbuf_size,
+                               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",
-                                value_name.name));
+                                r->in.value_name->name));
                        return WERR_BADFILE;
                }
 
-               *type = REG_BINARY;
+               *r->out.type = REG_BINARY;
        }
        else {
-               REGISTRY_VALUE *val = NULL;
-               uint32 i;
-
-               status = fill_value_cache(info);
+               struct registry_value *val;
 
-               if (!(W_ERROR_IS_OK(status))) {
-                       return status;
-               }
-               
-               for (i=0; i<info->value_cache->num_values; i++) {
-                       if (strequal(info->value_cache->values[i]->valuename,
-                                    value_name.name)) {
-                               val = info->value_cache->values[i];
-                               break;
+               status = reg_queryvalue(p->mem_ctx, regkey, r->in.value_name->name,
+                                       &val);
+               if (!W_ERROR_IS_OK(status)) {
+                       if (r->out.data_size) {
+                               *r->out.data_size = 0;
                        }
+                       if (r->out.data_length) {
+                               *r->out.data_length = 0;
+                       }
+                       return status;
                }
 
-               if (val == NULL) {
-                       if (data_size) {
-                               *data_size = 0;
-                       }
-                       if (value_length) {
-                               *value_length = 0;
-                       }
-                       return WERR_BADFILE;
+               status = registry_push_value(p->mem_ctx, val, &val_blob);
+               if (!W_ERROR_IS_OK(status)) {
+                       return status;
                }
 
-               outbuf = val->data_p;
-               outbuf_size = val->size;
-               *type = val->type;
+               outbuf = val_blob.data;
+               outbuf_size = val_blob.length;
+               *r->out.type = val->type;
        }
 
-       *value_length = outbuf_size;
+       *r->out.data_length = outbuf_size;
 
-       if ( *data_size == 0 || !data ) {
+       if ( *r->in.data_size == 0 || !r->out.data ) {
                status = WERR_OK;
-       } else if ( *value_length > *data_size ) {
+       } else if ( *r->out.data_length > *r->in.data_size ) {
                status = WERR_MORE_DATA;
        } else {
-               memcpy( data, outbuf, *value_length );
+               memcpy( r->out.data, outbuf, *r->out.data_length );
                status = WERR_OK;
        }
 
-       *data_size = *value_length;
+       *r->out.data_size = *r->out.data_length;
 
        if (free_prs) prs_mem_free(&prs_hkpd);
        if (free_buf) SAFE_FREE(outbuf);
@@ -517,39 +329,35 @@ WERROR _winreg_QueryValue(pipes_struct *p, struct policy_handle *handle,
  Implementation of REG_QUERY_KEY
  ****************************************************************************/
 
-WERROR _winreg_QueryInfoKey(pipes_struct *p, struct policy_handle *handle, 
-                           struct winreg_String *classname, 
-                           uint32_t *num_subkeys, uint32_t *max_subkeylen, 
-                           uint32_t *max_subkeysize, 
-                           uint32_t *num_values, uint32_t *max_valnamelen, 
-                           uint32_t *max_valbufsize, 
-                           uint32_t *secdescsize, NTTIME *last_changed_time)
+WERROR _winreg_QueryInfoKey(pipes_struct *p, struct winreg_QueryInfoKey *r)
 {
        WERROR  status = WERR_OK;
-       REGISTRY_KEY    *regkey = find_regkey_by_hnd( p, handle );
+       struct registry_key *regkey = find_regkey_by_hnd( p, r->in.handle );
        
        if ( !regkey )
-               return WERR_BADFID; 
-       
-       if ( !get_subkey_information( regkey, num_subkeys, max_subkeylen) ) {
-               DEBUG(0,("_winreg_QueryInfoKey: get_subkey_information() failed!\n"));
-               return WERR_ACCESS_DENIED;
-       }
-               
-       if ( !get_value_information( regkey, num_values, max_valnamelen, max_valbufsize) ) {
-               DEBUG(0,("_winreg_QueryInfoKey: get_value_information() failed!\n"));
-               return WERR_ACCESS_DENIED;      
+               return WERR_BADFID;
+
+       r->out.classname->name = NULL;
+
+       status = reg_queryinfokey(regkey, r->out.num_subkeys, r->out.max_subkeylen,
+                                 r->out.max_classlen, r->out.num_values, r->out.max_valnamelen,
+                                 r->out.max_valbufsize, r->out.secdescsize,
+                                 r->out.last_changed_time);
+       if (!W_ERROR_IS_OK(status)) {
+               return status;
        }
 
-       *secdescsize = 0;       /* used to be hard coded for 0x00000078 */
-       *last_changed_time = 0;
-       *max_subkeysize = 0;    /* maybe this is the classname length ? */
+       /*
+        * These calculations account for the registry buffers being
+        * UTF-16. They are inexact at best, but so far they worked.
+        */
 
-       /* don't bother with class names for now */
-       
-       classname->name = NULL;
+       *r->out.max_subkeylen *= 2;
+
+       *r->out.max_valnamelen += 1;
+       *r->out.max_valnamelen *= 2;
        
-       return status;
+       return WERR_OK;
 }
 
 
@@ -557,16 +365,14 @@ WERROR _winreg_QueryInfoKey(pipes_struct *p, struct policy_handle *handle,
  Implementation of REG_GETVERSION
  ****************************************************************************/
  
-WERROR _winreg_GetVersion(pipes_struct *p, struct policy_handle *handle, uint32_t *version)
+WERROR _winreg_GetVersion(pipes_struct *p, struct winreg_GetVersion *r)
 {
-       REGISTRY_KEY    *regkey = find_regkey_by_hnd( p, handle );
+       struct registry_key *regkey = find_regkey_by_hnd( p, r->in.handle );
        
        if ( !regkey )
                return WERR_BADFID;
        
-       *version = 0x00000005;  /* Windows 2000 registry API version */
-       
-       return WERR_OK;
+       return reg_getversion(r->out.version);
 }
 
 
@@ -574,114 +380,84 @@ WERROR _winreg_GetVersion(pipes_struct *p, struct policy_handle *handle, uint32_
  Implementation of REG_ENUM_KEY
  ****************************************************************************/
  
-WERROR _winreg_EnumKey(pipes_struct *p, struct policy_handle *handle, uint32_t enum_index, struct winreg_StringBuf *name, struct winreg_StringBuf *keyclass, NTTIME *last_changed_time)
+WERROR _winreg_EnumKey(pipes_struct *p, struct winreg_EnumKey *r)
 {
-       WERROR  status = WERR_OK;
-       struct regkey_info *info = find_regkey_info_by_hnd( p, handle );
-       REGISTRY_KEY    *regkey;
+       WERROR err;
+       struct registry_key *key = find_regkey_by_hnd( p, r->in.handle );
        
-       if ( !info )
+       if ( !key )
                return WERR_BADFID; 
 
-       regkey = info->key;
-
-       if ( !name || !keyclass )
+       if ( !r->in.name || !r->in.keyclass )
                return WERR_INVALID_PARAM;
 
-       DEBUG(8,("_reg_enum_key: enumerating key [%s]\n", regkey->name));
-       
-       if (!info->subkey_cache) {
-               if (!(info->subkey_cache = TALLOC_ZERO_P(
-                             info, REGSUBKEY_CTR))) {
-                       return WERR_NOMEM;
-       }
-       
-               if (fetch_reg_keys(regkey, info->subkey_cache) == -1) {
-                       TALLOC_FREE(info->subkey_cache);
-                       return WERR_NO_MORE_ITEMS;
-               }
-       }
+       DEBUG(8,("_reg_enum_key: enumerating key [%s]\n", key->key->name));
 
-       if (enum_index >= info->subkey_cache->num_subkeys) {
-               return WERR_NO_MORE_ITEMS;
+       err = reg_enumkey(p->mem_ctx, key, r->in.enum_index, (char **)&r->out.name->name,
+                         r->out.last_changed_time);
+       if (!W_ERROR_IS_OK(err)) {
+               return err;
        }
-
-       DEBUG(10,("_reg_enum_key: retrieved subkey named [%s]\n",
-                 info->subkey_cache->subkeys[enum_index]));
-       
-       if (!(name->name = talloc_strdup(
-                     p->mem_ctx, info->subkey_cache->subkeys[enum_index]))) {
-               status = WERR_NOMEM;
-       }
-       if ( last_changed_time ) {
-               *last_changed_time = 0;
-       }
-       keyclass->name = "";
-
-       return status;
+       r->out.keyclass->name = "";
+       return WERR_OK;
 }
 
 /*****************************************************************************
  Implementation of REG_ENUM_VALUE
  ****************************************************************************/
 
-WERROR _winreg_EnumValue(pipes_struct *p, struct policy_handle *handle,
-                        uint32_t enum_index, struct winreg_ValNameBuf *name,
-                        enum winreg_Type *type, uint8_t *data,
-                        uint32_t *data_size, uint32_t *value_length)
+WERROR _winreg_EnumValue(pipes_struct *p, struct winreg_EnumValue *r)
 {
-       WERROR  status = WERR_OK;
-       struct regkey_info *info = find_regkey_info_by_hnd( p, handle );
-       REGISTRY_KEY    *regkey;
-       REGISTRY_VALUE  *val = NULL;
+       WERROR err;
+       struct registry_key *key = find_regkey_by_hnd( p, r->in.handle );
+       char *valname;
+       struct registry_value *val;
+       DATA_BLOB value_blob;
        
-       if ( !info )
+       if ( !key )
                return WERR_BADFID;
 
-       if ( !name )
+       if ( !r->in.name )
                return WERR_INVALID_PARAM;
 
-       regkey = info->key;
-               
        DEBUG(8,("_winreg_EnumValue: enumerating values for key [%s]\n",
-                regkey->name));
+                key->key->name));
 
-       status = fill_value_cache(info);
-       if (!W_ERROR_IS_OK(status)) {
-               return status;
+       err = reg_enumvalue(p->mem_ctx, key, r->in.enum_index, &valname, &val);
+       if (!W_ERROR_IS_OK(err)) {
+               return err;
        }
 
-       if (enum_index >= info->value_cache->num_values) {
-               return WERR_BADFILE;
+       err = registry_push_value(p->mem_ctx, val, &value_blob);
+       if (!W_ERROR_IS_OK(err)) {
+               return err;
        }
 
-       val = info->value_cache->values[enum_index];
-
-       if (!(name->name = talloc_strdup(p->mem_ctx, val->valuename))) {
-               return WERR_NOMEM;
+       if (r->out.name != NULL) {
+               r->out.name->name = valname;
        }
 
-       if (type != NULL) {
-               *type = val->type;
+       if (r->out.type != NULL) {
+               *r->out.type = val->type;
        }
 
-       if (data != NULL) {
-               if ((data_size == NULL) || (value_length == NULL)) {
+       if (r->out.value != NULL) {
+               if ((r->out.size == NULL) || (r->out.length == NULL)) {
                        return WERR_INVALID_PARAM;
                }
 
-               if (val->size > *data_size) {
+               if (value_blob.length > *r->out.size) {
                        return WERR_MORE_DATA;
                }
 
-               memcpy( data, val->data_p, val->size );
+               memcpy( r->out.value, value_blob.data, value_blob.length );
        }
 
-       if (value_length != NULL) {
-               *value_length = val->size;
+       if (r->out.length != NULL) {
+               *r->out.length = value_blob.length;
        }
-       if (data_size != NULL) {
-               *data_size = val->size;
+       if (r->out.size != NULL) {
+               *r->out.size = value_blob.length;
        }
 
        return WERR_OK;
@@ -691,15 +467,21 @@ WERROR _winreg_EnumValue(pipes_struct *p, struct policy_handle *handle,
  reg_shutdwon
  ********************************************************************/
 
-WERROR _winreg_InitiateSystemShutdown(pipes_struct *p, uint16_t *hostname, struct initshutdown_String *message, uint32_t timeout, uint8_t force_apps, uint8_t reboot)
+WERROR _winreg_InitiateSystemShutdown(pipes_struct *p, struct winreg_InitiateSystemShutdown *r)
 {
-       uint32_t reason = 0;
+       struct winreg_InitiateSystemShutdownEx s;
+
+       s.in.hostname = r->in.hostname;
+       s.in.message = r->in.message;
+       s.in.timeout = r->in.timeout;
+       s.in.force_apps = r->in.force_apps;
+       s.in.do_reboot = r->in.do_reboot;
+       s.in.reason = 0;
 
        /* thunk down to _winreg_InitiateSystemShutdownEx() 
           (just returns a status) */
        
-       return _winreg_InitiateSystemShutdownEx( p, hostname, message, timeout, 
-               force_apps, reboot, reason );
+       return _winreg_InitiateSystemShutdownEx( p, &s );
 }
 
 /*******************************************************************
@@ -710,105 +492,124 @@ WERROR _winreg_InitiateSystemShutdown(pipes_struct *p, uint16_t *hostname, struc
 #define SHUTDOWN_F_STRING "-f"
 
 
-WERROR _winreg_InitiateSystemShutdownEx(pipes_struct *p, uint16_t *hostname, struct initshutdown_String *message, uint32_t timeout, uint8_t force_apps, uint8_t reboot, uint32_t reason)
+WERROR _winreg_InitiateSystemShutdownEx(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 r;
+       fstring do_reboot;
        fstring f;
        int ret;
-       BOOL can_shutdown;
-       
+       bool can_shutdown;
 
-       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 ( message && message->name && message->name->name ) {
-               if ( (msg = talloc_strdup(p->mem_ctx, 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));
-       } 
-               
-       fstr_sprintf(str_timeout, "%d", timeout);
-       fstr_sprintf(r, reboot ? SHUTDOWN_R_STRING : "");
-       fstr_sprintf(f, force_apps ? SHUTDOWN_F_STRING : "");
-       fstr_sprintf(str_reason, "%d", reason );
+               chkmsg = TALLOC_ARRAY(p->mem_ctx, char, strlen(msg)+1);
+               if (!chkmsg) {
+                       return WERR_NOMEM;
+               }
+               alpha_strcpy(chkmsg, msg, NULL, strlen(msg)+1);
+       }
 
-       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", r, sizeof(shutdown_script) );
-       all_string_sub( shutdown_script, "%f", f, sizeof(shutdown_script) );
-       all_string_sub( shutdown_script, "%x", str_reason, sizeof(shutdown_script) );
+       fstr_sprintf(str_timeout, "%d", r->in.timeout);
+       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 );
+
+       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 = 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
  ********************************************************************/
 
-WERROR _winreg_AbortSystemShutdown(pipes_struct *p, uint16_t *server)
+WERROR _winreg_AbortSystemShutdown(pipes_struct *p, struct winreg_AbortSystemShutdown *r)
 {
-       pstring abort_shutdown_script;
+       const char *abort_shutdown_script;
        int ret;
-       BOOL can_shutdown;
+       bool can_shutdown;
 
-       pstrcpy(abort_shutdown_script, lp_abort_shutdown_script());
+       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 );
-               
+
        /********** 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",
                abort_shutdown_script, ret));
-               
 
        return (ret == 0) ? WERR_OK : WERR_ACCESS_DENIED;
 }
@@ -816,369 +617,113 @@ WERROR _winreg_AbortSystemShutdown(pipes_struct *p, uint16_t *server)
 /*******************************************************************
  ********************************************************************/
 
-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;
+       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;
-
-       /* 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) );
-       }
+               share_path = lp_pathname(snum);
 
-       /* 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 */
+               /* make sure we have a path (e.g. [homes] ) */
+               if (strlen(share_path) == 0) {
+                       continue;
+               }
 
-       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;
 }
 
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_RestoreKey(pipes_struct *p, struct policy_handle *handle, struct winreg_String *filename, uint32_t flags)
+WERROR _winreg_RestoreKey(pipes_struct *p, struct winreg_RestoreKey *r)
 {
-       REGISTRY_KEY    *regkey = find_regkey_by_hnd( p, handle );
-       pstring         fname;
+       struct registry_key *regkey = find_regkey_by_hnd( p, r->in.handle );
+       char *fname = NULL;
        int             snum;
-       
+
        if ( !regkey )
-               return WERR_BADFID; 
+               return WERR_BADFID;
 
-       if ( !filename || !filename->name )
+       if ( !r->in.filename || !r->in.filename->name )
                return WERR_INVALID_PARAM;
 
-       pstrcpy( fname, 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->name, fname));
+       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->name, fname, lp_servicename(snum) ));
-
-       return restore_registry_key( regkey, 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;
+       DEBUG(2,("_winreg_RestoreKey: Restoring [%s] from %s in share %s\n",
+                regkey->key->name, fname, lp_servicename(snum) ));
 
-       /* 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 */
-
-       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;
-       }
-
-       DEBUG(6,("reg_write_tree: wrote key [%s]\n", keypath ));
-
-done:
-       TALLOC_FREE( subkeys );
-       TALLOC_FREE( registry_key.name );
-
-       return result;
+       return reg_restorekey(regkey, fname);
 }
 
-/*******************************************************************
- ********************************************************************/
-
-static WERROR make_default_reg_sd( TALLOC_CTX *ctx, SEC_DESC **psd )
+WERROR _winreg_SaveKey(pipes_struct *p, struct winreg_SaveKey *r)
 {
-       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);
+       struct registry_key *regkey = find_regkey_by_hnd( p, r->in.handle );
+       char *fname = NULL;
+       int snum = -1;
 
-       /* 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;
-
-       return WERR_OK;
-}
+       if ( !regkey )
+               return WERR_BADFID;
 
-/*******************************************************************
- ********************************************************************/
+       if ( !r->in.filename || !r->in.filename->name )
+               return WERR_INVALID_PARAM;
 
-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;
+       fname = talloc_strdup(p->mem_ctx, r->in.filename->name);
+       if (!fname) {
+               return WERR_NOMEM;
        }
-               
-       /* 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 policy_handle *handle, struct winreg_String *filename, struct KeySecurityAttribute *sec_attrib)
-{
-       REGISTRY_KEY    *regkey = find_regkey_by_hnd( p, handle );
-       pstring         fname;
-       int             snum;
-       
-       if ( !regkey )
-               return WERR_BADFID; 
+       DEBUG(8,("_winreg_SaveKey: verifying backup of key [%s] to \"%s\"\n",
+                regkey->key->name, fname));
 
-       if ( !filename || !filename->name )
-               return WERR_INVALID_PARAM;
+       if ((snum = validate_reg_filename(p->mem_ctx, &fname)) == -1 )
+               return WERR_OBJECT_PATH_INVALID;
 
-       pstrcpy( fname, filename->name );
+       DEBUG(2,("_winreg_SaveKey: Saving [%s] to %s in share %s\n",
+                regkey->key->name, fname, lp_servicename(snum) ));
 
-       DEBUG(8,("_winreg_SaveKey: verifying backup of key [%s] to \"%s\"\n", regkey->name, fname));
-       
-       if ( (snum = validate_reg_filename( fname )) == -1 )
-               return WERR_OBJECT_PATH_INVALID;
-               
-       DEBUG(2,("_winreg_SaveKey: Saving [%s] to %s in share %s\n", regkey->name, fname, lp_servicename(snum) ));
-               
-       return backup_registry_key( regkey, fname );
+       return reg_savekey(regkey, fname);
 }
 
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_SaveKeyEx(pipes_struct *p)
+WERROR _winreg_SaveKeyEx(pipes_struct *p, struct winreg_SaveKeyEx *r)
 {
        /* fill in your code here if you think this call should
           do anything */
@@ -1190,345 +735,155 @@ WERROR _winreg_SaveKeyEx(pipes_struct *p)
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_CreateKey( pipes_struct *p, struct policy_handle *handle,
-                         struct winreg_String keyname, 
-                         struct winreg_String keyclass,
-                         uint32_t options, uint32_t access_mask, 
-                         struct winreg_SecBuf *secdesc,
-                         struct policy_handle *new_handle, 
-                         enum winreg_CreateAction *action_taken )
+WERROR _winreg_CreateKey( pipes_struct *p, struct winreg_CreateKey *r)
 {
-       struct regkey_info *parent = find_regkey_info_by_hnd(p, handle);
-       struct regkey_info *newparentinfo, *keyinfo;
-       POLICY_HND newparent_handle;
-       REGSUBKEY_CTR *subkeys;
-       BOOL write_result;
-       char *name;
+       struct registry_key *parent = find_regkey_by_hnd(p, r->in.handle);
+       struct registry_key *new_key;
        WERROR result;
 
        if ( !parent )
                return WERR_BADFID;
 
-       if ( (name = talloc_strdup( p->mem_ctx, keyname.name )) == NULL ) {
-               return WERR_NOMEM;
-       }
-       
-       /* ok.  Here's what we do.  */
+       DEBUG(10, ("_winreg_CreateKey called with parent key '%s' and "
+                  "subkey name '%s'\n", parent->key->name, r->in.name.name));
 
-       if ( strrchr( name, '\\' ) ) {
-               pstring newkeyname;
-               char *ptr;
-               
-               /* (1) check for enumerate rights on the parent handle.
-                      Clients can try create things like 'SOFTWARE\Samba' on
-                      the HKLM handle.  (2) open the path to the child parent
-                      key if necessary */
-       
-               if ( !(parent->key->access_granted & SEC_RIGHTS_ENUM_SUBKEYS) )
-                       return WERR_ACCESS_DENIED;
-               
-               pstrcpy( newkeyname, name );
-               ptr = strrchr( newkeyname, '\\' );
-               *ptr = '\0';
-
-               result = open_registry_key( p, &newparent_handle,
-                                           &newparentinfo, 
-                                           parent->key, newkeyname,
-                                           (REG_KEY_READ|REG_KEY_WRITE) );
-                       
-               if ( !W_ERROR_IS_OK(result) )
-                       return result;
-
-               /* copy the new key name (just the lower most keyname) */
-
-               if ( (name = talloc_strdup( p->mem_ctx, ptr+1 )) == NULL ) {
-                       return WERR_NOMEM;
-               }
-       }
-       else {
-               /* use the existing open key information */
-               newparentinfo = parent;
-               memcpy( &newparent_handle, handle, sizeof(POLICY_HND) );
-       }
-       
-       /* (3) check for create subkey rights on the correct parent */
-       
-       if ( !(newparentinfo->key->access_granted
-              & SEC_RIGHTS_CREATE_SUBKEY) ) {
-               result = WERR_ACCESS_DENIED;
-               goto done;
-       }       
-               
-       if ( !(subkeys = TALLOC_ZERO_P( p->mem_ctx, REGSUBKEY_CTR )) ) {
-               result = WERR_NOMEM;
-               goto done;
+       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;
        }
 
-       /* (4) lookup the current keys and add the new one */
-       
-       fetch_reg_keys( newparentinfo->key, subkeys );
-       regsubkey_ctr_addkey( subkeys, name );
-       
-       /* now write to the registry backend */
-       
-       write_result = store_reg_keys( newparentinfo->key, subkeys );
-       
-       TALLOC_FREE( subkeys );
-       TALLOC_FREE( newparentinfo->subkey_cache );
-
-       if ( !write_result )
-               return WERR_REG_IO_FAILURE;
-               
-       /* (5) open the new key and return the handle.  Note that it is probably 
-          not correct to grant full access on this open handle. */
-       
-       result = open_registry_key( p, new_handle, &keyinfo,
-                                   newparentinfo->key, name, REG_KEY_READ );
-       keyinfo->key->access_granted = REG_KEY_ALL;
-       
-       /* FIXME: report the truth here */
-       
-       if ( action_taken ) {
-               *action_taken = REG_CREATED_NEW_KEY;
+       if (!create_policy_hnd(p, r->out.new_handle, free_regkey, new_key)) {
+               TALLOC_FREE(new_key);
+               return WERR_BADFILE;
        }
 
-done:
-       /* close any intermediate key handles */
-       
-       if ( newparentinfo != parent )
-               close_registry_key( p, &newparent_handle );
-               
-       return result;
+       return WERR_OK;
 }
 
-
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_SetValue(pipes_struct *p, struct policy_handle *handle, struct winreg_String name, enum winreg_Type type, uint8_t *data, uint32_t size)
+WERROR _winreg_SetValue(pipes_struct *p, struct winreg_SetValue *r)
 {
-       struct regkey_info *info = find_regkey_info_by_hnd(p, handle);
-       REGISTRY_KEY *key;
-       REGVAL_CTR *values;
-       BOOL write_result;
+       struct registry_key *key = find_regkey_by_hnd(p, r->in.handle);
+       struct registry_value *val;
+       WERROR status;
 
-       if ( !info )
+       if ( !key )
                return WERR_BADFID;
 
-       key = info->key;
+       DEBUG(8,("_reg_set_value: Setting value for [%s:%s]\n", 
+                        key->key->name, r->in.name.name));
 
-       /* access checks first */
-       
-       if ( !(key->access_granted & SEC_RIGHTS_SET_VALUE) )
-               return WERR_ACCESS_DENIED;
-               
-       DEBUG(8,("_reg_set_value: Setting value for [%s:%s]\n", key->name,
-                name.name));
-               
-       if ( !(values = TALLOC_ZERO_P( p->mem_ctx, REGVAL_CTR )) )
-               return WERR_NOMEM; 
-       
-       /* lookup the current values and add the new one */
-       
-       fetch_reg_values( key, values );
-       
-       regval_ctr_addvalue( values, name.name, type,
-                            (const char *)data, size );
-       
-       /* now write to the registry backend */
-       
-       write_result = store_reg_values( key, values );
-       
-       TALLOC_FREE( values );
-       
-       if ( !write_result )
-               return WERR_REG_IO_FAILURE;
-
-       TALLOC_FREE(info->value_cache);
+       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;
+       }
 
-       return WERR_OK;
+       return reg_setvalue(key, r->in.name.name, val);
 }
 
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_DeleteKey(pipes_struct *p, struct policy_handle *handle, struct winreg_String key)
+WERROR _winreg_DeleteKey(pipes_struct *p, struct winreg_DeleteKey *r)
 {
-       struct regkey_info *parent = find_regkey_info_by_hnd(p, handle);
-       struct regkey_info *newparentinfo = NULL;
-       POLICY_HND newparent_handle;
-       REGSUBKEY_CTR *subkeys;
-       BOOL write_result;
-       char *name;
-       WERROR result;
+       struct registry_key *parent = find_regkey_by_hnd(p, r->in.handle);
 
        if ( !parent )
                return WERR_BADFID;
 
-       /* MSDN says parent the handle must have been opened with DELETE access */
-
-       /* (1) check for delete rights on the parent */
-       
-       if ( !(parent->key->access_granted & STD_RIGHT_DELETE_ACCESS) ) {
-               result = WERR_ACCESS_DENIED;
-               goto done;
-       }
-               
-       if ( (name = talloc_strdup( p->mem_ctx, key.name )) == NULL ) {
-               result = WERR_INVALID_PARAM;
-               goto done;
-       }
-               
-       /* ok.  Here's what we do.  */
-
-       if ( strrchr( name, '\\' ) ) {
-               pstring newkeyname;
-               char *ptr;
-               
-               /* (2) open the path to the child parent key if necessary */
-               /* split the registry path and save the subkeyname */
-       
-               pstrcpy( newkeyname, name );
-               ptr = strrchr( newkeyname, '\\' );
-               *ptr = '\0';
-               if ( (name = talloc_strdup( p->mem_ctx, ptr+1 )) == NULL ) {
-                       result = WERR_NOMEM;
-                       goto done;
-               }
-
-               result = open_registry_key( p, &newparent_handle,
-                                           &newparentinfo, parent->key,
-                                           newkeyname,
-                                           (REG_KEY_READ|REG_KEY_WRITE) );
-               if ( !W_ERROR_IS_OK(result) ) {
-                       goto done;
-               }
-       }
-       else {
-               /* use the existing open key information */
-               newparentinfo = parent;
-       }
-       
-       if ( !(subkeys = TALLOC_ZERO_P( p->mem_ctx, REGSUBKEY_CTR )) ) {
-               result = WERR_NOMEM;
-               goto done;
-       }
-       
-       /* lookup the current keys and delete the new one */
-       
-       fetch_reg_keys( newparentinfo->key, subkeys );
-       
-       regsubkey_ctr_delkey( subkeys, name );
-       
-       /* now write to the registry backend */
-       
-       write_result = store_reg_keys( newparentinfo->key, subkeys );
-       
-       TALLOC_FREE( subkeys );
-       TALLOC_FREE( newparentinfo->subkey_cache );
-
-       result = write_result ? WERR_OK : WERR_REG_IO_FAILURE;
-       
-done:
-       /* close any intermediate key handles */
-       
-       if ( newparentinfo != parent )
-               close_registry_key( p, &newparent_handle );
-
-       return result;
+       return reg_deletekey(parent, r->in.key.name);
 }
 
 
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_DeleteValue(pipes_struct *p, struct policy_handle *handle, struct winreg_String value)
+WERROR _winreg_DeleteValue(pipes_struct *p, struct winreg_DeleteValue *r)
 {
-       struct regkey_info *info = find_regkey_info_by_hnd(p, handle);
-       REGISTRY_KEY *key;
-       REGVAL_CTR *values;
-       BOOL write_result;
-       char *valuename;
+       struct registry_key *key = find_regkey_by_hnd(p, r->in.handle);
        
-       if ( !info )
+       if ( !key )
                return WERR_BADFID;
 
-       key = info->key;
-               
-       /* access checks first */
-       
-       if ( !(key->access_granted & SEC_RIGHTS_SET_VALUE) )
-               return WERR_ACCESS_DENIED;
-
-       if ( (valuename = talloc_strdup( p->mem_ctx, value.name )) == NULL ) {
-               return WERR_INVALID_PARAM;
-       }
-
-       DEBUG(8,("_reg_delete_value: Setting value for [%s:%s]\n", key->name, valuename));
-
-       if ( !(values = TALLOC_ZERO_P( p->mem_ctx, REGVAL_CTR )) )
-               return WERR_NOMEM;
-       
-       /* lookup the current values and add the new one */
-       
-       fetch_reg_values( key, values );
-       
-       regval_ctr_delvalue( values, valuename );
-       
-       /* now write to the registry backend */
-       
-       write_result = store_reg_values( key, values );
-       
-       TALLOC_FREE( values );
-       
-       if ( !write_result )
-               return WERR_REG_IO_FAILURE;
-
-       TALLOC_FREE(info->value_cache);
-
-       return WERR_OK;
+       return reg_deletevalue(key, r->in.value.name);
 }
 
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_GetKeySecurity(pipes_struct *p, struct policy_handle *handle, uint32_t sec_info, struct KeySecurityData *sd)
+WERROR _winreg_GetKeySecurity(pipes_struct *p, struct winreg_GetKeySecurity *r)
 {
-       REGISTRY_KEY *key = find_regkey_by_hnd(p, handle);
+       struct registry_key *key = find_regkey_by_hnd(p, r->in.handle);
+       WERROR err;
+       struct security_descriptor *secdesc;
+       uint8 *data;
+       size_t len;
 
        if ( !key )
                return WERR_BADFID;
                
        /* access checks first */
        
-       if ( !(key->access_granted & STD_RIGHT_READ_CONTROL_ACCESS) )
+       if ( !(key->key->access_granted & STD_RIGHT_READ_CONTROL_ACCESS) )
                return WERR_ACCESS_DENIED;
+
+       err = reg_getkeysecurity(p->mem_ctx, key, &secdesc);
+       if (!W_ERROR_IS_OK(err)) {
+               return err;
+       }
+
+       err = ntstatus_to_werror(marshall_sec_desc(p->mem_ctx, secdesc,
+                                                  &data, &len));
+       if (!W_ERROR_IS_OK(err)) {
+               return err;
+       }
+
+       if (len > r->out.sd->size) {
+               r->out.sd->size = len;
+               return WERR_INSUFFICIENT_BUFFER;
+       }
+
+       r->out.sd->size = len;
+       r->out.sd->len = len;
+       r->out.sd->data = data;
                
-       return WERR_ACCESS_DENIED;
+       return WERR_OK;
 }
 
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_SetKeySecurity(pipes_struct *p, struct policy_handle *handle, uint32_t access_mask, struct KeySecurityData *sd)
+WERROR _winreg_SetKeySecurity(pipes_struct *p, struct winreg_SetKeySecurity *r)
 {
-       REGISTRY_KEY *key = find_regkey_by_hnd(p, handle);
+       struct registry_key *key = find_regkey_by_hnd(p, r->in.handle);
+       struct security_descriptor *secdesc;
+       WERROR err;
 
        if ( !key )
                return WERR_BADFID;
                
        /* access checks first */
        
-       if ( !(key->access_granted & STD_RIGHT_WRITE_DAC_ACCESS) )
+       if ( !(key->key->access_granted & STD_RIGHT_WRITE_DAC_ACCESS) )
                return WERR_ACCESS_DENIED;
-               
-       return WERR_ACCESS_DENIED;
+
+       err = ntstatus_to_werror(unmarshall_sec_desc(p->mem_ctx, r->in.sd->data,
+                                                    r->in.sd->len, &secdesc));
+       if (!W_ERROR_IS_OK(err)) {
+               return err;
+       }
+
+       return reg_setkeysecurity(key, secdesc);
 }
 
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_FlushKey(pipes_struct *p, struct policy_handle *handle)
+WERROR _winreg_FlushKey(pipes_struct *p, struct winreg_FlushKey *r)
 {
        /* I'm just replying OK because there's not a lot 
           here I see to do i  --jerry */
@@ -1539,7 +894,7 @@ WERROR _winreg_FlushKey(pipes_struct *p, struct policy_handle *handle)
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_UnLoadKey(pipes_struct *p)
+WERROR _winreg_UnLoadKey(pipes_struct *p, struct winreg_UnLoadKey *r)
 {
        /* fill in your code here if you think this call should
           do anything */
@@ -1551,7 +906,7 @@ WERROR _winreg_UnLoadKey(pipes_struct *p)
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_ReplaceKey(pipes_struct *p)
+WERROR _winreg_ReplaceKey(pipes_struct *p, struct winreg_ReplaceKey *r)
 {
        /* fill in your code here if you think this call should
           do anything */
@@ -1563,7 +918,7 @@ WERROR _winreg_ReplaceKey(pipes_struct *p)
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_LoadKey(pipes_struct *p, struct policy_handle *handle, struct winreg_String *keyname, struct winreg_String *filename)
+WERROR _winreg_LoadKey(pipes_struct *p, struct winreg_LoadKey *r)
 {
        /* fill in your code here if you think this call should
           do anything */
@@ -1575,7 +930,7 @@ WERROR _winreg_LoadKey(pipes_struct *p, struct policy_handle *handle, struct win
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_NotifyChangeKeyValue(pipes_struct *p, struct policy_handle *handle, uint8_t watch_subtree, uint32_t notify_filter, uint32_t unknown, struct winreg_String string1, struct winreg_String string2, uint32_t unknown2)
+WERROR _winreg_NotifyChangeKeyValue(pipes_struct *p, struct winreg_NotifyChangeKeyValue *r)
 {
        /* fill in your code here if you think this call should
           do anything */
@@ -1587,7 +942,7 @@ WERROR _winreg_NotifyChangeKeyValue(pipes_struct *p, struct policy_handle *handl
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_QueryMultipleValues(pipes_struct *p, struct policy_handle *key_handle, struct QueryMultipleValue *values, uint32_t num_values, uint8_t *buffer, uint32_t *buffer_size)
+WERROR _winreg_QueryMultipleValues(pipes_struct *p, struct winreg_QueryMultipleValues *r)
 {
        /* fill in your code here if you think this call should
           do anything */
@@ -1599,7 +954,7 @@ WERROR _winreg_QueryMultipleValues(pipes_struct *p, struct policy_handle *key_ha
 /*******************************************************************
  ********************************************************************/
 
-WERROR _winreg_QueryMultipleValues2(pipes_struct *p)
+WERROR _winreg_QueryMultipleValues2(pipes_struct *p, struct winreg_QueryMultipleValues2 *r)
 {
        /* fill in your code here if you think this call should
           do anything */