*/
#include "includes.h"
#include "utils/net.h"
+#include "rpc_client/rpc_client.h"
+#include "../librpc/gen_ndr/ndr_lsa_c.h"
+#include "rpc_client/cli_lsarpc.h"
+#include "rpc_client/init_lsa.h"
+#include "../libcli/security/security.h"
+#include "lib/util/string_wrappers.h"
/********************************************************************
********************************************************************/
static NTSTATUS sid_to_name(struct rpc_pipe_client *pipe_hnd,
TALLOC_CTX *mem_ctx,
- DOM_SID *sid,
+ struct dom_sid *sid,
fstring name)
{
- POLICY_HND pol;
+ struct policy_handle pol;
enum lsa_SidType *sid_types = NULL;
- NTSTATUS result;
+ NTSTATUS status, result;
char **domains = NULL, **names = NULL;
+ struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
- result = rpccli_lsa_open_policy(pipe_hnd, mem_ctx, True,
- SEC_RIGHTS_MAXIMUM_ALLOWED, &pol);
+ status = rpccli_lsa_open_policy(pipe_hnd, mem_ctx, true,
+ SEC_FLAG_MAXIMUM_ALLOWED, &pol);
- if ( !NT_STATUS_IS_OK(result) )
- return result;
+ if ( !NT_STATUS_IS_OK(status) )
+ return status;
- result = rpccli_lsa_lookup_sids(pipe_hnd, mem_ctx, &pol, 1, sid, &domains, &names, &sid_types);
+ status = rpccli_lsa_lookup_sids(pipe_hnd, mem_ctx, &pol, 1, sid, &domains, &names, &sid_types);
- if ( NT_STATUS_IS_OK(result) ) {
+ if ( NT_STATUS_IS_OK(status) ) {
if ( *domains[0] )
fstr_sprintf( name, "%s\\%s", domains[0], names[0] );
else
fstrcpy( name, names[0] );
}
- rpccli_lsa_Close(pipe_hnd, mem_ctx, &pol);
- return result;
+ dcerpc_lsa_Close(b, mem_ctx, &pol, &result);
+ return status;
}
/********************************************************************
static NTSTATUS name_to_sid(struct rpc_pipe_client *pipe_hnd,
TALLOC_CTX *mem_ctx,
- DOM_SID *sid, const char *name)
+ struct dom_sid *sid, const char *name)
{
- POLICY_HND pol;
+ struct policy_handle pol;
enum lsa_SidType *sid_types;
- NTSTATUS result;
- DOM_SID *sids;
+ NTSTATUS status, result;
+ struct dom_sid *sids;
+ struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
/* maybe its a raw SID */
- if ( strncmp(name, "S-", 2) == 0 && string_to_sid(sid, name) ) {
+ if (dom_sid_parse(name, sid)) {
return NT_STATUS_OK;
}
- result = rpccli_lsa_open_policy(pipe_hnd, mem_ctx, True,
- SEC_RIGHTS_MAXIMUM_ALLOWED, &pol);
+ status = rpccli_lsa_open_policy(pipe_hnd, mem_ctx, true,
+ SEC_FLAG_MAXIMUM_ALLOWED, &pol);
- if ( !NT_STATUS_IS_OK(result) )
- return result;
+ if ( !NT_STATUS_IS_OK(status) )
+ return status;
- result = rpccli_lsa_lookup_names(pipe_hnd, mem_ctx, &pol, 1, &name,
+ status = rpccli_lsa_lookup_names(pipe_hnd, mem_ctx, &pol, 1, &name,
NULL, 1, &sids, &sid_types);
- if ( NT_STATUS_IS_OK(result) )
+ if ( NT_STATUS_IS_OK(status) )
sid_copy( sid, &sids[0] );
- rpccli_lsa_Close(pipe_hnd, mem_ctx, &pol);
- return result;
+ dcerpc_lsa_Close(b, mem_ctx, &pol, &result);
+ return status;
}
/********************************************************************
static NTSTATUS enum_privileges(struct rpc_pipe_client *pipe_hnd,
TALLOC_CTX *ctx,
- POLICY_HND *pol )
+ struct policy_handle *pol )
{
- NTSTATUS result;
- uint32 enum_context = 0;
- uint32 pref_max_length=0x1000;
- int i;
- uint16 lang_id=0;
- uint16 lang_id_sys=0;
- uint16 lang_id_desc;
+ NTSTATUS status, result;
+ uint32_t enum_context = 0;
+ uint32_t pref_max_length=0x1000;
+ uint32_t i;
+ uint16_t lang_id=0;
+ uint16_t lang_id_sys=0;
+ uint16_t lang_id_desc;
struct lsa_StringLarge *description = NULL;
struct lsa_PrivArray priv_array;
+ struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
- result = rpccli_lsa_EnumPrivs(pipe_hnd, ctx,
+ status = dcerpc_lsa_EnumPrivs(b, ctx,
pol,
&enum_context,
&priv_array,
- pref_max_length);
+ pref_max_length,
+ &result);
- if ( !NT_STATUS_IS_OK(result) )
+ if ( !NT_STATUS_IS_OK(status) )
+ return status;
+ if (!NT_STATUS_IS_OK(result)) {
return result;
+ }
/* Print results */
init_lsa_String(&lsa_name, priv_array.privs[i].name.string);
- result = rpccli_lsa_LookupPrivDisplayName(pipe_hnd, ctx,
+ status = dcerpc_lsa_LookupPrivDisplayName(b, ctx,
pol,
&lsa_name,
lang_id,
lang_id_sys,
&description,
- &lang_id_desc);
-
+ &lang_id_desc,
+ &result);
+ if (!NT_STATUS_IS_OK(status)) {
+ d_printf("??????\n");
+ continue;
+ }
if (!NT_STATUS_IS_OK(result)) {
d_printf("??????\n");
continue;
}
- d_printf("%s\n", description->string);
+ d_printf("%s\n", description ? description->string : "??????");
}
return NT_STATUS_OK;
static NTSTATUS check_privilege_for_user(struct rpc_pipe_client *pipe_hnd,
TALLOC_CTX *ctx,
- POLICY_HND *pol,
- DOM_SID *sid,
+ struct policy_handle *pol,
+ struct dom_sid *sid,
const char *right)
{
- NTSTATUS result;
+ NTSTATUS status, result;
struct lsa_RightSet rights;
- int i;
+ uint32_t i;
+ struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
- result = rpccli_lsa_EnumAccountRights(pipe_hnd, ctx,
+ status = dcerpc_lsa_EnumAccountRights(b, ctx,
pol,
sid,
- &rights);
-
+ &rights,
+ &result);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
if (!NT_STATUS_IS_OK(result)) {
return result;
}
}
for (i = 0; i < rights.count; i++) {
- if (StrCaseCmp(rights.names[i].string, right) == 0) {
+ if (strcasecmp_m(rights.names[i].string, right) == 0) {
return NT_STATUS_OK;
}
}
static NTSTATUS enum_privileges_for_user(struct rpc_pipe_client *pipe_hnd,
TALLOC_CTX *ctx,
- POLICY_HND *pol,
- DOM_SID *sid )
+ struct policy_handle *pol,
+ struct dom_sid *sid )
{
- NTSTATUS result;
+ NTSTATUS status, result;
struct lsa_RightSet rights;
- int i;
+ uint32_t i;
+ struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
- result = rpccli_lsa_EnumAccountRights(pipe_hnd, ctx,
+ status = dcerpc_lsa_EnumAccountRights(b, ctx,
pol,
sid,
- &rights);
-
+ &rights,
+ &result);
+ if (!NT_STATUS_IS_OK(status))
+ return status;
if (!NT_STATUS_IS_OK(result))
return result;
if (rights.count == 0) {
- d_printf("No privileges assigned\n");
+ d_printf(_("No privileges assigned\n"));
}
for (i = 0; i < rights.count; i++) {
static NTSTATUS enum_accounts_for_privilege(struct rpc_pipe_client *pipe_hnd,
TALLOC_CTX *ctx,
- POLICY_HND *pol,
+ struct policy_handle *pol,
const char *privilege)
{
- NTSTATUS result;
- uint32 enum_context=0;
- uint32 pref_max_length=0x1000;
+ NTSTATUS status, result;
+ uint32_t enum_context=0;
+ uint32_t pref_max_length=0x1000;
struct lsa_SidArray sid_array;
- int i;
+ uint32_t i;
fstring name;
+ struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
- result = rpccli_lsa_EnumAccounts(pipe_hnd, ctx,
+ status = dcerpc_lsa_EnumAccounts(b, ctx,
pol,
&enum_context,
&sid_array,
- pref_max_length);
-
+ pref_max_length,
+ &result);
+ if (!NT_STATUS_IS_OK(status))
+ return status;
if (!NT_STATUS_IS_OK(result))
return result;
for ( i=0; i<sid_array.num_sids; i++ ) {
- result = check_privilege_for_user(pipe_hnd, ctx, pol,
+ status = check_privilege_for_user(pipe_hnd, ctx, pol,
sid_array.sids[i].sid,
privilege);
- if ( ! NT_STATUS_IS_OK(result)) {
- if ( ! NT_STATUS_EQUAL(result, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
- return result;
+ if ( ! NT_STATUS_IS_OK(status)) {
+ if ( ! NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
+ return status;
}
continue;
}
/* try to convert the SID to a name. Fall back to
printing the raw SID if necessary */
- result = sid_to_name( pipe_hnd, ctx, sid_array.sids[i].sid, name );
- if ( !NT_STATUS_IS_OK (result) )
+ status = sid_to_name( pipe_hnd, ctx, sid_array.sids[i].sid, name );
+ if ( !NT_STATUS_IS_OK (status) )
sid_to_fstring(name, sid_array.sids[i].sid);
d_printf(" %s\n", name);
static NTSTATUS enum_privileges_for_accounts(struct rpc_pipe_client *pipe_hnd,
TALLOC_CTX *ctx,
- POLICY_HND *pol)
+ struct policy_handle *pol)
{
- NTSTATUS result;
- uint32 enum_context=0;
- uint32 pref_max_length=0x1000;
+ NTSTATUS status, result;
+ uint32_t enum_context=0;
+ uint32_t pref_max_length=0x1000;
struct lsa_SidArray sid_array;
- int i;
+ uint32_t i;
fstring name;
+ struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
- result = rpccli_lsa_EnumAccounts(pipe_hnd, ctx,
+ status = dcerpc_lsa_EnumAccounts(b, ctx,
pol,
&enum_context,
&sid_array,
- pref_max_length);
-
+ pref_max_length,
+ &result);
+ if (!NT_STATUS_IS_OK(status))
+ return status;
if (!NT_STATUS_IS_OK(result))
return result;
/* try to convert the SID to a name. Fall back to
printing the raw SID if necessary */
- result = sid_to_name(pipe_hnd, ctx, sid_array.sids[i].sid, name);
- if ( !NT_STATUS_IS_OK (result) )
+ status = sid_to_name(pipe_hnd, ctx, sid_array.sids[i].sid, name);
+ if ( !NT_STATUS_IS_OK (status) )
sid_to_fstring(name, sid_array.sids[i].sid);
d_printf("%s\n", name);
- result = enum_privileges_for_user(pipe_hnd, ctx, pol,
+ status = enum_privileges_for_user(pipe_hnd, ctx, pol,
sid_array.sids[i].sid);
- if ( !NT_STATUS_IS_OK(result) )
- return result;
+ if ( !NT_STATUS_IS_OK(status) )
+ return status;
d_printf("\n");
}
********************************************************************/
static NTSTATUS rpc_rights_list_internal(struct net_context *c,
- const DOM_SID *domain_sid,
+ const struct dom_sid *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
int argc,
const char **argv )
{
- POLICY_HND pol;
- NTSTATUS result;
- DOM_SID sid;
+ struct policy_handle pol;
+ NTSTATUS status, result;
+ struct dom_sid sid;
fstring privname;
struct lsa_String lsa_name;
struct lsa_StringLarge *description = NULL;
- uint16 lang_id = 0;
- uint16 lang_id_sys = 0;
- uint16 lang_id_desc;
+ uint16_t lang_id = 0;
+ uint16_t lang_id_sys = 0;
+ uint16_t lang_id_desc;
+ struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
- result = rpccli_lsa_open_policy(pipe_hnd, mem_ctx, True,
- SEC_RIGHTS_MAXIMUM_ALLOWED, &pol);
+ status = rpccli_lsa_open_policy(pipe_hnd, mem_ctx, true,
+ SEC_FLAG_MAXIMUM_ALLOWED, &pol);
- if ( !NT_STATUS_IS_OK(result) )
- return result;
+ if ( !NT_STATUS_IS_OK(status) )
+ return status;
- /* backwards compatibility; just list available privileges if no arguement */
+ /* backwards compatibility; just list available privileges if no argument */
if (argc == 0) {
- result = enum_privileges(pipe_hnd, mem_ctx, &pol );
+ status = enum_privileges(pipe_hnd, mem_ctx, &pol );
goto done;
}
int i = 1;
if (argv[1] == NULL) {
- result = enum_privileges(pipe_hnd, mem_ctx, &pol );
+ status = enum_privileges(pipe_hnd, mem_ctx, &pol );
goto done;
}
i++;
/* verify that this is a valid privilege for error reporting */
- result = rpccli_lsa_LookupPrivDisplayName(pipe_hnd, mem_ctx,
+ status = dcerpc_lsa_LookupPrivDisplayName(b, mem_ctx,
&pol,
&lsa_name,
lang_id,
lang_id_sys,
&description,
- &lang_id_desc);
-
+ &lang_id_desc,
+ &result);
+ if (!NT_STATUS_IS_OK(status)) {
+ continue;
+ }
+ status = result;
if ( !NT_STATUS_IS_OK(result) ) {
- if ( NT_STATUS_EQUAL( result, NT_STATUS_NO_SUCH_PRIVILEGE ) )
- d_fprintf(stderr, "No such privilege exists: %s.\n", privname);
+ if ( NT_STATUS_EQUAL(result, NT_STATUS_NO_SUCH_PRIVILEGE))
+ d_fprintf(stderr, _("No such privilege "
+ "exists: %s.\n"), privname);
else
- d_fprintf(stderr, "Error resolving privilege display name [%s].\n", nt_errstr(result));
+ d_fprintf(stderr, _("Error resolving "
+ "privilege display name "
+ "[%s].\n"),
+ nt_errstr(result));
continue;
}
- result = enum_accounts_for_privilege(pipe_hnd, mem_ctx, &pol, privname);
- if (!NT_STATUS_IS_OK(result)) {
- d_fprintf(stderr, "Error enumerating accounts for privilege %s [%s].\n",
- privname, nt_errstr(result));
+ status = enum_accounts_for_privilege(pipe_hnd, mem_ctx, &pol, privname);
+ if (!NT_STATUS_IS_OK(status)) {
+ d_fprintf(stderr, _("Error enumerating "
+ "accounts for privilege %s [%s].\n"),
+ privname, nt_errstr(status));
continue;
}
}
int i = 1;
if (argv[1] == NULL) {
- result = enum_privileges_for_accounts(pipe_hnd, mem_ctx, &pol);
+ status = enum_privileges_for_accounts(pipe_hnd, mem_ctx, &pol);
goto done;
}
while (argv[i] != NULL) {
- result = name_to_sid(pipe_hnd, mem_ctx, &sid, argv[i]);
- if (!NT_STATUS_IS_OK(result)) {
+ status = name_to_sid(pipe_hnd, mem_ctx, &sid, argv[i]);
+ if (!NT_STATUS_IS_OK(status)) {
goto done;
}
- result = enum_privileges_for_user(pipe_hnd, mem_ctx, &pol, &sid);
- if (!NT_STATUS_IS_OK(result)) {
+ status = enum_privileges_for_user(pipe_hnd, mem_ctx, &pol, &sid);
+ if (!NT_STATUS_IS_OK(status)) {
goto done;
}
i++;
goto done;
}
- /* backward comaptibility: if no keyword provided, treat the key
+ /* backward compatibility: if no keyword provided, treat the key
as an account name */
if (argc > 1) {
- d_printf("Usage: net rpc rights list [[accounts|privileges] [name|SID]]\n");
- result = NT_STATUS_OK;
+ d_printf("%s net rpc rights list [[accounts|privileges] "
+ "[name|SID]]\n", _("Usage:"));
+ status = NT_STATUS_OK;
goto done;
}
- result = name_to_sid(pipe_hnd, mem_ctx, &sid, argv[0]);
- if (!NT_STATUS_IS_OK(result)) {
+ status = name_to_sid(pipe_hnd, mem_ctx, &sid, argv[0]);
+ if (!NT_STATUS_IS_OK(status)) {
goto done;
}
- result = enum_privileges_for_user(pipe_hnd, mem_ctx, &pol, &sid );
+ status = enum_privileges_for_user(pipe_hnd, mem_ctx, &pol, &sid );
done:
- rpccli_lsa_Close(pipe_hnd, mem_ctx, &pol);
+ dcerpc_lsa_Close(b, mem_ctx, &pol, &result);
- return result;
+ return status;
}
/********************************************************************
********************************************************************/
static NTSTATUS rpc_rights_grant_internal(struct net_context *c,
- const DOM_SID *domain_sid,
+ const struct dom_sid *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
int argc,
const char **argv )
{
- POLICY_HND dom_pol;
- NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+ struct policy_handle dom_pol = {
+ .handle_type = 0,
+ };
+ NTSTATUS status, result;
struct lsa_RightSet rights;
int i;
+ struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
+ union lsa_revision_info out_revision_info = {
+ .info1 = {
+ .revision = 0,
+ },
+ };
+ uint32_t out_version = 0;
- DOM_SID sid;
+ struct dom_sid sid;
if (argc < 2 ) {
- d_printf("Usage: net rpc rights grant <name|SID> <rights...>\n");
+ d_printf("%s\n%s",
+ _("Usage:"),
+ _(" net rpc rights grant <name|SID> <rights...>\n"));
return NT_STATUS_OK;
}
- result = name_to_sid(pipe_hnd, mem_ctx, &sid, argv[0]);
- if (!NT_STATUS_IS_OK(result))
- return result;
+ status = name_to_sid(pipe_hnd, mem_ctx, &sid, argv[0]);
+ if (NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED))
+ status = NT_STATUS_NO_SUCH_USER;
- result = rpccli_lsa_open_policy2(pipe_hnd, mem_ctx, True,
- SEC_RIGHTS_MAXIMUM_ALLOWED,
- &dom_pol);
+ if (!NT_STATUS_IS_OK(status))
+ goto done;
- if (!NT_STATUS_IS_OK(result))
- return result;
+ status = dcerpc_lsa_open_policy_fallback(b,
+ mem_ctx,
+ pipe_hnd->srv_name_slash,
+ true,
+ SEC_FLAG_MAXIMUM_ALLOWED,
+ &out_version,
+ &out_revision_info,
+ &dom_pol,
+ &result);
+ if (any_nt_status_not_ok(status, result, &status)) {
+ DBG_DEBUG("Couldn't open policy handle: %s\n",
+ nt_errstr(status));
+ goto done;
+ }
rights.count = argc-1;
- rights.names = TALLOC_ARRAY(mem_ctx, struct lsa_StringLarge,
+ rights.names = talloc_array(mem_ctx, struct lsa_StringLarge,
rights.count);
- if (!rights.names) {
- return NT_STATUS_NO_MEMORY;
+ if (rights.names == NULL) {
+ status = NT_STATUS_NO_MEMORY;
+ goto done;
}
for (i=0; i<argc-1; i++) {
init_lsa_StringLarge(&rights.names[i], argv[i+1]);
}
- result = rpccli_lsa_AddAccountRights(pipe_hnd, mem_ctx,
+ status = dcerpc_lsa_AddAccountRights(b, mem_ctx,
&dom_pol,
&sid,
- &rights);
-
- if (!NT_STATUS_IS_OK(result))
+ &rights,
+ &result);
+ if (any_nt_status_not_ok(status, result, &status)) {
goto done;
+ }
- d_printf("Successfully granted rights.\n");
+ d_printf(_("Successfully granted rights.\n"));
done:
- if ( !NT_STATUS_IS_OK(result) ) {
- d_fprintf(stderr, "Failed to grant privileges for %s (%s)\n",
- argv[0], nt_errstr(result));
+ if ( !NT_STATUS_IS_OK(status) ) {
+ d_fprintf(stderr, _("Failed to grant privileges for %s (%s)\n"),
+ argv[0], nt_errstr(status));
}
- rpccli_lsa_Close(pipe_hnd, mem_ctx, &dom_pol);
+ dcerpc_lsa_Close(b, mem_ctx, &dom_pol, &result);
- return result;
+ return status;
}
/********************************************************************
********************************************************************/
static NTSTATUS rpc_rights_revoke_internal(struct net_context *c,
- const DOM_SID *domain_sid,
+ const struct dom_sid *domain_sid,
const char *domain_name,
struct cli_state *cli,
struct rpc_pipe_client *pipe_hnd,
int argc,
const char **argv )
{
- POLICY_HND dom_pol;
- NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+ struct policy_handle dom_pol;
+ NTSTATUS status, result;
struct lsa_RightSet rights;
- DOM_SID sid;
+ struct dom_sid sid;
int i;
+ struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
+ union lsa_revision_info out_revision_info = {
+ .info1 =
+ {
+ .revision = 0,
+ },
+ };
+ uint32_t out_version = 0;
if (argc < 2 ) {
- d_printf("Usage: net rpc rights revoke <name|SID> <rights...>\n");
+ d_printf("%s\n%s",
+ _("Usage:"),
+ _(" net rpc rights revoke <name|SID> <rights...>\n"));
return NT_STATUS_OK;
}
- result = name_to_sid(pipe_hnd, mem_ctx, &sid, argv[0]);
- if (!NT_STATUS_IS_OK(result))
- return result;
-
- result = rpccli_lsa_open_policy2(pipe_hnd, mem_ctx, True,
- SEC_RIGHTS_MAXIMUM_ALLOWED,
- &dom_pol);
-
- if (!NT_STATUS_IS_OK(result))
- return result;
+ status = name_to_sid(pipe_hnd, mem_ctx, &sid, argv[0]);
+ if (!NT_STATUS_IS_OK(status))
+ return status;
+
+ status = dcerpc_lsa_open_policy_fallback(b,
+ mem_ctx,
+ pipe_hnd->srv_name_slash,
+ true,
+ SEC_FLAG_MAXIMUM_ALLOWED,
+ &out_version,
+ &out_revision_info,
+ &dom_pol,
+ &result);
+ if (any_nt_status_not_ok(status, result, &status)) {
+ DBG_DEBUG("Couldn't open policy handle: %s\n",
+ nt_errstr(status));
+ return status;
+ }
rights.count = argc-1;
- rights.names = TALLOC_ARRAY(mem_ctx, struct lsa_StringLarge,
+ rights.names = talloc_array(mem_ctx, struct lsa_StringLarge,
rights.count);
if (!rights.names) {
return NT_STATUS_NO_MEMORY;
init_lsa_StringLarge(&rights.names[i], argv[i+1]);
}
- result = rpccli_lsa_RemoveAccountRights(pipe_hnd, mem_ctx,
+ status = dcerpc_lsa_RemoveAccountRights(b, mem_ctx,
&dom_pol,
&sid,
false,
- &rights);
-
- if (!NT_STATUS_IS_OK(result))
+ &rights,
+ &result);
+ if (!NT_STATUS_IS_OK(status))
+ goto done;
+ if (!NT_STATUS_IS_OK(result)) {
+ status = result;
goto done;
+ }
- d_printf("Successfully revoked rights.\n");
+ d_printf(_("Successfully revoked rights.\n"));
done:
- if ( !NT_STATUS_IS_OK(result) ) {
- d_fprintf(stderr, "Failed to revoke privileges for %s (%s)\n",
- argv[0], nt_errstr(result));
+ if ( !NT_STATUS_IS_OK(status) ) {
+ d_fprintf(stderr,_("Failed to revoke privileges for %s (%s)\n"),
+ argv[0], nt_errstr(status));
}
- rpccli_lsa_Close(pipe_hnd, mem_ctx, &dom_pol);
+ dcerpc_lsa_Close(b, mem_ctx, &dom_pol, &result);
- return result;
+ return status;
}
static int rpc_rights_list(struct net_context *c, int argc, const char **argv )
{
- return run_rpc_command(c, NULL, PI_LSARPC, 0,
+ if (c->display_usage) {
+ d_printf("%s\n%s",
+ _("Usage:"),
+ _("net rpc rights list [{accounts|privileges} "
+ "[name|SID]]\n"
+ " View available/assigned privileges\n"));
+ return 0;
+ }
+
+ return run_rpc_command(c, NULL, &ndr_table_lsarpc, 0,
rpc_rights_list_internal, argc, argv );
}
static int rpc_rights_grant(struct net_context *c, int argc, const char **argv )
{
- return run_rpc_command(c, NULL, PI_LSARPC, 0,
+ if (c->display_usage) {
+ d_printf("%s\n%s",
+ _("Usage:"),
+ _("net rpc rights grant <name|SID> <right>\n"
+ " Assign privilege[s]\n"));
+ d_printf(_("For example:\n"
+ " net rpc rights grant 'VALE\\biddle' "
+ "SePrintOperatorPrivilege SeDiskOperatorPrivilege\n"
+ " would grant the printer admin and disk manager "
+ "rights to the user 'VALE\\biddle'\n"));
+ return 0;
+ }
+
+ return run_rpc_command(c, NULL, &ndr_table_lsarpc, 0,
rpc_rights_grant_internal, argc, argv );
}
static int rpc_rights_revoke(struct net_context *c, int argc, const char **argv)
{
- return run_rpc_command(c, NULL, PI_LSARPC, 0,
- rpc_rights_revoke_internal, argc, argv );
-}
-
-/********************************************************************
-********************************************************************/
-
-static int net_help_rights(struct net_context *c, int argc, const char **argv )
-{
- d_printf("net rpc rights list [{accounts|privileges} [name|SID]] View available or assigned privileges\n");
- d_printf("net rpc rights grant <name|SID> <right> Assign privilege[s]\n");
- d_printf("net rpc rights revoke <name|SID> <right> Revoke privilege[s]\n");
-
- d_printf("\nBoth 'grant' and 'revoke' require a SID and a list of privilege names.\n");
- d_printf("For example\n");
- d_printf("\n net rpc rights grant 'VALE\\biddle' SePrintOperatorPrivilege SeDiskOperatorPrivilege\n");
- d_printf("\nwould grant the printer admin and disk manager rights to the user 'VALE\\biddle'\n\n");
+ if (c->display_usage) {
+ d_printf("%s\n%s",
+ _("Usage:"),
+ _("net rpc rights revoke <name|SID> <right>\n"
+ " Revoke privilege[s]\n"));
+ d_printf(_("For example:\n"
+ " net rpc rights revoke 'VALE\\biddle' "
+ "SePrintOperatorPrivilege SeDiskOperatorPrivilege\n"
+ " would revoke the printer admin and disk manager"
+ " rights from the user 'VALE\\biddle'\n"));
+ return 0;
+ }
- return -1;
+ return run_rpc_command(c, NULL, &ndr_table_lsarpc, 0,
+ rpc_rights_revoke_internal, argc, argv );
}
/********************************************************************
int net_rpc_rights(struct net_context *c, int argc, const char **argv)
{
struct functable func[] = {
- {"list", rpc_rights_list},
- {"grant", rpc_rights_grant},
- {"revoke", rpc_rights_revoke},
- {NULL, NULL}
+ {
+ "list",
+ rpc_rights_list,
+ NET_TRANSPORT_RPC,
+ N_("View available/assigned privileges"),
+ N_("net rpc rights list\n"
+ " View available/assigned privileges")
+ },
+ {
+ "grant",
+ rpc_rights_grant,
+ NET_TRANSPORT_RPC,
+ N_("Assign privilege[s]"),
+ N_("net rpc rights grant\n"
+ " Assign privilege[s]")
+ },
+ {
+ "revoke",
+ rpc_rights_revoke,
+ NET_TRANSPORT_RPC,
+ N_("Revoke privilege[s]"),
+ N_("net rpc rights revoke\n"
+ " Revoke privilege[s]")
+ },
+ {NULL, NULL, 0, NULL, NULL}
};
- if ( argc )
- return net_run_function(c, argc, argv, func, net_help_rights );
-
- return net_help_rights(c, argc, argv );
+ return net_run_function(c, argc, argv, "net rpc rights", func);
}
static NTSTATUS rpc_sh_rights_list(struct net_context *c,
{
static struct rpc_sh_cmd cmds[] = {
- { "list", NULL, PI_LSARPC, rpc_sh_rights_list,
- "View available or assigned privileges" },
+ { "list", NULL, &ndr_table_lsarpc, rpc_sh_rights_list,
+ N_("View available or assigned privileges") },
- { "grant", NULL, PI_LSARPC, rpc_sh_rights_grant,
- "Assign privilege[s]" },
+ { "grant", NULL, &ndr_table_lsarpc, rpc_sh_rights_grant,
+ N_("Assign privilege[s]") },
- { "revoke", NULL, PI_LSARPC, rpc_sh_rights_revoke,
- "Revoke privilege[s]" },
+ { "revoke", NULL, &ndr_table_lsarpc, rpc_sh_rights_revoke,
+ N_("Revoke privilege[s]") },
{ NULL, NULL, 0, NULL, NULL }
};
git.samba.org / samba.git / blobdiff