r7878: mostly just a rename of REG_INFO to REG_QUERY_VALUE for better clarity

(This used to be commit d50f0ba07e285728605c8e8aae9d9a251a525e78)

2 files changed, 12 insertions, 15 deletions

diff --git a/source3/rpc_server/srv_reg.c b/source3/rpc_server/srv_reg.c
index c0abc2a9c2..fec6702758 100644
--- a/source3/rpc_server/srv_reg.c
+++ b/source3/rpc_server/srv_reg.c
@@ -164,13 +164,13 @@ static BOOL api_reg_open_entry(pipes_struct *p)
 }
 
 /*******************************************************************
- api_reg_info
+ api_reg_query_value
  ********************************************************************/
 
-static BOOL api_reg_info(pipes_struct *p)
+static BOOL api_reg_query_value(pipes_struct *p)
 {
-	REG_Q_INFO q_u;
-	REG_R_INFO r_u;
+	REG_Q_QUERY_VALUE q_u;
+	REG_R_QUERY_VALUE r_u;
 	prs_struct *data = &p->in_data.data;
 	prs_struct *rdata = &p->out_data.rdata;
 
@@ -178,12 +178,12 @@ static BOOL api_reg_info(pipes_struct *p)
 	ZERO_STRUCT(r_u);
 
 	/* grab the reg unknown 0x11*/
-	if(!reg_io_q_info("", &q_u, data, 0))
+	if(!reg_io_q_query_value("", &q_u, data, 0))
 		return False;
 
-	r_u.status = _reg_info(p, &q_u, &r_u);
+	r_u.status = _reg_query_value(p, &q_u, &r_u);
 
-	if(!reg_io_r_info("", &r_u, rdata, 0))
+	if(!reg_io_r_query_value("", &r_u, rdata, 0))
 		return False;
 
 	return True;
@@ -526,7 +526,7 @@ static struct api_struct api_reg_cmds[] =
       { "REG_ENUM_KEY"           , REG_ENUM_KEY           , api_reg_enum_key         },
       { "REG_ENUM_VALUE"         , REG_ENUM_VALUE         , api_reg_enum_value       },
       { "REG_QUERY_KEY"          , REG_QUERY_KEY          , api_reg_query_key        },
-      { "REG_INFO"               , REG_INFO               , api_reg_info             },
+      { "REG_QUERY_VALUE"        , REG_QUERY_VALUE        , api_reg_query_value      },
       { "REG_SHUTDOWN"           , REG_SHUTDOWN           , api_reg_shutdown         },
       { "REG_SHUTDOWN_EX"        , REG_SHUTDOWN_EX        , api_reg_shutdown_ex      },
       { "REG_ABORT_SHUTDOWN"     , REG_ABORT_SHUTDOWN     , api_reg_abort_shutdown   },
diff --git a/source3/rpc_server/srv_reg_nt.c b/source3/rpc_server/srv_reg_nt.c
index a3ab63d06e..455ff3da40 100644
--- a/source3/rpc_server/srv_reg_nt.c
+++ b/source3/rpc_server/srv_reg_nt.c
@@ -439,7 +439,7 @@ WERROR _reg_open_entry(pipes_struct *p, REG_Q_OPEN_ENTRY *q_u, REG_R_OPEN_ENTRY
  reg_reply_info
  ********************************************************************/
 
-WERROR _reg_info(pipes_struct *p, REG_Q_INFO *q_u, REG_R_INFO *r_u)
+WERROR _reg_query_value(pipes_struct *p, REG_Q_QUERY_VALUE *q_u, REG_R_QUERY_VALUE *r_u)
 {
 	WERROR			status = WERR_BADFILE;
 	fstring 		name;
@@ -479,8 +479,7 @@ WERROR _reg_info(pipes_struct *p, REG_Q_INFO *q_u, REG_R_INFO *r_u)
 		regval_ctr_addvalue(&regvals, "RefusePasswordChange", 
 				    REG_DWORD,
 				    (const char*)&dwValue, sizeof(dwValue));
-		val = dup_registry_value(
-			regval_ctr_specific_value( &regvals, 0 ) );
+		val = dup_registry_value( regval_ctr_specific_value( &regvals, 0 ) );
  	
 		status = WERR_OK;
 	
@@ -522,7 +521,7 @@ WERROR _reg_info(pipes_struct *p, REG_Q_INFO *q_u, REG_R_INFO *r_u)
 	for ( i=0; fetch_reg_values_specific(regkey, &val, i); i++ ) 
 	{
 		DEBUG(10,("_reg_info: Testing value [%s]\n", val->valuename));
-		if ( StrCaseCmp( val->valuename, name ) == 0 ) {
+		if ( strequal( val->valuename, name ) ) {
 			DEBUG(10,("_reg_info: Found match for value [%s]\n", name));
 			status = WERR_OK;
 			break;
@@ -533,7 +532,7 @@ WERROR _reg_info(pipes_struct *p, REG_Q_INFO *q_u, REG_R_INFO *r_u)
 
   
 out:
-	init_reg_r_info(q_u->ptr_buf, r_u, val, status);
+	init_reg_r_query_value(q_u->ptr_buf, r_u, val, status);
 	
 	regval_ctr_destroy( &regvals );
 	free_registry_value( val );
@@ -1385,8 +1384,6 @@ done:
 	if ( newparent != parent )
 		close_registry_key( p, &newparent_handle );
 
-	/* rpc_reg.h says there is a POLICY_HDN in the reply...no idea if that is correct */
-	
 	return write_result ? WERR_OK : WERR_REG_IO_FAILURE;
 }