#include "includes.h"
#include "utils/net.h"
+#include "../librpc/gen_ndr/cli_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
+#include "../librpc/gen_ndr/cli_dssetup.h"
+#include "secrets.h"
+#include "../libcli/security/security.h"
NTSTATUS net_rpc_lookup_name(struct net_context *c,
TALLOC_CTX *mem_ctx, struct cli_state *cli,
const char *name, const char **ret_domain,
- const char **ret_name, DOM_SID *ret_sid,
+ const char **ret_name, struct dom_sid *ret_sid,
enum lsa_SidType *ret_type)
{
- struct rpc_pipe_client *lsa_pipe;
+ struct rpc_pipe_client *lsa_pipe = NULL;
struct policy_handle pol;
NTSTATUS result = NT_STATUS_OK;
const char **dom_names;
- DOM_SID *sids;
+ struct dom_sid *sids;
enum lsa_SidType *types;
ZERO_STRUCT(pol);
result = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id,
&lsa_pipe);
if (!NT_STATUS_IS_OK(result)) {
- d_fprintf(stderr, "Could not initialise lsa pipe\n");
+ d_fprintf(stderr, _("Could not initialise lsa pipe\n"));
return result;
}
result = rpccli_lsa_open_policy(lsa_pipe, mem_ctx, false,
- SEC_RIGHTS_MAXIMUM_ALLOWED,
+ SEC_FLAG_MAXIMUM_ALLOWED,
&pol);
if (!NT_STATUS_IS_OK(result)) {
- d_fprintf(stderr, "open_policy failed: %s\n",
+ d_fprintf(stderr, "open_policy %s: %s\n", _("failed"),
nt_errstr(result));
return result;
}
flags |= CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS;
}
+ if (c->opt_ccache) {
+ flags |= CLI_FULL_CONNECTION_USE_CCACHE;
+ }
+
nt_status = cli_full_connection(cli_ctx, NULL, server_name,
server_ss, c->opt_port,
service_name, service_type,
c->opt_user_name, c->opt_workgroup,
- c->opt_password, flags, Undefined, NULL);
+ c->opt_password, flags, Undefined);
if (!NT_STATUS_IS_OK(nt_status)) {
- d_fprintf(stderr, "Could not connect to server %s\n", server_name);
+ d_fprintf(stderr, _("Could not connect to server %s\n"),
+ server_name);
/* Display a nicer message depending on the result */
if (NT_STATUS_V(nt_status) ==
NT_STATUS_V(NT_STATUS_LOGON_FAILURE))
- d_fprintf(stderr, "The username or password was not correct.\n");
+ d_fprintf(stderr,
+ _("The username or password was not "
+ "correct.\n"));
if (NT_STATUS_V(nt_status) ==
NT_STATUS_V(NT_STATUS_ACCOUNT_LOCKED_OUT))
- d_fprintf(stderr, "The account was locked out.\n");
+ d_fprintf(stderr, _("The account was locked out.\n"));
if (NT_STATUS_V(nt_status) ==
NT_STATUS_V(NT_STATUS_ACCOUNT_DISABLED))
- d_fprintf(stderr, "The account was disabled.\n");
+ d_fprintf(stderr, _("The account was disabled.\n"));
return nt_status;
}
c->opt_workgroup);
if (NT_STATUS_EQUAL(nt_status,NT_STATUS_NOT_SUPPORTED)) {
- d_printf("Encryption required and "
+ d_printf(_("Encryption required and "
"server that doesn't support "
- "UNIX extensions - failing connect\n");
+ "UNIX extensions - failing connect\n"));
} else if (NT_STATUS_EQUAL(nt_status,NT_STATUS_UNKNOWN_REVISION)) {
- d_printf("Encryption required and "
+ d_printf(_("Encryption required and "
"can't get UNIX CIFS extensions "
- "version from server.\n");
+ "version from server.\n"));
} else if (NT_STATUS_EQUAL(nt_status,NT_STATUS_UNSUPPORTED_COMPRESSION)) {
- d_printf("Encryption required and "
+ d_printf(_("Encryption required and "
"share %s doesn't support "
- "encryption.\n", service_name);
+ "encryption.\n"), service_name);
} else if (!NT_STATUS_IS_OK(nt_status)) {
- d_printf("Encryption required and "
- "setup failed with error %s.\n",
+ d_printf(_("Encryption required and "
+ "setup failed with error %s.\n"),
nt_errstr(nt_status));
}
server_name, server_ss, c->opt_port,
"IPC$", "IPC",
"", "",
- "", 0, Undefined, NULL);
+ "", 0, Undefined);
if (NT_STATUS_IS_OK(nt_status)) {
return nt_status;
user_and_realm, c->opt_workgroup,
c->opt_password,
CLI_FULL_CONNECTION_USE_KERBEROS,
- Undefined, NULL);
+ Undefined);
SAFE_FREE(user_and_realm);
char *user_name = NULL;
if (!secrets_init()) {
- d_fprintf(stderr, "ERROR: Unable to open secrets database\n");
+ d_fprintf(stderr,_("ERROR: Unable to open secrets database\n"));
exit(1);
}
char *user_name = NULL;
if (!secrets_init()) {
- d_fprintf(stderr, "ERROR: Unable to open secrets database\n");
+ d_fprintf(stderr,_("ERROR: Unable to open secrets database\n"));
exit(1);
}
}
} else if (*server_name) {
/* resolve the IP address */
- if (!resolve_name(*server_name, server_ss, 0x20)) {
+ if (!resolve_name(*server_name, server_ss, 0x20, false)) {
DEBUG(1,("Unable to resolve server name\n"));
return false;
}
struct sockaddr_storage msbrow_ss;
char addr[INET6_ADDRSTRLEN];
- /* if (!resolve_name(MSBROWSE, &msbrow_ip, 1)) */
- if (!resolve_name(d, &msbrow_ss, 0x1B)) {
+ /* if (!resolve_name(MSBROWSE, &msbrow_ip, 1, false)) */
+ if (!resolve_name(d, &msbrow_ss, 0x1B, false)) {
DEBUG(1,("Unable to resolve domain browser via name lookup\n"));
return false;
}
} else if (flags & NET_FLAGS_MASTER) {
struct sockaddr_storage brow_ss;
char addr[INET6_ADDRSTRLEN];
- if (!resolve_name(d, &brow_ss, 0x1D)) {
+ if (!resolve_name(d, &brow_ss, 0x1D, false)) {
/* go looking for workgroups */
DEBUG(1,("Unable to resolve master browser via name lookup\n"));
return false;
if ( !server || !pss ) {
if (!net_find_server(c, domain, flags, &server_ss,
&server_name)) {
- d_fprintf(stderr, "Unable to find a suitable server "
- "for domain %s\n", domain);
+ d_fprintf(stderr, _("Unable to find a suitable server "
+ "for domain %s\n"), domain);
nt_status = NT_STATUS_UNSUCCESSFUL;
goto done;
}
SAFE_FREE(server_name);
if (!NT_STATUS_IS_OK(nt_status)) {
- d_fprintf(stderr, "Connection failed: %s\n",
+ d_fprintf(stderr, _("Connection failed: %s\n"),
nt_errstr(nt_status));
cli = NULL;
} else if (c->opt_request_timeout) {
return NULL;
}
- if (asprintf(&prompt, "Enter %s's password:", user) == -1) {
+ if (asprintf(&prompt, _("Enter %s's password:"), user) == -1) {
return NULL;
}
}
if (c->display_usage == false) {
- d_fprintf(stderr, "Invalid command: %s %s\n", whoami,
+ d_fprintf(stderr, _("Invalid command: %s %s\n"), whoami,
(argc > 0)?argv[0]:"");
}
- d_printf("Usage:\n");
+ d_printf(_("Usage:\n"));
for (i=0; table[i].funcname != NULL; i++) {
if(c->display_usage == false)
d_printf("%s %-15s %s\n", whoami, table[i].funcname,
- table[i].description);
+ _(table[i].description));
else
- d_printf("%s\n", table[i].usage);
+ d_printf("%s\n", _(table[i].usage));
}
return c->display_usage?0:-1;
{
int i;
for (i=0; table[i].funcname != NULL; i++) {
- d_printf("%s\n", table[i].usage);
+ d_printf("%s\n", _(table[i].usage));
}
}
const char *net_share_type_str(int num_type)
{
switch(num_type) {
- case 0: return "Disk";
- case 1: return "Print";
- case 2: return "Dev";
- case 3: return "IPC";
- default: return "Unknown";
+ case 0: return _("Disk");
+ case 1: return _("Print");
+ case 2: return _("Dev");
+ case 3: return _("IPC");
+ default: return _("Unknown");
}
}
git.samba.org / nivanova / samba-autobuild / .git / blobdiff