sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

r8027: driver information is now back via winreg

Browse Source 
(This used to be commit f0a1c6b9ce)
This commit is contained in:
Gerald Carter 2005-06-30 20:16:16 +00:00 committed by Gerald (Jerry) Carter
parent 8cea99d3ac
commit c5a51f0273
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source3/registry/reg_printing.c
View File

@ -591,7 +591,7 @@ static int key_driver_fetch_values( const char *key, REGVAL_CTR *values )
int env_subkey_type = 0; 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) ); 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; keystr = subkeypath;
reg_split_path( keystr, &base, &subkeypath ); reg_split_path( keystr, &base, &subkeypath );
/* no values under Version-XX */
if ( !subkeypath )
return 0;
version = atoi(&base[strlen(base)-1]); 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 ); SAFE_FREE( buffer );
DEBUG(8,("print_subpath_values_environments: Exit\n")); DEBUG(8,("key_driver_fetch_values: Exit\n"));
return regval_ctr_numvals( values ); return regval_ctr_numvals( values );
} }

8
source3/rpc_server/srv_reg_nt.c
View File

@ -490,11 +490,15 @@ WERROR _reg_query_key(pipes_struct *p, REG_Q_QUERY_KEY *q_u, REG_R_QUERY_KEY *r_
if ( !regkey ) if ( !regkey )
return WERR_BADFID; 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; 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; return WERR_ACCESS_DENIED;
}
r_u->sec_desc = 0x00000078; /* size for key's sec_desc */ r_u->sec_desc = 0x00000078; /* size for key's sec_desc */