Add a reg_getversion() function to reg_api and use it in srv_winreg_nt.c.

Michael
(This used to be commit 903223b160eef6ba6ff19a8bfef19e5fe7008631)

diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index a4c88e2e888e6b7d07d50068c91ac4ecde38f076..18435ff0333006ad2b5465bb964d33fb55b02843 100644 (file)
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -50,7 +50,7 @@
  * 0x17                winreg_UnLoadKey
  * 0x18                winreg_InitiateSystemShutdown
  * 0x19                winreg_AbortSystemShutdown
- * 0x1a                winreg_GetVersion
+ * 0x1a                winreg_GetVersion                       reg_getversion
  * 0x1b                winreg_OpenHKCC
  * 0x1c                winreg_OpenHKDD
  * 0x1d                winreg_QueryMultipleValues
@@ -692,6 +692,16 @@ WERROR reg_setkeysecurity(struct registry_key *key,
        return regkey_set_secdesc(key->key, psecdesc);
 }
 
+WERROR reg_getversion(uint32_t *version)
+{
+       if (version == NULL) {
+               return WERR_INVALID_PARAM;
+       }
+
+       *version = 0x00000005; /* Windows 2000 registry API version */
+       return WERR_OK;
+}
+
 /**********************************************************************
  * Higher level utility functions
  **********************************************************************/

diff --git a/source3/rpc_server/srv_winreg_nt.c b/source3/rpc_server/srv_winreg_nt.c
index 939bf723d2a378f6d08c84cd5f1e9903be1d534a..92c178042f0e46eceaf1afbbb5b34b0271d7844a 100644 (file)
--- a/source3/rpc_server/srv_winreg_nt.c
+++ b/source3/rpc_server/srv_winreg_nt.c
@@ -370,9 +370,7 @@ WERROR _winreg_GetVersion(pipes_struct *p, struct winreg_GetVersion *r)
        if ( !regkey )
                return WERR_BADFID;
        
-       *r->out.version = 0x00000005;   /* Windows 2000 registry API version */
-       
-       return WERR_OK;
+       return reg_getversion(r->out.version);
 }