svn commit: samba r8027 - in branches/SAMBA_3_0/source: registry rpc_server

[jerry at samba.org]

Author: jerry
Date: 2005-06-30 20:16:16 +0000 (Thu, 30 Jun 2005)
New Revision: 8027

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8027

Log:
driver information is now back via winreg


Modified:
   branches/SAMBA_3_0/source/registry/reg_printing.c
   branches/SAMBA_3_0/source/rpc_server/srv_reg_nt.c


Changeset:
Modified: branches/SAMBA_3_0/source/registry/reg_printing.c
===================================================================
--- branches/SAMBA_3_0/source/registry/reg_printing.c	2005-06-30 19:43:53 UTC (rev 8026)
+++ branches/SAMBA_3_0/source/registry/reg_printing.c	2005-06-30 20:16:16 UTC (rev 8027)
@@ -591,7 +591,7 @@
 	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 @@
 		
 	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 @@
 	
 	SAFE_FREE( buffer );
 		
-	DEBUG(8,("print_subpath_values_environments: Exit\n"));
+	DEBUG(8,("key_driver_fetch_values: Exit\n"));
 	
 	return regval_ctr_numvals( values );
 }

Modified: branches/SAMBA_3_0/source/rpc_server/srv_reg_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_reg_nt.c	2005-06-30 19:43:53 UTC (rev 8026)
+++ branches/SAMBA_3_0/source/rpc_server/srv_reg_nt.c	2005-06-30 20:16:16 UTC (rev 8027)
@@ -490,11 +490,15 @@
 	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 */