set "key does not exist" response to reg_query_val() (win32 status code

of 0x2).  [p.s. getting REALLY bored of this nt5rc2->samba domain stuff].
(This used to be commit a8801942f72b2394a54e4a46546029fac70efeed)

2 files changed, 38 insertions, 7 deletions

diff --git a/source3/rpc_server/srv_lsa_hnd.c b/source3/rpc_server/srv_lsa_hnd.c
index dabc5520ff..d53264a73e 100644
--- a/source3/rpc_server/srv_lsa_hnd.c
+++ b/source3/rpc_server/srv_lsa_hnd.c
@@ -271,9 +271,10 @@ BOOL set_lsa_policy_reg_name(POLICY_HND *hnd, fstring name)
 {
 	struct policy *p = find_lsa_policy(hnd);
 
-	if (p && p->open) {
-		DEBUG(3,("Setting policy pnum=%x name=%s\n",
-			 p->pnum, name));
+	if (p && p->open)
+	{
+		DEBUG(3,("Getting policy pnum=%x\n",
+			 p->pnum));
 
 		fstrcpy(p->dev.reg.name, name);
 		return True;
@@ -284,6 +285,27 @@ BOOL set_lsa_policy_reg_name(POLICY_HND *hnd, fstring name)
 }
 
 /****************************************************************************
+  set reg name 
+****************************************************************************/
+BOOL get_lsa_policy_reg_name(POLICY_HND *hnd, fstring name)
+{
+	struct policy *p = find_lsa_policy(hnd);
+
+	if (p && p->open)
+	{
+		DEBUG(3,("Setting policy pnum=%x name=%s\n",
+			 p->pnum, name));
+
+		fstrcpy(name, p->dev.reg.name);
+		DEBUG(5,("getting policy reg name=%s\n", name));
+		return True;
+	}
+
+	DEBUG(3,("Error getting policy reg name\n"));
+	return False;
+}
+
+/****************************************************************************
   close an lsa policy
 ****************************************************************************/
 BOOL close_lsa_policy_hnd(POLICY_HND *hnd)
diff --git a/source3/rpc_server/srv_reg.c b/source3/rpc_server/srv_reg.c
index 18781d0cd0..10b9bac90c 100644
--- a/source3/rpc_server/srv_reg.c
+++ b/source3/rpc_server/srv_reg.c
@@ -187,23 +187,32 @@ static void reg_reply_info(REG_Q_INFO *q_u,
 	uint32 status     = 0;
 
 	REG_R_INFO r_u;
-	uint32 type = 1;
+	uint32 type = 0xcafeface;
 	BUFFER2 buf;
+	fstring name;
+
+	ZERO_STRUCT(buf);
 
 	DEBUG(5,("reg_info: %d\n", __LINE__));
 
-	if (status == 0 && find_lsa_policy_by_hnd(&(q_u->pol)) == -1)
+	if (status == 0x0 && !get_lsa_policy_reg_name(&q_u->pol, name))
 	{
 		status = 0xC000000 | NT_STATUS_INVALID_HANDLE;
 	}
 
-	if (status == 0)
+	if (status == 0 &&
+	   strequal(name, "SYSTEM\\CurrentControlSet\\Control\\ProductOptions"))
 	{
 		char *key = "LanmanNT";
 		make_buffer2(&buf, key, strlen(key));
-		make_reg_r_info(&r_u, &type, &buf, status);
+		type = 0x1;
+	}
+	else
+	{
+		status = 0x2; /* Win32 status code.  ick */
 	}
 
+	make_reg_r_info(&r_u, &type, &buf, status);
 
 	/* store the response in the SMB stream */
 	reg_io_r_info("", &r_u, rdata, 0);