summaryrefslogtreecommitdiff
path: root/source3/rpcclient
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1998-11-11 14:23:55 +0000
committerLuke Leighton <lkcl@samba.org>1998-11-11 14:23:55 +0000
commit9f14f281ff7efa1af0242a1dd1f5220d5cfdbf49 (patch)
tree65504cd76855cbf4e4662fdb4b776d24469b33aa /source3/rpcclient
parent0e09fba835d0d65e2a927befaf3713dd481d8939 (diff)
downloadsamba-9f14f281ff7efa1af0242a1dd1f5220d5cfdbf49.tar.gz
samba-9f14f281ff7efa1af0242a1dd1f5220d5cfdbf49.tar.bz2
samba-9f14f281ff7efa1af0242a1dd1f5220d5cfdbf49.zip
changed syntax of registry commands so keys can start with HKLM or HKU.
sorted lookupsids command (This used to be commit 13a0ee851fe0ce9acddfe57f9aba19fc78085c39)
Diffstat (limited to 'source3/rpcclient')
-rw-r--r--source3/rpcclient/cmd_lsarpc.c90
-rw-r--r--source3/rpcclient/cmd_reg.c366
-rw-r--r--source3/rpcclient/cmd_samr.c12
-rw-r--r--source3/rpcclient/rpcclient.c11
4 files changed, 246 insertions, 233 deletions
diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index 6dc50c5c22..a23e7a650b 100644
--- a/source3/rpcclient/cmd_lsarpc.c
+++ b/source3/rpcclient/cmd_lsarpc.c
@@ -49,9 +49,9 @@ void cmd_lsa_query_info(struct client_info *info)
BOOL res = True;
fstrcpy(info->dom.level3_dom, "");
- fstrcpy(info->dom.level3_sid, "");
fstrcpy(info->dom.level5_dom, "");
- fstrcpy(info->dom.level5_sid, "");
+ ZERO_STRUCT(info->dom.level3_sid);
+ ZERO_STRUCT(info->dom.level5_sid);
fstrcpy(srv_name, "\\\\");
fstrcat(srv_name, info->myhostname);
@@ -71,15 +71,15 @@ void cmd_lsa_query_info(struct client_info *info)
/* send client info query, level 3. receive domain name and sid */
res = res ? do_lsa_query_info_pol(smb_cli,
- &info->dom.lsa_info_pol, 0x03,
- info->dom.level3_dom,
- info->dom.level3_sid) : False;
+ &info->dom.lsa_info_pol, 0x03,
+ info->dom.level3_dom,
+ &info->dom.level3_sid) : False;
/* send client info query, level 5. receive domain name and sid */
res = res ? do_lsa_query_info_pol(smb_cli,
- &info->dom.lsa_info_pol, 0x05,
+ &info->dom.lsa_info_pol, 0x05,
info->dom.level5_dom,
- info->dom.level5_sid) : False;
+ &info->dom.level5_sid) : False;
res = res ? do_lsa_close(smb_cli, &info->dom.lsa_info_pol) : False;
@@ -89,20 +89,23 @@ void cmd_lsa_query_info(struct client_info *info)
if (res)
{
BOOL domain_something = False;
+ fstring sid;
DEBUG(5,("cmd_lsa_query_info: query succeeded\n"));
fprintf(out_hnd, "LSA Query Info Policy\n");
- if (info->dom.level3_sid[0] != 0)
+ if (info->dom.level3_dom[0] != 0)
{
+ sid_to_string(sid, &info->dom.level3_sid);
fprintf(out_hnd, "Domain Member - Domain: %s SID: %s\n",
- info->dom.level3_dom, info->dom.level3_sid);
+ info->dom.level3_dom, sid);
domain_something = True;
}
- if (info->dom.level5_sid[0] != 0)
+ if (info->dom.level5_dom[0] != 0)
{
+ sid_to_string(sid, &info->dom.level5_sid);
fprintf(out_hnd, "Domain Controller - Domain: %s SID: %s\n",
- info->dom.level5_dom, info->dom.level5_sid);
+ info->dom.level5_dom, sid);
domain_something = True;
}
if (!domain_something)
@@ -123,53 +126,53 @@ nt lsa query
void cmd_lsa_lookup_sids(struct client_info *info)
{
fstring temp;
- fstring sid_name;
+ int i;
+ pstring sid_name;
fstring srv_name;
- DOM_SID sid;
- DOM_SID *sids[1];
+ DOM_SID sid[10];
+ DOM_SID *sids[10];
+ int num_sids = 0;
char **names = NULL;
+ int num_names = 0;
BOOL res = True;
- DEBUG(5, ("cmd_lsa_lookup_sids: smb_cli->fd:%d\n", smb_cli->fd));
-
fstrcpy(srv_name, "\\\\");
fstrcat(srv_name, info->myhostname);
strupper(srv_name);
- fstrcpy(sid_name, info->dom.level5_sid);
+ DEBUG(4,("cmd_lsa_lookup_sids: server: %s\n", srv_name));
- if (next_token(NULL, temp, NULL, sizeof(temp)))
+ while (num_sids < 10 && next_token(NULL, temp, NULL, sizeof(temp)))
{
- if (info->dom.level5_sid[0] == 0)
- {
- fprintf(out_hnd, "please use lsaquery first or specify a complete SID\n");
- return;
- }
-
if (strnequal("S-", temp, 2))
{
fstrcpy(sid_name, temp);
}
else
{
+ sid_to_string(sid_name, &info->dom.level5_sid);
+
+ if (sid_name[0] == 0)
+ {
+ fprintf(out_hnd, "please use lsaquery first or specify a complete SID\n");
+ return;
+ }
+
fstrcat(sid_name, "-");
fstrcat(sid_name, temp);
}
+ make_dom_sid(&sid[num_sids], sid_name);
+ sids[num_sids] = &sid[num_sids];
+ num_sids++;
}
- else
+
+ if (num_sids == 0)
{
- fprintf(out_hnd, "lsalookup RID or SID\n");
+ fprintf(out_hnd, "lookupsid RID or SID\n");
return;
}
- DEBUG(4,("cmd_lsa_lookup_sids: server: %s sid:%s\n",
- srv_name, sid_name));
-
- make_dom_sid(&sid, sid_name);
-
- sids[0] = &sid;
-
/* open LSARPC session. */
res = res ? cli_nt_session_open(smb_cli, PIPE_LSARPC) : False;
@@ -178,9 +181,11 @@ void cmd_lsa_lookup_sids(struct client_info *info)
srv_name,
&info->dom.lsa_info_pol, True) : False;
- /* send client info query, level 3. receive domain name and sid */
+ /* send lsa lookup sids call */
res = res ? do_lsa_lookup_sids(smb_cli,
- &info->dom.lsa_info_pol, 1, sids, names) : False;
+ &info->dom.lsa_info_pol,
+ num_sids, sids,
+ &names, &num_names) : False;
res = res ? do_lsa_close(smb_cli, &info->dom.lsa_info_pol) : False;
@@ -190,11 +195,24 @@ void cmd_lsa_lookup_sids(struct client_info *info)
if (res)
{
DEBUG(5,("cmd_lsa_lookup_sids: query succeeded\n"));
-
}
else
{
DEBUG(5,("cmd_lsa_lookup_sids: query failed\n"));
}
+ if (names != NULL)
+ {
+ fprintf(out_hnd,"Lookup SIDS:\n");
+ for (i = 0; i < num_names; i++)
+ {
+ sid_to_string(temp, sids[i]);
+ fprintf(out_hnd, "SID: %s -> %s\n", temp, names[i]);
+ if (names[i] != NULL)
+ {
+ free(names[i]);
+ }
+ }
+ free(names);
+ }
}
diff --git a/source3/rpcclient/cmd_reg.c b/source3/rpcclient/cmd_reg.c
index f36a42699d..4d49d19b3b 100644
--- a/source3/rpcclient/cmd_reg.c
+++ b/source3/rpcclient/cmd_reg.c
@@ -36,6 +36,24 @@ extern int smb_tidx;
extern FILE* out_hnd;
+/*
+ * keys. of the form:
+ * ----
+ *
+ * [HKLM]|[HKU]\[parent_keyname_components]\[subkey]|[value]
+ *
+ * reg_getsubkey() splits this down into:
+ * [HKLM]|[HKU]\[parent_keyname_components] and [subkey]|[value]
+ *
+ * do_reg_connect() splits the left side down further into:
+ * [HKLM]|[HKU] and [parent_keyname_components].
+ *
+ * HKLM is short for HKEY_LOCAL_MACHINE
+ * HKU is short for HKEY_USERS
+ *
+ * oh, and HKEY stands for "Hive Key".
+ *
+ */
/****************************************************************************
nt registry enum
@@ -48,6 +66,7 @@ void cmd_reg_enum(struct client_info *info)
int i;
POLICY_HND key_pol;
+ fstring full_keyname;
fstring key_name;
/*
@@ -73,9 +92,9 @@ void cmd_reg_enum(struct client_info *info)
DEBUG(5, ("cmd_reg_enum: smb_cli->fd:%d\n", smb_cli->fd));
- if (!next_token(NULL, key_name, NULL, sizeof(key_name)))
+ if (!next_token(NULL, full_keyname, NULL, sizeof(full_keyname)))
{
- fprintf(out_hnd, "regenum key_name\n");
+ fprintf(out_hnd, "regenum <key_name>\n");
return;
}
@@ -83,13 +102,19 @@ void cmd_reg_enum(struct client_info *info)
res = res ? cli_nt_session_open(smb_cli, PIPE_WINREG) : False;
/* open registry receive a policy handle */
- res = res ? do_reg_open_hklm(smb_cli,
- 0x84E0, 0x02000000,
+ res = res ? do_reg_connect(smb_cli, full_keyname, key_name,
&info->dom.reg_pol_connect) : False;
- /* open an entry */
- res1 = res ? do_reg_open_entry(smb_cli, &info->dom.reg_pol_connect,
- key_name, 0x02000000, &key_pol) : False;
+ if ((*key_name) != 0)
+ {
+ /* open an entry */
+ res1 = res ? do_reg_open_entry(smb_cli, &info->dom.reg_pol_connect,
+ key_name, 0x02000000, &key_pol) : False;
+ }
+ else
+ {
+ memcpy(&key_pol, &info->dom.reg_pol_connect, sizeof(key_pol));
+ }
res1 = res1 ? do_reg_query_key(smb_cli,
&key_pol,
@@ -98,6 +123,12 @@ void cmd_reg_enum(struct client_info *info)
&num_values, &max_valnamelen, &max_valbufsize,
&sec_desc, &mod_time) : False;
+ if (res1 && num_subkeys > 0)
+ {
+ fprintf(out_hnd,"Subkeys\n");
+ fprintf(out_hnd,"-------\n");
+ }
+
for (i = 0; i < num_subkeys; i++)
{
/*
@@ -133,6 +164,12 @@ void cmd_reg_enum(struct client_info *info)
}
+ if (num_values > 0)
+ {
+ fprintf(out_hnd,"Key Values\n");
+ fprintf(out_hnd,"----------\n");
+ }
+
for (i = 0; i < num_values; i++)
{
/*
@@ -166,7 +203,10 @@ void cmd_reg_enum(struct client_info *info)
}
/* close the handles */
- res1 = res1 ? do_reg_close(smb_cli, &key_pol) : False;
+ if ((*key_name) != 0)
+ {
+ res1 = res1 ? do_reg_close(smb_cli, &key_pol) : False;
+ }
res = res ? do_reg_close(smb_cli, &info->dom.reg_pol_connect) : False;
/* close the session */
@@ -191,6 +231,7 @@ void cmd_reg_query_key(struct client_info *info)
BOOL res1 = True;
POLICY_HND key_pol;
+ fstring full_keyname;
fstring key_name;
/*
@@ -210,7 +251,7 @@ void cmd_reg_query_key(struct client_info *info)
DEBUG(5, ("cmd_reg_enum: smb_cli->fd:%d\n", smb_cli->fd));
- if (!next_token(NULL, key_name, NULL, sizeof(key_name)))
+ if (!next_token(NULL, full_keyname, NULL, sizeof(full_keyname)))
{
fprintf(out_hnd, "regquery key_name\n");
return;
@@ -220,13 +261,19 @@ void cmd_reg_query_key(struct client_info *info)
res = res ? cli_nt_session_open(smb_cli, PIPE_WINREG) : False;
/* open registry receive a policy handle */
- res = res ? do_reg_open_hklm(smb_cli,
- 0x84E0, 0x02000000,
+ res = res ? do_reg_connect(smb_cli, full_keyname, key_name,
&info->dom.reg_pol_connect) : False;
- /* open an entry */
- res1 = res ? do_reg_open_entry(smb_cli, &info->dom.reg_pol_connect,
- key_name, 0x02000000, &key_pol) : False;
+ if ((*key_name) != 0)
+ {
+ /* open an entry */
+ res1 = res ? do_reg_open_entry(smb_cli, &info->dom.reg_pol_connect,
+ key_name, 0x02000000, &key_pol) : False;
+ }
+ else
+ {
+ memcpy(&key_pol, &info->dom.reg_pol_connect, sizeof(key_pol));
+ }
res1 = res1 ? do_reg_query_key(smb_cli,
&key_pol,
@@ -256,7 +303,10 @@ void cmd_reg_query_key(struct client_info *info)
}
/* close the handles */
- res1 = res1 ? do_reg_close(smb_cli, &key_pol) : False;
+ if ((*key_name) != 0)
+ {
+ res1 = res1 ? do_reg_close(smb_cli, &key_pol) : False;
+ }
res = res ? do_reg_close(smb_cli, &info->dom.reg_pol_connect) : False;
/* close the session */
@@ -273,113 +323,6 @@ void cmd_reg_query_key(struct client_info *info)
}
/****************************************************************************
-nt registry test
-****************************************************************************/
-void cmd_reg_test2(struct client_info *info)
-{
- BOOL res = True;
- BOOL res1 = True;
- BOOL res2 = True;
- BOOL res3 = True;
- int i;
-
- /*
- * query key info
- */
-
- POLICY_HND key_pol;
- fstring key_class;
- uint32 max_class_len;
- uint32 num_subkeys;
- uint32 max_subkeylen;
- uint32 max_subkeysize;
- uint32 num_values;
- uint32 max_valnamelen;
- uint32 max_valbufsize;
- uint32 sec_desc;
- NTTIME mod_time;
-
- /*
- * unknown 0x1a request
- */
-
- uint32 unk_1a_response;
-
- /*
- * enumerate key
- */
-
- fstring enum_name;
- uint32 enum_unk1;
- uint32 enum_unk2;
- time_t key_mod_time;
-
- DEBUG(5, ("cmd_reg_test: smb_cli->fd:%d\n", smb_cli->fd));
-
- /* open WINREG session. */
- res = res ? cli_nt_session_open(smb_cli, PIPE_WINREG) : False;
-
- /* open registry receive a policy handle */
- res = res ? do_reg_open_hklm(smb_cli,
- 0x84E0, 0x02000000,
- &info->dom.reg_pol_connect) : False;
-
- res1 = res ? do_reg_open_hku(smb_cli,
- 0x84E0, 0x02000000,
- &info->dom.reg_pol_unk_4 ) : False;
-
- res2 = res1 ? do_reg_query_key(smb_cli,
- &key_pol,
- key_class, &max_class_len,
- &num_subkeys, &max_subkeylen, &max_subkeysize,
- &num_values, &max_valnamelen, &max_valbufsize,
- &sec_desc, &mod_time) : False;
-
- for (i = 0; i < num_subkeys; i++)
- {
- /* unknown 1a it */
- res3 = res2 ? do_reg_unknown_1a(smb_cli, &info->dom.reg_pol_connect,
- &unk_1a_response) : False;
-
- if (res3)
- {
- fprintf(out_hnd,"Unknown 1a response: %x\n", unk_1a_response);
- }
-
- /* enum key */
- res3 = res3 ? do_reg_enum_key(smb_cli, &info->dom.reg_pol_connect,
- i, enum_name,
- &enum_unk1, &enum_unk2,
- &key_mod_time) : False;
-
- if (res3)
- {
- fprintf(out_hnd,"Enum Key: %s ", enum_name);
- fprintf(out_hnd,"unk (%08x %08x) ", enum_unk1, enum_unk2);
- fprintf(out_hnd,"mod time: %s\n", http_timestring(key_mod_time));
- }
- }
-
- /* close the handles */
- res2 = res2 ? do_reg_close(smb_cli, &key_pol ) : False;
- res1 = res1 ? do_reg_close(smb_cli, &info->dom.reg_pol_unk_4 ) : False;
- res = res ? do_reg_close(smb_cli, &info->dom.reg_pol_connect) : False;
-
- /* close the session */
- cli_nt_session_close(smb_cli);
-
- if (res && res1 && res2)
- {
- DEBUG(5,("cmd_reg_test2: query succeeded\n"));
- fprintf(out_hnd,"Registry Test2\n");
- }
- else
- {
- DEBUG(5,("cmd_reg_test2: query failed\n"));
- }
-}
-
-/****************************************************************************
nt registry create value
****************************************************************************/
void cmd_reg_create_val(struct client_info *info)
@@ -389,6 +332,8 @@ void cmd_reg_create_val(struct client_info *info)
BOOL res4 = True;
POLICY_HND parent_pol;
+ fstring full_keyname;
+ fstring keyname;
fstring parent_name;
fstring val_name;
fstring tmp;
@@ -403,23 +348,25 @@ void cmd_reg_create_val(struct client_info *info)
type, &unk_0, &unk_1) : False;
#endif
- DEBUG(5, ("cmd_reg_get_val_sec: smb_cli->fd:%d\n", smb_cli->fd));
+ DEBUG(5, ("cmd_reg_create_val: smb_cli->fd:%d\n", smb_cli->fd));
- if (!next_token(NULL, parent_name, NULL, sizeof(parent_name)))
+ if (!next_token(NULL, full_keyname, NULL, sizeof(full_keyname)))
{
- fprintf(out_hnd, "regcreate <parent val name> <val_name> <val_type> <val>\n");
+ fprintf(out_hnd, "regcreate <val_name> <val_type> <val>\n");
return;
}
- if (!next_token(NULL, val_name , NULL, sizeof(val_name )))
+ reg_get_subkey(full_keyname, keyname, val_name);
+
+ if (keyname[0] == 0 || val_name[0] == 0)
{
- fprintf(out_hnd, "regcreate <parent val name> <val_name> <val_type> <val>\n");
+ fprintf(out_hnd, "invalid key name\n");
return;
}
-
+
if (!next_token(NULL, tmp, NULL, sizeof(tmp)))
{
- fprintf(out_hnd, "regcreate <parent val name> <val_name> <val_type (1|4)> <val>\n");
+ fprintf(out_hnd, "regcreate <val_name> <val_type (1|4)> <val>\n");
return;
}
@@ -433,7 +380,7 @@ void cmd_reg_create_val(struct client_info *info)
if (!next_token(NULL, tmp, NULL, sizeof(tmp)))
{
- fprintf(out_hnd, "regcreate <parent val name> <val_name> <val_type (1|4)> <val>\n");
+ fprintf(out_hnd, "regcreate <val_name> <val_type (1|4)> <val>\n");
return;
}
@@ -477,13 +424,19 @@ void cmd_reg_create_val(struct client_info *info)
res = res ? cli_nt_session_open(smb_cli, PIPE_WINREG) : False;
/* open registry receive a policy handle */
- res = res ? do_reg_open_hklm(smb_cli,
- 0x84E0, 0x02000000,
+ res = res ? do_reg_connect(smb_cli, keyname, parent_name,
&info->dom.reg_pol_connect) : False;
- /* open an entry */
- res3 = res ? do_reg_open_entry(smb_cli, &info->dom.reg_pol_connect,
- parent_name, 0x02000000, &parent_pol) : False;
+ if ((*val_name) != 0)
+ {
+ /* open an entry */
+ res3 = res ? do_reg_open_entry(smb_cli, &info->dom.reg_pol_connect,
+ parent_name, 0x02000000, &parent_pol) : False;
+ }
+ else
+ {
+ memcpy(&parent_pol, &info->dom.reg_pol_connect, sizeof(parent_pol));
+ }
/* create an entry */
res4 = res3 ? do_reg_create_val(smb_cli, &parent_pol,
@@ -493,7 +446,10 @@ void cmd_reg_create_val(struct client_info *info)
res4 = res4 ? do_reg_flush_key(smb_cli, &parent_pol) : False;
/* close the val handle */
- res3 = res3 ? do_reg_close(smb_cli, &parent_pol) : False;
+ if ((*val_name) != 0)
+ {
+ res3 = res3 ? do_reg_close(smb_cli, &parent_pol) : False;
+ }
/* close the registry handles */
res = res ? do_reg_close(smb_cli, &info->dom.reg_pol_connect) : False;
@@ -522,36 +478,46 @@ void cmd_reg_delete_val(struct client_info *info)
BOOL res4 = True;
POLICY_HND parent_pol;
+ fstring full_keyname;
+ fstring keyname;
fstring parent_name;
fstring val_name;
DEBUG(5, ("cmd_reg_delete_val: smb_cli->fd:%d\n", smb_cli->fd));
- if (!next_token(NULL, parent_name, NULL, sizeof(parent_name)))
+ if (!next_token(NULL, full_keyname, NULL, sizeof(full_keyname)))
{
- fprintf(out_hnd, "regcreate <parent key name> <val_name>\n");
+ fprintf(out_hnd, "regdelete <val_name>\n");
return;
}
- if (!next_token(NULL, val_name , NULL, sizeof(val_name )))
+ reg_get_subkey(full_keyname, keyname, val_name);
+
+ if (keyname[0] == 0 || val_name[0] == 0)
{
- fprintf(out_hnd, "regcreate <parent key name> <val_name>\n");
+ fprintf(out_hnd, "invalid key name\n");
return;
}
-
+
/* open WINREG session. */
res = res ? cli_nt_session_open(smb_cli, PIPE_WINREG) : False;
/* open registry receive a policy handle */
- res = res ? do_reg_open_hklm(smb_cli,
- 0x84E0, 0x02000000,
+ res = res ? do_reg_connect(smb_cli, keyname, parent_name,
&info->dom.reg_pol_connect) : False;
- /* open an entry */
- res3 = res ? do_reg_open_entry(smb_cli, &info->dom.reg_pol_connect,
- parent_name, 0x02000000, &parent_pol) : False;
+ if ((*val_name) != 0)
+ {
+ /* open an entry */
+ res3 = res ? do_reg_open_entry(smb_cli, &info->dom.reg_pol_connect,
+ parent_name, 0x02000000, &parent_pol) : False;
+ }
+ else
+ {
+ memcpy(&parent_pol, &info->dom.reg_pol_connect, sizeof(parent_pol));
+ }
- /* create an entry */
+ /* delete an entry */
res4 = res3 ? do_reg_delete_val(smb_cli, &parent_pol, val_name) : False;
/* flush the modified key */
@@ -587,43 +553,56 @@ void cmd_reg_delete_key(struct client_info *info)
BOOL res4 = True;
POLICY_HND parent_pol;
+ fstring full_keyname;
fstring parent_name;
fstring key_name;
+ fstring subkey_name;
DEBUG(5, ("cmd_reg_delete_key: smb_cli->fd:%d\n", smb_cli->fd));
- if (!next_token(NULL, parent_name, NULL, sizeof(parent_name)))
+ if (!next_token(NULL, full_keyname, NULL, sizeof(full_keyname)))
{
- fprintf(out_hnd, "regcreate <parent key name> <key_name>\n");
+ fprintf(out_hnd, "regdeletekey <key_name>\n");
return;
}
- if (!next_token(NULL, key_name , NULL, sizeof(key_name )))
+ reg_get_subkey(full_keyname, parent_name, subkey_name);
+
+ if (parent_name[0] == 0 || subkey_name[0] == 0)
{
- fprintf(out_hnd, "regcreate <parent key name> <key_name>\n");
+ fprintf(out_hnd, "invalid key name\n");
return;
}
-
+
/* open WINREG session. */
res = res ? cli_nt_session_open(smb_cli, PIPE_WINREG) : False;
/* open registry receive a policy handle */
- res = res ? do_reg_open_hklm(smb_cli,
- 0x84E0, 0x02000000,
+ res = res ? do_reg_connect(smb_cli, parent_name, key_name,
&info->dom.reg_pol_connect) : False;
- /* open an entry */
- res3 = res ? do_reg_open_entry(smb_cli, &info->dom.reg_pol_connect,
- parent_name, 0x02000000, &parent_pol) : False;
+ if ((*key_name) != 0)
+ {
+ /* open an entry */
+ res3 = res ? do_reg_open_entry(smb_cli, &info->dom.reg_pol_connect,
+ key_name, 0x02000000, &parent_pol) : False;
+ }
+ else
+ {
+ memcpy(&parent_pol, &info->dom.reg_pol_connect, sizeof(parent_pol));
+ }
/* create an entry */
- res4 = res3 ? do_reg_delete_key(smb_cli, &parent_pol, key_name) : False;
+ res4 = res3 ? do_reg_delete_key(smb_cli, &parent_pol, subkey_name) : False;
/* flush the modified key */
res4 = res4 ? do_reg_flush_key(smb_cli, &parent_pol) : False;
/* close the key handle */
- res3 = res3 ? do_reg_close(smb_cli, &parent_pol) : False;
+ if ((*key_name) != 0)
+ {
+ res3 = res3 ? do_reg_close(smb_cli, &parent_pol) : False;
+ }
/* close the registry handles */
res = res ? do_reg_close(smb_cli, &info->dom.reg_pol_connect) : False;
@@ -653,33 +632,29 @@ void cmd_reg_create_key(struct client_info *info)
POLICY_HND parent_pol;
POLICY_HND key_pol;
+ fstring full_keyname;
+ fstring parent_key;
fstring parent_name;
fstring key_name;
fstring key_class;
SEC_INFO sam_access;
-#if 0
- uint32 unk_0;
- uint32 unk_1;
- /* query it */
- res1 = res1 ? do_reg_query_info(smb_cli, &key_pol,
- type, &unk_0, &unk_1) : False;
-#endif
-
DEBUG(5, ("cmd_reg_create_key: smb_cli->fd:%d\n", smb_cli->fd));
- if (!next_token(NULL, parent_name, NULL, sizeof(parent_name)))
+ if (!next_token(NULL, full_keyname, NULL, sizeof(full_keyname)))
{
- fprintf(out_hnd, "regcreate <parent key name> <key_name> [key_class]\n");
+ fprintf(out_hnd, "regcreate <key_name> [key_class]\n");
return;
}
- if (!next_token(NULL, key_name , NULL, sizeof(key_name )))
+ reg_get_subkey(full_keyname, parent_key, key_name);
+
+ if (parent_key[0] == 0 || key_name[0] == 0)
{
- fprintf(out_hnd, "regcreate <parent key name> <key_name> [key_class]\n");
+ fprintf(out_hnd, "invalid key name\n");
return;
}
-
+
if (!next_token(NULL, key_class, NULL, sizeof(key_class)))
{
memset(key_class, 0, sizeof(key_class));
@@ -692,13 +667,19 @@ void cmd_reg_create_key(struct client_info *info)
res = res ? cli_nt_session_open(smb_cli, PIPE_WINREG) : False;
/* open registry receive a policy handle */
- res = res ? do_reg_open_hklm(smb_cli,
- 0x84E0, 0x02000000,
+ res = res ? do_reg_connect(smb_cli, parent_key, parent_name,
&info->dom.reg_pol_connect) : False;
- /* open an entry */
- res3 = res ? do_reg_open_entry(smb_cli, &info->dom.reg_pol_connect,
- parent_name, 0x02000000, &parent_pol) : False;
+ if ((*parent_name) != 0)
+ {
+ /* open an entry */
+ res3 = res ? do_reg_open_entry(smb_cli, &info->dom.reg_pol_connect,
+ parent_name, 0x02000000, &parent_pol) : False;
+ }
+ else
+ {
+ memcpy(&parent_pol, &info->dom.reg_pol_connect, sizeof(parent_pol));
+ }
/* create an entry */
res4 = res3 ? do_reg_create_key(smb_cli, &parent_pol,
@@ -711,7 +692,10 @@ void cmd_reg_create_key(struct client_info *info)
res4 = res4 ? do_reg_close(smb_cli, &key_pol) : False;
/* close the key handle */
- res3 = res3 ? do_reg_close(smb_cli, &parent_pol) : False;
+ if ((*parent_name) != 0)
+ {
+ res3 = res3 ? do_reg_close(smb_cli, &parent_pol) : False;
+ }
/* close the registry handles */
res = res ? do_reg_close(smb_cli, &info->dom.reg_pol_connect) : False;
@@ -740,6 +724,7 @@ void cmd_reg_get_key_sec(struct client_info *info)
BOOL res4 = True;
POLICY_HND key_pol;
+ fstring full_keyname;
fstring key_name;
/*
@@ -751,9 +736,9 @@ void cmd_reg_get_key_sec(struct client_info *info)
DEBUG(5, ("cmd_reg_get_key_sec: smb_cli->fd:%d\n", smb_cli->fd));
- if (!next_token(NULL, key_name, NULL, sizeof(key_name)))
+ if (!next_token(NULL, full_keyname, NULL, sizeof(full_keyname)))
{
- fprintf(out_hnd, "regtest key_name\n");
+ fprintf(out_hnd, "reggetsec <key_name>\n");
return;
}
@@ -761,10 +746,20 @@ void cmd_reg_get_key_sec(struct client_info *info)
res = res ? cli_nt_session_open(smb_cli, PIPE_WINREG) : False;
/* open registry receive a policy handle */
- res = res ? do_reg_open_hklm(smb_cli,
- 0x84E0, 0x02000000,
+ res = res ? do_reg_connect(smb_cli, full_keyname, key_name,
&info->dom.reg_pol_connect) : False;
+ if ((*key_name) != 0)
+ {
+ /* open an entry */
+ res3 = res ? do_reg_open_entry(smb_cli, &info->dom.reg_pol_connect,
+ key_name, 0x02000000, &key_pol) : False;
+ }
+ else
+ {
+ memcpy(&key_pol, &info->dom.reg_pol_connect, sizeof(key_pol));
+ }
+
/* open an entry */
res3 = res ? do_reg_open_entry(smb_cli, &info->dom.reg_pol_connect,
key_name, 0x02000000, &key_pol) : False;
@@ -779,15 +774,16 @@ void cmd_reg_get_key_sec(struct client_info *info)
if (res4 && sec_buf.len > 0)
{
- fprintf(out_hnd, "Security Info for %s: (%d)\n",
- key_name, sec_buf_size);
display_sec_desc(out_hnd, ACTION_HEADER , &sec_buf.sec);
display_sec_desc(out_hnd, ACTION_ENUMERATE, &sec_buf.sec);
display_sec_desc(out_hnd, ACTION_FOOTER , &sec_buf.sec);
}
/* close the key handle */
- res3 = res3 ? do_reg_close(smb_cli, &key_pol) : False;
+ if ((*key_name) != 0)
+ {
+ res3 = res3 ? do_reg_close(smb_cli, &key_pol) : False;
+ }
/* close the registry handles */
res = res ? do_reg_close(smb_cli, &info->dom.reg_pol_connect) : False;
diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index fa3253edf9..eeb34c8f88 100644
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -57,7 +57,7 @@ void cmd_sam_ntchange_pwd(struct client_info *info)
uchar lm_hshhash[16];
uchar lm_oldhash[16];
- fstrcpy(sid , info->dom.level5_sid);
+ sid_to_string(sid, &info->dom.level5_sid);
fstrcpy(domain, info->dom.level5_dom);
fstrcpy(srv_name, "\\\\");
@@ -125,7 +125,7 @@ void cmd_sam_test(struct client_info *info)
fstring sid;
BOOL res = True;
- fstrcpy(sid , info->dom.level5_sid);
+ sid_to_string(sid, &info->dom.level5_sid);
fstrcpy(domain, info->dom.level5_dom);
/*
@@ -192,7 +192,7 @@ void cmd_sam_enum_users(struct client_info *info)
uint32 admin_rid = 0x304; /* absolutely no idea. */
fstring tmp;
- fstrcpy(sid , info->dom.level5_sid);
+ sid_to_string(sid, &info->dom.level5_sid);
fstrcpy(domain, info->dom.level5_dom);
if (strlen(sid) == 0)
@@ -366,7 +366,7 @@ void cmd_sam_query_user(struct client_info *info)
SAM_USER_INFO_21 usr;
- fstrcpy(sid , info->dom.level5_sid);
+ sid_to_string(sid, &info->dom.level5_sid);
fstrcpy(domain, info->dom.level5_dom);
if (strlen(sid) == 0)
@@ -457,7 +457,7 @@ void cmd_sam_query_groups(struct client_info *info)
uint32 switch_value = 2;
uint32 admin_rid = 0x304; /* absolutely no idea. */
- fstrcpy(sid , info->dom.level5_sid);
+ sid_to_string(sid, &info->dom.level5_sid);
fstrcpy(domain, info->dom.level5_dom);
if (strlen(sid) == 0)
@@ -538,7 +538,7 @@ void cmd_sam_enum_aliases(struct client_info *info)
fstring alias_names [3];
uint32 num_als_usrs[3];
- fstrcpy(sid , info->dom.level3_sid);
+ sid_to_string(sid, &info->dom.level3_sid);
fstrcpy(domain, info->dom.level3_dom);
#if 0
fstrcpy(sid , "S-1-5-20");
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index d65b392fcd..5fbd8e1cbc 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -106,13 +106,12 @@ struct
} commands[] =
{
{"regenum", cmd_reg_enum, "<keyname> Registry Enumeration (keys, values)"},
- {"regdeletekey",cmd_reg_delete_key, "<parentname> <keyname> Registry Key Delete"},
- {"regcreatekey",cmd_reg_create_key, "<parentname> <keyname> [keyclass] Registry Key Create"},
+ {"regdeletekey",cmd_reg_delete_key, "<keyname> Registry Key Delete"},
+ {"regcreatekey",cmd_reg_create_key, "<keyname> [keyclass] Registry Key Create"},
{"regquerykey",cmd_reg_query_key, "<keyname> Registry Key Query"},
- {"regdeleteval",cmd_reg_delete_val, "<parentname> <valname> Registry Value Delete"},
- {"regcreateval",cmd_reg_create_val, "<parentname> <valname> <valtype> <value> Registry Key Create"},
- {"regtest2", cmd_reg_test2, "Registry Testing No 2"},
- {"reggetsec", cmd_reg_get_key_sec, "<keyname> | <valname> Registry Key Security"},
+ {"regdeleteval",cmd_reg_delete_val, "<valname> Registry Value Delete"},
+ {"regcreateval",cmd_reg_create_val, "<valname> <valtype> <value> Registry Key Create"},
+ {"reggetsec", cmd_reg_get_key_sec, "<keyname> Registry Key Security"},
{"ntlogin", cmd_netlogon_login_test, "[username] [password] NT Domain login test"},
{"wksinfo", cmd_wks_query_info, "Workstation Query Info"},
{"srvinfo", cmd_srv_query_info, "Server Query Info"},