r8027: driver information is now back via winreg

diff --git a/source/registry/reg_printing.c b/source/registry/reg_printing.c
index 8a0557125c3af2840a55076fc47d5084f7a22912..262affb4f56d57ded29cb3638f57eb24ce116167 100644 (file)
--- a/source/registry/reg_printing.c
+++ b/source/registry/reg_printing.c
@@ -591,7 +591,7 @@ static int key_driver_fetch_values( const char *key, REGVAL_CTR *values )
        int             env_subkey_type = 0;
        
        
-       DEBUG(8,("print_subpath_values_environments: Enter key => [%s]\n", key ? key : "NULL"));
+       DEBUG(8,("key_driver_fetch_values: Enter key => [%s]\n", key ? key : "NULL"));
 
        keystr = remaining_path( key + strlen(KEY_ENVIRONMENTS) );      
        
@@ -633,6 +633,11 @@ static int key_driver_fetch_values( const char *key, REGVAL_CTR *values )
                
        keystr = subkeypath;
        reg_split_path( keystr, &base, &subkeypath );
+
+       /* no values under Version-XX */
+
+       if ( !subkeypath )
+               return 0;
                
        version = atoi(&base[strlen(base)-1]);
 
@@ -716,7 +721,7 @@ static int key_driver_fetch_values( const char *key, REGVAL_CTR *values )
        
        SAFE_FREE( buffer );
                
-       DEBUG(8,("print_subpath_values_environments: Exit\n"));
+       DEBUG(8,("key_driver_fetch_values: Exit\n"));
        
        return regval_ctr_numvals( values );
 }

diff --git a/source/rpc_server/srv_reg_nt.c b/source/rpc_server/srv_reg_nt.c
index 7170c0a30110a80be3311b77e884b1a1bbc7e70e..db199634c502eee88b54e42aa2a691718be8262a 100644 (file)
--- a/source/rpc_server/srv_reg_nt.c
+++ b/source/rpc_server/srv_reg_nt.c
@@ -490,11 +490,15 @@ WERROR _reg_query_key(pipes_struct *p, REG_Q_QUERY_KEY *q_u, REG_R_QUERY_KEY *r_
        if ( !regkey )
                return WERR_BADFID; 
        
-       if ( !get_subkey_information( regkey, &r_u->num_subkeys, &r_u->max_subkeylen ) )
+       if ( !get_subkey_information( regkey, &r_u->num_subkeys, &r_u->max_subkeylen ) ) {
+               DEBUG(0,("_reg_query_key: get_subkey_information() failed!\n"));
                return WERR_ACCESS_DENIED;
+       }
                
-       if ( !get_value_information( regkey, &r_u->num_values, &r_u->max_valnamelen, &r_u->max_valbufsize ) )
+       if ( !get_value_information( regkey, &r_u->num_values, &r_u->max_valnamelen, &r_u->max_valbufsize ) ) {
+               DEBUG(0,("_reg_query_key: get_value_information() failed!\n"));
                return WERR_ACCESS_DENIED;      
+       }
 
                
        r_u->sec_desc = 0x00000078;     /* size for key's sec_desc */