-/*
- Samba Unix/Linux SMB client library
- Distributed SMB/CIFS Server Management Utility
+/*
+ Samba Unix/Linux SMB client library
+ Distributed SMB/CIFS Server Management Utility
Copyright (C) 2001 Steve French (sfrench@us.ibm.com)
Copyright (C) 2001 Jim McDonough (jmcd@us.ibm.com)
Copyright (C) 2001 Andrew Tridgell (tridge@samba.org)
Copyright (C) 2001 Andrew Bartlett (abartlet@samba.org)
+ Copyright (C) 2008 Kai Blin (kai@samba.org)
Originally written by Steve and Jim. Largely rewritten by tridge in
November 2001.
Reworked again by abartlet in December 2001
+ Another overhaul, moving functionality into plug-ins loaded on demand by Kai
+ in May 2008.
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
/*****************************************************/
/* */
/* Distributed SMB/CIFS Server Management Utility */
/*****************************************************/
#include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
+
+extern bool AllowDebugChange;
+
+#ifdef WITH_FAKE_KASERVER
+#include "utils/net_afs.h"
+#endif
/***********************************************************************/
/* Beginning of internationalization section. Translatable constants */
#define YES_STRING "Yes"
#define NO_STRING "No"
-/************************************************************************************/
-/* end of internationalization section */
-/************************************************************************************/
-
-/* Yes, these buggers are globals.... */
-const char *opt_requester_name = NULL;
-const char *opt_host = NULL;
-const char *opt_password = NULL;
-const char *opt_user_name = NULL;
-BOOL opt_user_specified = False;
-const char *opt_workgroup = NULL;
-int opt_long_list_entries = 0;
-int opt_reboot = 0;
-int opt_force = 0;
-int opt_port = 0;
-int opt_maxusers = -1;
-const char *opt_comment = "";
-const char *opt_container = "cn=Users";
-int opt_flags = -1;
-int opt_timeout = 0;
-const char *opt_target_workgroup = NULL;
-int opt_machine_pass = 0;
-
-BOOL opt_have_ip = False;
-struct in_addr opt_dest_ip;
-
-extern BOOL AllowDebugChange;
-
-uint32 get_sec_channel_type(const char *param)
+/***********************************************************************/
+/* end of internationalization section */
+/***********************************************************************/
+
+uint32 get_sec_channel_type(const char *param)
{
if (!(param && *param)) {
return get_default_sec_channel();
return SEC_CHAN_BDC;
} else if (strequal(param, "MEMBER")) {
return SEC_CHAN_WKSTA;
-#if 0
+#if 0
} else if (strequal(param, "DOMAIN")) {
return SEC_CHAN_DOMAIN;
#endif
}
}
-/*
- run a function from a function table. If not found then
- call the specified usage function
-*/
-int net_run_function(int argc, const char **argv, struct functable *table,
- int (*usage_fn)(int argc, const char **argv))
-{
- int i;
-
- if (argc < 1) {
- d_printf("\nUsage: \n");
- return usage_fn(argc, argv);
- }
- for (i=0; table[i].funcname; i++) {
- if (StrCaseCmp(argv[0], table[i].funcname) == 0)
- return table[i].fn(argc-1, argv+1);
- }
- d_printf("No command: %s\n", argv[0]);
- return usage_fn(argc, argv);
-}
-
-
-/****************************************************************************
-connect to \\server\ipc$
-****************************************************************************/
-NTSTATUS connect_to_ipc(struct cli_state **c, struct in_addr *server_ip,
- const char *server_name)
-{
- NTSTATUS nt_status;
-
- if (!opt_password && !opt_machine_pass) {
- char *pass = getpass("Password:");
- if (pass) {
- opt_password = strdup(pass);
- }
- }
-
- nt_status = cli_full_connection(c, opt_requester_name, server_name,
- server_ip, opt_port,
- "IPC$", "IPC",
- opt_user_name, opt_workgroup,
- opt_password, 0, Undefined, NULL);
-
- if (NT_STATUS_IS_OK(nt_status)) {
- return nt_status;
- } else {
- DEBUG(1,("Cannot connect to server. Error was %s\n",
- nt_errstr(nt_status)));
-
- /* Display a nicer message depending on the result */
-
- if (NT_STATUS_V(nt_status) ==
- NT_STATUS_V(NT_STATUS_LOGON_FAILURE))
- d_printf("The username or password was not correct.\n");
-
- if (NT_STATUS_V(nt_status) ==
- NT_STATUS_V(NT_STATUS_ACCOUNT_LOCKED_OUT))
- d_printf("The account was locked out.\n");
-
- if (NT_STATUS_V(nt_status) ==
- NT_STATUS_V(NT_STATUS_ACCOUNT_DISABLED))
- d_printf("The account was disabled.\n");
-
- return nt_status;
- }
-}
-
-/****************************************************************************
-connect to \\server\ipc$ anonymously
-****************************************************************************/
-NTSTATUS connect_to_ipc_anonymous(struct cli_state **c,
- struct in_addr *server_ip, const char *server_name)
-{
- NTSTATUS nt_status;
-
- nt_status = cli_full_connection(c, opt_requester_name, server_name,
- server_ip, opt_port,
- "IPC$", "IPC",
- "", "",
- "", 0, Undefined, NULL);
-
- if (NT_STATUS_IS_OK(nt_status)) {
- return nt_status;
- } else {
- DEBUG(1,("Cannot connect to server (anonymously). Error was %s\n", nt_errstr(nt_status)));
- return nt_status;
- }
-}
-
-/****************************************************************************
- Use the local machine's password for this session
-****************************************************************************/
-int net_use_machine_password(void)
-{
- char *user_name = NULL;
-
- if (!secrets_init()) {
- d_printf("ERROR: Unable to open secrets database\n");
- exit(1);
- }
-
- user_name = NULL;
- opt_password = secrets_fetch_machine_password(opt_target_workgroup, NULL, NULL);
- if (asprintf(&user_name, "%s$@%s", global_myname(), lp_realm()) == -1) {
- return -1;
- }
- opt_user_name = user_name;
- return 0;
-}
-
-BOOL net_find_server(unsigned flags, struct in_addr *server_ip, char **server_name)
-{
-
- if (opt_host) {
- *server_name = strdup(opt_host);
- }
-
- if (opt_have_ip) {
- *server_ip = opt_dest_ip;
- if (!*server_name) {
- *server_name = strdup(inet_ntoa(opt_dest_ip));
- }
- } else if (*server_name) {
- /* resolve the IP address */
- if (!resolve_name(*server_name, server_ip, 0x20)) {
- DEBUG(1,("Unable to resolve server name\n"));
- return False;
- }
- } else if (flags & NET_FLAGS_PDC) {
- struct in_addr pdc_ip;
-
- if (get_pdc_ip(opt_target_workgroup, &pdc_ip)) {
- fstring dc_name;
-
- if (is_zero_ip(pdc_ip))
- return False;
-
- if ( !name_status_find(opt_target_workgroup, 0x1b, 0x20, pdc_ip, dc_name) )
- return False;
-
- *server_name = strdup(dc_name);
- *server_ip = pdc_ip;
- }
-
- } else if (flags & NET_FLAGS_DMB) {
- struct in_addr msbrow_ip;
- /* if (!resolve_name(MSBROWSE, &msbrow_ip, 1)) */
- if (!resolve_name(opt_target_workgroup, &msbrow_ip, 0x1B)) {
- DEBUG(1,("Unable to resolve domain browser via name lookup\n"));
- return False;
- } else {
- *server_ip = msbrow_ip;
- }
- *server_name = strdup(inet_ntoa(opt_dest_ip));
- } else if (flags & NET_FLAGS_MASTER) {
- struct in_addr brow_ips;
- if (!resolve_name(opt_target_workgroup, &brow_ips, 0x1D)) {
- /* go looking for workgroups */
- DEBUG(1,("Unable to resolve master browser via name lookup\n"));
- return False;
- } else {
- *server_ip = brow_ips;
- }
- *server_name = strdup(inet_ntoa(opt_dest_ip));
- } else if (!(flags & NET_FLAGS_LOCALHOST_DEFAULT_INSANE)) {
- extern struct in_addr loopback_ip;
- *server_ip = loopback_ip;
- *server_name = strdup("127.0.0.1");
- }
-
- if (!server_name || !*server_name) {
- DEBUG(1,("no server to connect to\n"));
- return False;
- }
-
- return True;
-}
-
-
-BOOL net_find_pdc(struct in_addr *server_ip, fstring server_name, const char *domain_name)
-{
- if (get_pdc_ip(domain_name, server_ip)) {
- if (is_zero_ip(*server_ip))
- return False;
-
- if (!name_status_find(domain_name, 0x1b, 0x20, *server_ip, server_name))
- return False;
-
- return True;
- }
- else
- return False;
-}
-
-
-struct cli_state *net_make_ipc_connection(unsigned flags)
-{
- char *server_name = NULL;
- struct in_addr server_ip;
- struct cli_state *cli = NULL;
- NTSTATUS nt_status;
-
- if (!net_find_server(flags, &server_ip, &server_name)) {
- d_printf("\nUnable to find a suitable server\n");
- return NULL;
- }
-
- if (flags & NET_FLAGS_ANONYMOUS) {
- nt_status = connect_to_ipc_anonymous(&cli, &server_ip, server_name);
- } else {
- nt_status = connect_to_ipc(&cli, &server_ip, server_name);
- }
-
- SAFE_FREE(server_name);
- if (NT_STATUS_IS_OK(nt_status)) {
- return cli;
- } else {
- return NULL;
- }
-}
-
-static int net_user(int argc, const char **argv)
-{
- if (net_ads_check() == 0)
- return net_ads_user(argc, argv);
-
- /* if server is not specified, default to PDC? */
- if (net_rpc_check(NET_FLAGS_PDC))
- return net_rpc_user(argc, argv);
-
- return net_rap_user(argc, argv);
-}
-
-static int net_group(int argc, const char **argv)
+static int net_changetrustpw(struct net_context *c, int argc, const char **argv)
{
- if (net_ads_check() == 0)
- return net_ads_group(argc, argv);
-
- if (argc == 0 && net_rpc_check(NET_FLAGS_PDC))
- return net_rpc_group(argc, argv);
+ if (net_ads_check_our_domain(c) == 0)
+ return net_ads_changetrustpw(c, argc, argv);
- return net_rap_group(argc, argv);
+ return net_rpc_changetrustpw(c, argc, argv);
}
-static int net_join(int argc, const char **argv)
+static void set_line_buffering(FILE *f)
{
- if (net_ads_check() == 0) {
- if (net_ads_join(argc, argv) == 0)
- return 0;
- else
- d_printf("ADS join did not work, falling back to RPC...\n");
- }
- return net_rpc_join(argc, argv);
+ setvbuf(f, NULL, _IOLBF, 0);
}
-static int net_changetrustpw(int argc, const char **argv)
-{
- if (net_ads_check() == 0)
- return net_ads_changetrustpw(argc, argv);
-
- return net_rpc_changetrustpw(argc, argv);
-}
-
-static int net_changesecretpw(int argc, const char **argv)
+static int net_changesecretpw(struct net_context *c, int argc,
+ const char **argv)
{
char *trust_pw;
uint32 sec_channel_type = SEC_CHAN_WKSTA;
- if(opt_force) {
- trust_pw = getpass("Enter machine password: ");
+ if(c->opt_force) {
+ if (c->opt_stdin) {
+ set_line_buffering(stdin);
+ set_line_buffering(stdout);
+ set_line_buffering(stderr);
+ }
+
+ trust_pw = get_pass("Enter machine password: ", c->opt_stdin);
if (!secrets_store_machine_password(trust_pw, lp_workgroup(), sec_channel_type)) {
- d_printf("Unable to write the machine account password in the secrets database");
+ d_fprintf(stderr, "Unable to write the machine account password in the secrets database");
return 1;
}
else {
return 0;
}
-static int net_share(int argc, const char **argv)
-{
- if (net_rpc_check(0))
- return net_rpc_share(argc, argv);
- return net_rap_share(argc, argv);
-}
-
-static int net_file(int argc, const char **argv)
-{
- if (net_rpc_check(0))
- return net_rpc_file(argc, argv);
- return net_rap_file(argc, argv);
-}
-
/*
Retrieve our local SID or the SID for the specified name
*/
-static int net_getlocalsid(int argc, const char **argv)
+static int net_getlocalsid(struct net_context *c, int argc, const char **argv)
{
DOM_SID sid;
const char *name;
name = global_myname();
}
- if(!initialize_password_db(False)) {
+ if(!initialize_password_db(false, NULL)) {
DEBUG(0, ("WARNING: Could not open passdb - local sid may not reflect passdb\n"
- "backend knowlege (such as the sid stored in LDAP)\n"));
+ "backend knowledge (such as the sid stored in LDAP)\n"));
}
+ /* first check to see if we can even access secrets, so we don't
+ panic when we can't. */
+
+ if (!secrets_init()) {
+ d_fprintf(stderr, "Unable to open secrets.tdb. Can't fetch domain SID for name: %s\n", name);
+ return 1;
+ }
+
+ /* Generate one, if it doesn't exist */
+ get_global_sam_sid();
+
if (!secrets_fetch_domain_sid(name, &sid)) {
- DEBUG(0, ("Can't fetch domain SID for name: %s\n", name));
+ DEBUG(0, ("Can't fetch domain SID for name: %s\n", name));
return 1;
}
- sid_to_string(sid_str, &sid);
+ sid_to_fstring(sid_str, &sid);
d_printf("SID for domain %s is: %s\n", name, sid_str);
return 0;
}
-static int net_setlocalsid(int argc, const char **argv)
+static int net_setlocalsid(struct net_context *c, int argc, const char **argv)
{
DOM_SID sid;
return 0;
}
-static int net_getdomainsid(int argc, const char **argv)
+static int net_setdomainsid(struct net_context *c, int argc, const char **argv)
{
- DOM_SID domain_sid;
- fstring sid_str;
-
- if(!initialize_password_db(False)) {
- DEBUG(0, ("WARNING: Could not open passdb - domain sid may not reflect passdb\n"
- "backend knowlege (such as the sid stored in LDAP)\n"));
- }
+ DOM_SID sid;
- if (!secrets_fetch_domain_sid(global_myname(), &domain_sid)) {
- d_printf("Could not fetch local SID\n");
+ if ( (argc != 1)
+ || (strncmp(argv[0], "S-1-5-21-", strlen("S-1-5-21-")) != 0)
+ || (!string_to_sid(&sid, argv[0]))
+ || (sid.num_auths != 4)) {
+ d_printf("usage: net setdomainsid S-1-5-21-x-y-z\n");
return 1;
}
- sid_to_string(sid_str, &domain_sid);
- d_printf("SID for domain %s is: %s\n", global_myname(), sid_str);
- if (!secrets_fetch_domain_sid(opt_workgroup, &domain_sid)) {
- d_printf("Could not fetch domain SID\n");
+ if (!secrets_store_domain_sid(lp_workgroup(), &sid)) {
+ DEBUG(0,("Can't store domain SID.\n"));
return 1;
}
- sid_to_string(sid_str, &domain_sid);
- d_printf("SID for domain %s is: %s\n", opt_workgroup, sid_str);
-
return 0;
}
-#ifdef WITH_FAKE_KASERVER
-
-int net_afskey_usage(int argc, const char **argv)
+static int net_getdomainsid(struct net_context *c, int argc, const char **argv)
{
- d_printf(" net afskey filename\n"
- "\tImports a OpenAFS KeyFile into our secrets.tdb\n\n");
- return -1;
-}
+ DOM_SID domain_sid;
+ fstring sid_str;
-static int net_afskey(int argc, const char **argv)
-{
- int fd;
- struct afs_keyfile keyfile;
+ if (argc > 0) {
+ d_printf("usage: net getdomainsid\n");
+ return 1;
+ }
- if (argc != 2) {
- d_printf("usage: 'net afskey <keyfile> cell'\n");
- return -1;
+ if(!initialize_password_db(false, NULL)) {
+ DEBUG(0, ("WARNING: Could not open passdb - domain SID may "
+ "not reflect passdb\n"
+ "backend knowledge (such as the SID stored in "
+ "LDAP)\n"));
}
+ /* first check to see if we can even access secrets, so we don't
+ panic when we can't. */
+
if (!secrets_init()) {
- d_printf("Could not open secrets.tdb\n");
- return -1;
+ d_fprintf(stderr, "Unable to open secrets.tdb. Can't fetch domain"
+ "SID for name: %s\n", get_global_sam_name());
+ return 1;
}
- if ((fd = open(argv[0], O_RDONLY, 0)) < 0) {
- d_printf("Could not open %s\n", argv[0]);
- return -1;
- }
+ /* Generate one, if it doesn't exist */
+ get_global_sam_sid();
- if (read(fd, &keyfile, sizeof(keyfile)) != sizeof(keyfile)) {
- d_printf("Could not read keyfile\n");
- return -1;
+ if (!secrets_fetch_domain_sid(global_myname(), &domain_sid)) {
+ d_fprintf(stderr, "Could not fetch local SID\n");
+ return 1;
}
+ sid_to_fstring(sid_str, &domain_sid);
+ d_printf("SID for local machine %s is: %s\n", global_myname(), sid_str);
- if (!secrets_store_afs_keyfile(argv[1], &keyfile)) {
- d_printf("Could not write keyfile to secrets.tdb\n");
- return -1;
+ if (!secrets_fetch_domain_sid(c->opt_workgroup, &domain_sid)) {
+ d_fprintf(stderr, "Could not fetch domain SID\n");
+ return 1;
}
+ sid_to_fstring(sid_str, &domain_sid);
+ d_printf("SID for domain %s is: %s\n", c->opt_workgroup, sid_str);
+
return 0;
}
-#endif /* WITH_FAKE_KASERVER */
-
-static uint32 get_maxrid(void)
+static bool search_maxrid(struct pdb_search *search, const char *type,
+ uint32 *max_rid)
{
- SAM_ACCOUNT *pwd = NULL;
- uint32 max_rid = 0;
- GROUP_MAP *map = NULL;
- int num_entries = 0;
- int i;
-
- if (!pdb_setsampwent(False)) {
- DEBUG(0, ("load_sampwd_entries: Unable to open passdb.\n"));
- return 0;
- }
-
- for (; (NT_STATUS_IS_OK(pdb_init_sam(&pwd)))
- && pdb_getsampwent(pwd) == True; pwd=NULL) {
- uint32 rid;
+ struct samr_displayentry *entries;
+ uint32 i, num_entries;
- if (!sid_peek_rid(pdb_get_user_sid(pwd), &rid)) {
- DEBUG(0, ("can't get RID for user '%s'\n",
- pdb_get_username(pwd)));
- pdb_free_sam(&pwd);
- continue;
- }
-
- if (rid > max_rid)
- max_rid = rid;
-
- DEBUG(1,("%d is user '%s'\n", rid, pdb_get_username(pwd)));
- pdb_free_sam(&pwd);
+ if (search == NULL) {
+ d_fprintf(stderr, "get_maxrid: Could not search %s\n", type);
+ return false;
}
- pdb_endsampwent();
- pdb_free_sam(&pwd);
-
- if (!pdb_enum_group_mapping(SID_NAME_UNKNOWN, &map, &num_entries,
- ENUM_ONLY_MAPPED))
- return max_rid;
+ num_entries = pdb_search_entries(search, 0, 0xffffffff, &entries);
+ for (i=0; i<num_entries; i++)
+ *max_rid = MAX(*max_rid, entries[i].rid);
+ pdb_search_destroy(search);
+ return true;
+}
- for (i = 0; i < num_entries; i++) {
- uint32 rid;
+static uint32 get_maxrid(void)
+{
+ uint32 max_rid = 0;
- if (!sid_peek_check_rid(get_global_sam_sid(), &map[i].sid,
- &rid)) {
- DEBUG(3, ("skipping map for group '%s', SID %s\n",
- map[i].nt_name,
- sid_string_static(&map[i].sid)));
- continue;
- }
- DEBUG(1,("%d is group '%s'\n", rid, map[i].nt_name));
+ if (!search_maxrid(pdb_search_users(0), "users", &max_rid))
+ return 0;
- if (rid > max_rid)
- max_rid = rid;
- }
+ if (!search_maxrid(pdb_search_groups(), "groups", &max_rid))
+ return 0;
- SAFE_FREE(map);
+ if (!search_maxrid(pdb_search_aliases(get_global_sam_sid()),
+ "aliases", &max_rid))
+ return 0;
return max_rid;
}
-static int net_maxrid(int argc, const char **argv)
+static int net_maxrid(struct net_context *c, int argc, const char **argv)
{
uint32 rid;
{"USER", net_user},
{"GROUP", net_group},
{"GROUPMAP", net_groupmap},
+ {"SAM", net_sam},
{"VALIDATE", net_rap_validate},
{"GROUPMEMBER", net_rap_groupmember},
{"ADMIN", net_rap_admin},
- {"SERVICE", net_rap_service},
+ {"SERVICE", net_rap_service},
{"PASSWORD", net_rap_password},
{"CHANGETRUSTPW", net_changetrustpw},
{"CHANGESECRETPW", net_changesecretpw},
{"TIME", net_time},
{"LOOKUP", net_lookup},
{"JOIN", net_join},
+ {"DOM", net_dom},
{"CACHE", net_cache},
{"GETLOCALSID", net_getlocalsid},
{"SETLOCALSID", net_setlocalsid},
+ {"SETDOMAINSID", net_setdomainsid},
{"GETDOMAINSID", net_getdomainsid},
{"MAXRID", net_maxrid},
{"IDMAP", net_idmap},
{"STATUS", net_status},
+ {"USERSHARE", net_usershare},
+ {"USERSIDLIST", net_usersidlist},
+ {"CONF", net_conf},
+ {"REGISTRY", net_registry},
#ifdef WITH_FAKE_KASERVER
- {"AFSKEY", net_afskey},
+ {"AFS", net_afs},
#endif
{"HELP", net_help},
int argc_new = 0;
const char ** argv_new;
poptContext pc;
+ TALLOC_CTX *frame = talloc_stackframe();
+ struct net_context *c = talloc_zero(frame, struct net_context);
struct poptOption long_options[] = {
{"help", 'h', POPT_ARG_NONE, 0, 'h'},
- {"workgroup", 'w', POPT_ARG_STRING, &opt_target_workgroup},
- {"user", 'U', POPT_ARG_STRING, &opt_user_name, 'U'},
+ {"workgroup", 'w', POPT_ARG_STRING, &c->opt_target_workgroup},
+ {"user", 'U', POPT_ARG_STRING, &c->opt_user_name, 'U'},
{"ipaddress", 'I', POPT_ARG_STRING, 0,'I'},
- {"port", 'p', POPT_ARG_INT, &opt_port},
- {"myname", 'n', POPT_ARG_STRING, &opt_requester_name},
- {"server", 'S', POPT_ARG_STRING, &opt_host},
- {"container", 'c', POPT_ARG_STRING, &opt_container},
- {"comment", 'C', POPT_ARG_STRING, &opt_comment},
- {"maxusers", 'M', POPT_ARG_INT, &opt_maxusers},
- {"flags", 'F', POPT_ARG_INT, &opt_flags},
- {"long", 'l', POPT_ARG_NONE, &opt_long_list_entries},
- {"reboot", 'r', POPT_ARG_NONE, &opt_reboot},
- {"force", 'f', POPT_ARG_NONE, &opt_force},
- {"timeout", 't', POPT_ARG_INT, &opt_timeout},
- {"machine-pass",'P', POPT_ARG_NONE, &opt_machine_pass},
- {"myworkgroup", 'W', POPT_ARG_STRING, &opt_workgroup},
+ {"port", 'p', POPT_ARG_INT, &c->opt_port},
+ {"myname", 'n', POPT_ARG_STRING, &c->opt_requester_name},
+ {"server", 'S', POPT_ARG_STRING, &c->opt_host},
+ {"encrypt", 'e', POPT_ARG_NONE, NULL, 'e', "Encrypt SMB transport (UNIX extended servers only)" },
+ {"container", 'c', POPT_ARG_STRING, &c->opt_container},
+ {"comment", 'C', POPT_ARG_STRING, &c->opt_comment},
+ {"maxusers", 'M', POPT_ARG_INT, &c->opt_maxusers},
+ {"flags", 'F', POPT_ARG_INT, &c->opt_flags},
+ {"long", 'l', POPT_ARG_NONE, &c->opt_long_list_entries},
+ {"reboot", 'r', POPT_ARG_NONE, &c->opt_reboot},
+ {"force", 'f', POPT_ARG_NONE, &c->opt_force},
+ {"stdin", 'i', POPT_ARG_NONE, &c->opt_stdin},
+ {"timeout", 't', POPT_ARG_INT, &c->opt_timeout},
+ {"machine-pass",'P', POPT_ARG_NONE, &c->opt_machine_pass},
+ {"myworkgroup", 'W', POPT_ARG_STRING, &c->opt_workgroup},
+ {"verbose", 'v', POPT_ARG_NONE, &c->opt_verbose},
+ {"test", 'T', POPT_ARG_NONE, &c->opt_testmode},
+ /* Options for 'net groupmap set' */
+ {"local", 'L', POPT_ARG_NONE, &c->opt_localgroup},
+ {"domain", 'D', POPT_ARG_NONE, &c->opt_domaingroup},
+ {"ntname", 'N', POPT_ARG_STRING, &c->opt_newntname},
+ {"rid", 'R', POPT_ARG_INT, &c->opt_rid},
+ /* Options for 'net rpc share migrate' */
+ {"acls", 0, POPT_ARG_NONE, &c->opt_acls},
+ {"attrs", 0, POPT_ARG_NONE, &c->opt_attrs},
+ {"timestamps", 0, POPT_ARG_NONE, &c->opt_timestamps},
+ {"exclude", 'X', POPT_ARG_STRING, &c->opt_exclude},
+ {"destination", 0, POPT_ARG_STRING, &c->opt_destination},
+ {"tallocreport", 0, POPT_ARG_NONE, &c->do_talloc_report},
+
POPT_COMMON_SAMBA
{ 0, 0, 0, 0}
};
- zero_ip(&opt_dest_ip);
+
+ zero_addr(&c->opt_dest_ip);
+
+ load_case_tables();
/* set default debug level to 0 regardless of what smb.conf sets */
DEBUGLEVEL_CLASS[DBGC_ALL] = 0;
dbf = x_stderr;
-
- pc = poptGetContext(NULL, argc, (const char **) argv, long_options,
+
+ pc = poptGetContext(NULL, argc, (const char **) argv, long_options,
POPT_CONTEXT_KEEP_FIRST);
-
+
while((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
case 'h':
- net_help(argc, argv);
+ net_help(c, argc, argv);
exit(0);
break;
+ case 'e':
+ c->smb_encrypt = true;
+ break;
case 'I':
- opt_dest_ip = *interpret_addr2(poptGetOptArg(pc));
- if (is_zero_ip(opt_dest_ip))
- d_printf("\nInvalid ip address specified\n");
- else
- opt_have_ip = True;
+ if (!interpret_string_addr(&c->opt_dest_ip,
+ poptGetOptArg(pc), 0)) {
+ d_fprintf(stderr, "\nInvalid ip address specified\n");
+ } else {
+ c->opt_have_ip = true;
+ }
break;
case 'U':
- opt_user_specified = True;
- opt_user_name = strdup(opt_user_name);
- p = strchr(opt_user_name,'%');
+ c->opt_user_specified = true;
+ c->opt_user_name = SMB_STRDUP(c->opt_user_name);
+ p = strchr(c->opt_user_name,'%');
if (p) {
*p = 0;
- opt_password = p+1;
+ c->opt_password = p+1;
}
break;
default:
- d_printf("\nInvalid option %s: %s\n",
+ d_fprintf(stderr, "\nInvalid option %s: %s\n",
poptBadOption(pc, 0), poptStrerror(opt));
- net_help(argc, argv);
+ net_help(c, argc, argv);
exit(1);
}
}
-
+
/*
* Don't load debug level from smb.conf. It should be
* set by cmdline arg or remain default (0)
*/
- AllowDebugChange = False;
- lp_load(dyn_CONFIGFILE,True,False,False);
-
+ AllowDebugChange = false;
+ lp_load(get_dyn_CONFIGFILE(), true, false, false, true);
+
argv_new = (const char **)poptGetArgs(pc);
argc_new = argc;
}
}
- if (!opt_requester_name) {
- static fstring myname;
- get_myname(myname);
- opt_requester_name = myname;
+ if (c->do_talloc_report) {
+ talloc_enable_leak_report();
}
- if (!opt_user_name && getenv("LOGNAME")) {
- opt_user_name = getenv("LOGNAME");
+ if (c->opt_requester_name) {
+ set_global_myname(c->opt_requester_name);
}
- if (!opt_workgroup) {
- opt_workgroup = smb_xstrdup(lp_workgroup());
+ if (!c->opt_user_name && getenv("LOGNAME")) {
+ c->opt_user_name = getenv("LOGNAME");
}
-
- if (!opt_target_workgroup) {
- opt_target_workgroup = smb_xstrdup(lp_workgroup());
+
+ if (!c->opt_workgroup) {
+ c->opt_workgroup = smb_xstrdup(lp_workgroup());
+ }
+
+ if (!c->opt_target_workgroup) {
+ c->opt_target_workgroup = smb_xstrdup(lp_workgroup());
}
-
+
if (!init_names())
exit(1);
load_interfaces();
-
- /* this makes sure that when we do things like call scripts,
+
+ /* this makes sure that when we do things like call scripts,
that it won't assert becouse we are not root */
sec_init();
- if (opt_machine_pass) {
+ if (c->opt_machine_pass) {
/* it is very useful to be able to make ads queries as the
machine account for testing purposes and for domain leave */
- net_use_machine_password();
+ net_use_krb_machine_account(c);
}
- if (!opt_password) {
- opt_password = getenv("PASSWD");
+ if (!c->opt_password) {
+ c->opt_password = getenv("PASSWD");
}
-
- rc = net_run_function(argc_new-1, argv_new+1, net_func, net_help);
-
+
+ rc = net_run_function(c, argc_new-1, argv_new+1, net_func, net_help);
+
DEBUG(2,("return code = %d\n", rc));
+
+ libnetapi_free(c->netapi_ctx);
+
+ poptFreeContext(pc);
+
+ TALLOC_FREE(frame);
return rc;
}
git.samba.org / samba.git / blobdiff