From 8de0c24a08cf71058dd58004fe82ca2e8368ffbc Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 18 Aug 2004 07:56:35 +0000
Subject: r1875: - move 'net' code into a subdir - and remove all unneeded
 files

we'll reimplement the stuff step by step using the functions from
libnet/ which will do the hard work for us

metze
(This used to be commit 8b2d5ec973fde980389bfe03cbcd70274b98b2dc)
---
 source4/utils/net/net.c | 642 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 642 insertions(+)
 create mode 100644 source4/utils/net/net.c

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
new file mode 100644
index 0000000000..6db62ea6b0
--- /dev/null
+++ b/source4/utils/net/net.c
@@ -0,0 +1,642 @@
+/* 
+   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)
+
+   Originally written by Steve and Jim. Largely rewritten by tridge in
+   November 2001.
+
+   Reworked again by abartlet in December 2001
+
+   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
+   (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.  */
+ 
+/*****************************************************/
+/*                                                   */
+/*   Distributed SMB/CIFS Server Management Utility  */
+/*                                                   */
+/*   The intent was to make the syntax similar       */
+/*   to the NET utility (first developed in DOS      */
+/*   with additional interesting & useful functions  */
+/*   added in later SMB server network operating     */
+/*   systems).                                       */
+/*                                                   */
+/*****************************************************/
+
+#include "includes.h"
+#include "../utils/net.h"
+
+/***********************************************************************/
+/* Beginning of internationalization section.  Translatable constants  */
+/* should be kept in this area and referenced in the rest of the code. */
+/*                                                                     */
+/* No functions, outside of Samba or LSB (Linux Standards Base) should */
+/* be used (if possible).                                              */
+/***********************************************************************/
+
+#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 = "";
+char *opt_container = "cn=Users";
+int opt_flags = -1;
+int opt_jobid = 0;
+int opt_timeout = 0;
+const char *opt_target_workgroup = NULL;
+static int opt_machine_pass = 0;
+
+BOOL opt_have_ip = False;
+struct in_addr opt_dest_ip;
+
+extern BOOL AllowDebugChange;
+
+/*
+  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 smbcli_state **c, struct in_addr *server_ip,
+					const char *server_name)
+{
+	NTSTATUS nt_status;
+
+	if (!opt_password) {
+		char *pass = getpass("Password:");
+		if (pass) {
+			opt_password = strdup(pass);
+		}
+	}
+	
+	nt_status = smbcli_full_connection(c, opt_requester_name, server_name, 
+					server_ip, opt_port,
+					"IPC$", "IPC",  
+					opt_user_name, opt_workgroup,
+					opt_password, 0, 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");
+
+		return nt_status;
+	}
+}
+
+/****************************************************************************
+connect to \\server\ipc$ anonymously
+****************************************************************************/
+NTSTATUS connect_to_ipc_anonymous(struct smbcli_state **c,
+			struct in_addr *server_ip, const char *server_name)
+{
+	NTSTATUS nt_status;
+
+	nt_status = smbcli_full_connection(c, opt_requester_name, server_name, 
+					server_ip, opt_port,
+					"IPC$", "IPC",  
+					"", "",
+					"", 0, 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;
+	}
+}
+
+BOOL net_find_server(uint_t 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 (!lookup_dc_name(lp_netbios_name(), opt_target_workgroup, &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_dc(struct in_addr *server_ip, fstring server_name, const char *domain_name)
+{
+	if (get_pdc_ip(domain_name, server_ip)) {
+		fstring dc_name;
+			
+		if (is_zero_ip(*server_ip))
+			return False;
+		
+		if (!lookup_dc_name(lp_netbios_name(), domain_name, server_ip, dc_name))
+			return False;
+			
+		safe_strcpy(server_name, dc_name, FSTRING_LEN);
+		return True;
+	} else
+		return False;
+}
+
+
+struct smbcli_state *net_make_ipc_connection(uint_t flags)
+{
+	char *server_name = NULL;
+	struct in_addr server_ip;
+	struct smbcli_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)
+{
+	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);
+
+	return net_rap_group(argc, argv);
+}
+
+static int net_join(int argc, const char **argv)
+{
+	if (net_ads_check() == 0) {
+		if (net_ads_join(argc, argv) == 0)
+			return 0;
+		else
+			d_printf("ADS join did not work, trying RPC...\n");
+	}
+	return net_rpc_join(argc, argv);
+}
+
+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)
+{
+        DOM_SID sid;
+	const char *name;
+	fstring sid_str;
+
+	if (argc >= 1) {
+		name = argv[0];
+        }
+	else {
+		name = lp_netbios_name();
+	}
+
+	if (!secrets_fetch_domain_sid(name, &sid)) {
+		DEBUG(0, ("Can't fetch domain SID for name: %s\n", name));	
+		return 1;
+	}
+	sid_to_string(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)
+{
+	DOM_SID sid;
+
+	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 setlocalsid S-1-5-21-x-y-z\n");
+		return 1;
+	}
+
+	if (!secrets_store_domain_sid(lp_netbios_name(), &sid)) {
+		DEBUG(0,("Can't store domain SID as a pdc/bdc.\n"));
+		return 1;
+	}
+
+	return 0;
+}
+
+static int net_getdomainsid(int argc, const char **argv)
+{
+	DOM_SID domain_sid;
+	fstring sid_str;
+
+	if (!secrets_fetch_domain_sid(lp_netbios_name(), &domain_sid)) {
+		d_printf("Could not fetch local SID\n");
+		return 1;
+	}
+	sid_to_string(sid_str, &domain_sid);
+	d_printf("SID for domain %s is: %s\n", lp_netbios_name(), sid_str);
+
+	if (!secrets_fetch_domain_sid(lp_workgroup(), &domain_sid)) {
+		d_printf("Could not fetch domain SID\n");
+		return 1;
+	}
+
+	sid_to_string(sid_str, &domain_sid);
+	d_printf("SID for domain %s is: %s\n", lp_workgroup(), sid_str);
+
+	return 0;
+}
+
+static uint32_t get_maxrid(void)
+{
+	SAM_ACCOUNT *pwd = NULL;
+	uint32_t 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_t rid;
+
+		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);
+	}
+
+	pdb_endsampwent();
+	pdb_free_sam(&pwd);
+
+	if (!pdb_enum_group_mapping(SID_NAME_UNKNOWN, &map, &num_entries,
+				    ENUM_ONLY_MAPPED, MAPPING_WITHOUT_PRIV))
+		return max_rid;
+
+	for (i = 0; i < num_entries; i++) {
+		uint32_t rid;
+
+		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 (rid > max_rid)
+			max_rid = rid;
+	}
+
+	SAFE_FREE(map);
+
+	return max_rid;
+}
+
+static int net_maxrid(int argc, const char **argv)
+{
+	uint32_t rid;
+
+	if (argc != 0) {
+	        DEBUG(0, ("usage: net initrid\n"));
+		return 1;
+	}
+
+	if ((rid = get_maxrid()) == 0) {
+		DEBUG(0, ("can't get current maximum rid\n"));
+		return 1;
+	}
+
+	d_printf("Currently used maximum rid: %d\n", rid);
+
+	return 0;
+}
+
+/* main function table */
+static struct functable net_func[] = {
+	{"RPC", net_rpc},
+	{"RAP", net_rap},
+	{"ADS", net_ads},
+
+	/* eventually these should auto-choose the transport ... */
+	{"FILE", net_file},
+	{"SHARE", net_share},
+	{"SESSION", net_rap_session},
+	{"SERVER", net_rap_server},
+	{"DOMAIN", net_rap_domain},
+	{"PRINTQ", net_rap_printq},
+	{"USER", net_user},
+	{"GROUP", net_group},
+	{"VALIDATE", net_rap_validate},
+	{"GROUPMEMBER", net_rap_groupmember},
+	{"ADMIN", net_rap_admin},
+	{"SERVICE", net_rap_service},	
+	{"PASSWORD", net_rap_password},
+	{"TIME", net_time},
+	{"LOOKUP", net_lookup},
+	{"JOIN", net_join},
+	{"CACHE", net_cache},
+	{"GETLOCALSID", net_getlocalsid},
+	{"SETLOCALSID", net_setlocalsid},
+	{"GETDOMAINSID", net_getdomainsid},
+	{"MAXRID", net_maxrid},
+
+	{"HELP", net_help},
+	{NULL, NULL}
+};
+
+
+/****************************************************************************
+  main program
+****************************************************************************/
+ int main(int argc, const char **argv)
+{
+	int opt,i;
+	char *p;
+	int rc = 0;
+	int argc_new = 0;
+	const char ** argv_new;
+	poptContext pc;
+	static char *servicesf = dyn_CONFIGFILE;
+	static char *debuglevel = NULL;
+
+	struct poptOption long_options[] = {
+		{"help",	'h', POPT_ARG_NONE,   0, 'h'},
+		{"workgroup",	'w', POPT_ARG_STRING, &opt_target_workgroup},
+		{"myworkgroup",	'W', POPT_ARG_STRING, &opt_workgroup},
+		{"user",	'U', POPT_ARG_STRING, &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},
+		{"conf",	's', POPT_ARG_STRING, &servicesf},
+		{"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},
+		{"jobid",	'j', POPT_ARG_INT,    &opt_jobid},
+		{"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},
+		{"debuglevel",  'd', POPT_ARG_STRING, &debuglevel},
+		{NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
+		{ 0, 0, 0, 0}
+	};
+
+	zero_ip(&opt_dest_ip);
+
+	dbf = x_stderr;
+	
+	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);
+			exit(0);
+			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;
+			break;
+		case 'U':
+			opt_user_specified = True;
+			opt_user_name = strdup(opt_user_name);
+			p = strchr(opt_user_name,'%');
+			if (p) {
+				*p = 0;
+				opt_password = p+1;
+			}
+			break;
+		default:
+			d_printf("\nInvalid option %s: %s\n", 
+				 poptBadOption(pc, 0), poptStrerror(opt));
+			net_help(argc, argv);
+			exit(1);
+		}
+	}
+
+	if (debuglevel) {
+		debug_parse_levels(debuglevel);
+		AllowDebugChange = False;
+	}
+
+	lp_load(servicesf,True,False,False);       
+
+	argv_new = (const char **)poptGetArgs(pc);
+
+	argc_new = argc;
+	for (i=0; i<argc; i++) {
+		if (argv_new[i] == NULL) {
+			argc_new = i;
+			break;
+		}
+	}
+
+	if (!opt_requester_name) {
+		opt_requester_name = get_myname();
+	}
+
+	if (!opt_user_name && getenv("LOGNAME")) {
+		opt_user_name = getenv("LOGNAME");
+	}
+
+	if (!opt_workgroup) {
+		opt_workgroup = lp_workgroup();
+	}
+	
+	if (!opt_target_workgroup) {
+		opt_target_workgroup = strdup(lp_workgroup());
+	}
+	
+	if (!init_names())
+		exit(1);
+
+	load_interfaces();
+
+	if (opt_machine_pass) {
+		char *user;
+		/* it is very useful to be able to make ads queries as the
+		   machine account for testing purposes and for domain leave */
+
+		if (!secrets_init()) {
+			d_printf("ERROR: Unable to open secrets database\n");
+			exit(1);
+		}
+
+		asprintf(&user,"%s$", lp_netbios_name());
+		opt_user_name = user;
+		opt_password = secrets_fetch_machine_password();
+		if (!opt_password) {
+			d_printf("ERROR: Unable to fetch machine password\n");
+			exit(1);
+		}
+	}
+  	 
+	rc = net_run_function(argc_new-1, argv_new+1, net_func, net_help);
+	
+	DEBUG(2,("return code = %d\n", rc));
+	return rc;
+}
-- 
cgit 


From 9373c046f12322dbc19adf2fdd481d2f534bae9b Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 18 Aug 2004 09:33:54 +0000
Subject: r1876: rewrite net command completely and add it to the build

metze
(This used to be commit 14b9858800f6944bf78bee34338242cd3292b297)
---
 source4/utils/net/net.c | 606 ++++++------------------------------------------
 1 file changed, 77 insertions(+), 529 deletions(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 6db62ea6b0..ddca5662a2 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -5,6 +5,9 @@
    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) 2004 Stefan Metzmacher (metze@samba.org)
+
+   Largely rewritten by metze in August 2004
 
    Originally written by Steve and Jim. Largely rewritten by tridge in
    November 2001.
@@ -23,7 +26,8 @@
    
    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.  */
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
  
 /*****************************************************/
 /*                                                   */
@@ -38,552 +42,124 @@
 /*****************************************************/
 
 #include "includes.h"
-#include "../utils/net.h"
-
-/***********************************************************************/
-/* Beginning of internationalization section.  Translatable constants  */
-/* should be kept in this area and referenced in the rest of the code. */
-/*                                                                     */
-/* No functions, outside of Samba or LSB (Linux Standards Base) should */
-/* be used (if possible).                                              */
-/***********************************************************************/
-
-#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 = "";
-char *opt_container = "cn=Users";
-int opt_flags = -1;
-int opt_jobid = 0;
-int opt_timeout = 0;
-const char *opt_target_workgroup = NULL;
-static int opt_machine_pass = 0;
-
-BOOL opt_have_ip = False;
-struct in_addr opt_dest_ip;
-
-extern BOOL AllowDebugChange;
+#include "utils/net/net.h"
 
 /*
   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 net_run_function(struct net_context *ctx,
+			int argc, const char **argv,
+			const struct net_functable *functable, 
+			int (*help_fn)(struct net_context *ctx, int argc, const char **argv))
 {
 	int i;
 	
 	if (argc < 1) {
-		d_printf("\nUsage: \n");
-		return usage_fn(argc, argv);
+		d_printf("Usage: \n");
+		return help_fn(ctx, 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);
+	for (i=0; functable[i].name; i++) {
+		if (StrCaseCmp(argv[0], functable[i].name) == 0)
+			return functable[i].fn(ctx, 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 smbcli_state **c, struct in_addr *server_ip,
-					const char *server_name)
-{
-	NTSTATUS nt_status;
-
-	if (!opt_password) {
-		char *pass = getpass("Password:");
-		if (pass) {
-			opt_password = strdup(pass);
-		}
-	}
-	
-	nt_status = smbcli_full_connection(c, opt_requester_name, server_name, 
-					server_ip, opt_port,
-					"IPC$", "IPC",  
-					opt_user_name, opt_workgroup,
-					opt_password, 0, 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");
-
-		return nt_status;
-	}
-}
-
-/****************************************************************************
-connect to \\server\ipc$ anonymously
-****************************************************************************/
-NTSTATUS connect_to_ipc_anonymous(struct smbcli_state **c,
-			struct in_addr *server_ip, const char *server_name)
-{
-	NTSTATUS nt_status;
-
-	nt_status = smbcli_full_connection(c, opt_requester_name, server_name, 
-					server_ip, opt_port,
-					"IPC$", "IPC",  
-					"", "",
-					"", 0, 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;
-	}
-}
-
-BOOL net_find_server(uint_t 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 (!lookup_dc_name(lp_netbios_name(), opt_target_workgroup, &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_dc(struct in_addr *server_ip, fstring server_name, const char *domain_name)
-{
-	if (get_pdc_ip(domain_name, server_ip)) {
-		fstring dc_name;
-			
-		if (is_zero_ip(*server_ip))
-			return False;
-		
-		if (!lookup_dc_name(lp_netbios_name(), domain_name, server_ip, dc_name))
-			return False;
-			
-		safe_strcpy(server_name, dc_name, FSTRING_LEN);
-		return True;
-	} else
-		return False;
-}
-
-
-struct smbcli_state *net_make_ipc_connection(uint_t flags)
-{
-	char *server_name = NULL;
-	struct in_addr server_ip;
-	struct smbcli_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)
-{
-	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);
-
-	return net_rap_group(argc, argv);
-}
-
-static int net_join(int argc, const char **argv)
-{
-	if (net_ads_check() == 0) {
-		if (net_ads_join(argc, argv) == 0)
-			return 0;
-		else
-			d_printf("ADS join did not work, trying RPC...\n");
-	}
-	return net_rpc_join(argc, argv);
-}
-
-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);
+	return help_fn(ctx, argc, argv);
 }
 
 /*
- Retrieve our local SID or the SID for the specified name
- */
-static int net_getlocalsid(int argc, const char **argv)
-{
-        DOM_SID sid;
-	const char *name;
-	fstring sid_str;
-
-	if (argc >= 1) {
-		name = argv[0];
-        }
-	else {
-		name = lp_netbios_name();
-	}
-
-	if (!secrets_fetch_domain_sid(name, &sid)) {
-		DEBUG(0, ("Can't fetch domain SID for name: %s\n", name));	
-		return 1;
-	}
-	sid_to_string(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)
-{
-	DOM_SID sid;
-
-	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 setlocalsid S-1-5-21-x-y-z\n");
-		return 1;
-	}
-
-	if (!secrets_store_domain_sid(lp_netbios_name(), &sid)) {
-		DEBUG(0,("Can't store domain SID as a pdc/bdc.\n"));
-		return 1;
-	}
-
-	return 0;
-}
-
-static int net_getdomainsid(int argc, const char **argv)
+  run a help function from a function table. If not found then fail
+*/
+int net_run_help(struct net_context *ctx,
+			int argc, const char **argv,
+			const struct net_functable *functable)
 {
-	DOM_SID domain_sid;
-	fstring sid_str;
-
-	if (!secrets_fetch_domain_sid(lp_netbios_name(), &domain_sid)) {
-		d_printf("Could not fetch local SID\n");
+	int i;
+	
+	if (argc < 1) {
+		d_printf("net_run_help: TODO (argc < 1)\n");
 		return 1;
 	}
-	sid_to_string(sid_str, &domain_sid);
-	d_printf("SID for domain %s is: %s\n", lp_netbios_name(), sid_str);
-
-	if (!secrets_fetch_domain_sid(lp_workgroup(), &domain_sid)) {
-		d_printf("Could not fetch domain SID\n");
-		return 1;
+	for (i=0; functable[i].name; i++) {
+		if (StrCaseCmp(argv[0], functable[i].name) == 0)
+			if (functable[i].help) {
+				return functable[i].help(ctx, argc-1, argv+1);
+			}
 	}
-
-	sid_to_string(sid_str, &domain_sid);
-	d_printf("SID for domain %s is: %s\n", lp_workgroup(), sid_str);
-
-	return 0;
+	d_printf("No help for command: %s\n", argv[0]);
+	return 1;
 }
 
-static uint32_t get_maxrid(void)
+static int net_help_msg(struct net_context *ctx, int argc, const char **argv)
 {
-	SAM_ACCOUNT *pwd = NULL;
-	uint32_t 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_t rid;
-
-		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);
-	}
-
-	pdb_endsampwent();
-	pdb_free_sam(&pwd);
-
-	if (!pdb_enum_group_mapping(SID_NAME_UNKNOWN, &map, &num_entries,
-				    ENUM_ONLY_MAPPED, MAPPING_WITHOUT_PRIV))
-		return max_rid;
-
-	for (i = 0; i < num_entries; i++) {
-		uint32_t rid;
-
-		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 (rid > max_rid)
-			max_rid = rid;
-	}
-
-	SAFE_FREE(map);
-
-	return max_rid;
+	d_printf("Help: TODO\n");
+	return 0;	
 }
 
-static int net_maxrid(int argc, const char **argv)
-{
-	uint32_t rid;
-
-	if (argc != 0) {
-	        DEBUG(0, ("usage: net initrid\n"));
-		return 1;
-	}
-
-	if ((rid = get_maxrid()) == 0) {
-		DEBUG(0, ("can't get current maximum rid\n"));
-		return 1;
-	}
-
-	d_printf("Currently used maximum rid: %d\n", rid);
-
-	return 0;
-}
+static int net_help(struct net_context *ctx, int argc, const char **argv);
 
 /* main function table */
-static struct functable net_func[] = {
-	{"RPC", net_rpc},
-	{"RAP", net_rap},
-	{"ADS", net_ads},
-
-	/* eventually these should auto-choose the transport ... */
-	{"FILE", net_file},
-	{"SHARE", net_share},
-	{"SESSION", net_rap_session},
-	{"SERVER", net_rap_server},
-	{"DOMAIN", net_rap_domain},
-	{"PRINTQ", net_rap_printq},
-	{"USER", net_user},
-	{"GROUP", net_group},
-	{"VALIDATE", net_rap_validate},
-	{"GROUPMEMBER", net_rap_groupmember},
-	{"ADMIN", net_rap_admin},
-	{"SERVICE", net_rap_service},	
-	{"PASSWORD", net_rap_password},
-	{"TIME", net_time},
-	{"LOOKUP", net_lookup},
-	{"JOIN", net_join},
-	{"CACHE", net_cache},
-	{"GETLOCALSID", net_getlocalsid},
-	{"SETLOCALSID", net_setlocalsid},
-	{"GETDOMAINSID", net_getdomainsid},
-	{"MAXRID", net_maxrid},
+static const struct net_functable net_functable[] = {
+/*	{"password", net_password, net_password_help},*/
 
-	{"HELP", net_help},
+	{"help", net_help_msg, net_help_msg},
 	{NULL, NULL}
 };
 
+static int net_help(struct net_context *ctx, int argc, const char **argv)
+{
+	return net_run_help(ctx, argc, argv, net_functable);
+}
 
 /****************************************************************************
   main program
 ****************************************************************************/
- int main(int argc, const char **argv)
+static int binary_net(int argc, const char **argv)
 {
 	int opt,i;
-	char *p;
-	int rc = 0;
-	int argc_new = 0;
-	const char ** argv_new;
+	int rc;
+	int argc_new;
+	const char **argv_new;
+	struct net_context ctx;
 	poptContext pc;
-	static char *servicesf = dyn_CONFIGFILE;
-	static char *debuglevel = NULL;
+
+	setup_logging("net", DEBUG_STDOUT);
+
+#ifdef HAVE_SETBUFFER
+	setbuffer(stdout, NULL, 0);
+#endif
+
+	ctx.mem_ctx = talloc_init("net_context");
+	if (!ctx.mem_ctx) {
+		d_printf("talloc_init(net_context) failed\n");
+		exit(1);
+	}
 
 	struct poptOption long_options[] = {
 		{"help",	'h', POPT_ARG_NONE,   0, 'h'},
-		{"workgroup",	'w', POPT_ARG_STRING, &opt_target_workgroup},
-		{"myworkgroup",	'W', POPT_ARG_STRING, &opt_workgroup},
-		{"user",	'U', POPT_ARG_STRING, &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},
-		{"conf",	's', POPT_ARG_STRING, &servicesf},
-		{"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},
-		{"jobid",	'j', POPT_ARG_INT,    &opt_jobid},
-		{"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},
-		{"debuglevel",  'd', POPT_ARG_STRING, &debuglevel},
 		{NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
 		{ 0, 0, 0, 0}
 	};
 
-	zero_ip(&opt_dest_ip);
-
-	dbf = x_stderr;
-	
 	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(&ctx, argc, argv);
 			exit(0);
 			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;
-			break;
-		case 'U':
-			opt_user_specified = True;
-			opt_user_name = strdup(opt_user_name);
-			p = strchr(opt_user_name,'%');
-			if (p) {
-				*p = 0;
-				opt_password = p+1;
-			}
-			break;
 		default:
-			d_printf("\nInvalid option %s: %s\n", 
+			d_printf("Invalid option %s: %s\n", 
 				 poptBadOption(pc, 0), poptStrerror(opt));
-			net_help(argc, argv);
+			net_help(&ctx, argc, argv);
 			exit(1);
 		}
 	}
 
-	if (debuglevel) {
-		debug_parse_levels(debuglevel);
-		AllowDebugChange = False;
-	}
-
-	lp_load(servicesf,True,False,False);       
+	lp_load(dyn_CONFIGFILE,True,False,False);
+	load_interfaces();
 
 	argv_new = (const char **)poptGetArgs(pc);
 
@@ -595,48 +171,20 @@ static struct functable net_func[] = {
 		}
 	}
 
-	if (!opt_requester_name) {
-		opt_requester_name = get_myname();
-	}
-
-	if (!opt_user_name && getenv("LOGNAME")) {
-		opt_user_name = getenv("LOGNAME");
-	}
-
-	if (!opt_workgroup) {
-		opt_workgroup = lp_workgroup();
-	}
-	
-	if (!opt_target_workgroup) {
-		opt_target_workgroup = strdup(lp_workgroup());
+	if (argc_new < 2) {
+		d_printf("Usage: TODO\n");
+		return 1;
 	}
-	
-	if (!init_names())
-		exit(1);
-
-	load_interfaces();
-
-	if (opt_machine_pass) {
-		char *user;
-		/* it is very useful to be able to make ads queries as the
-		   machine account for testing purposes and for domain leave */
 
-		if (!secrets_init()) {
-			d_printf("ERROR: Unable to open secrets database\n");
-			exit(1);
-		}
+	rc = net_run_function(&ctx, argc_new-1, argv_new+1, net_functable, net_help_msg);
 
-		asprintf(&user,"%s$", lp_netbios_name());
-		opt_user_name = user;
-		opt_password = secrets_fetch_machine_password();
-		if (!opt_password) {
-			d_printf("ERROR: Unable to fetch machine password\n");
-			exit(1);
-		}
+	if (rc != 0) {
+		DEBUG(0,("return code = %d\n", rc));
 	}
-  	 
-	rc = net_run_function(argc_new-1, argv_new+1, net_func, net_help);
-	
-	DEBUG(2,("return code = %d\n", rc));
 	return rc;
 }
+
+ int main(int argc, const char **argv)
+{
+	return binary_net(argc, argv);
+}
-- 
cgit 


From f7c842707afac05aebaba5c6868a73091a98bb3e Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 18 Aug 2004 10:35:46 +0000
Subject: r1877: since make proto catches all functions

the inlcude has to move to includes.h

metze
(This used to be commit 97fe38183b6a03c01f6ac2d28a958d632eb4ff8a)
---
 source4/utils/net/net.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index ddca5662a2..a636e4cdaa 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -42,7 +42,6 @@
 /*****************************************************/
 
 #include "includes.h"
-#include "utils/net/net.h"
 
 /*
   run a function from a function table. If not found then
-- 
cgit 


From bc3a20e9d8cec0b0b402e922214fc5a7f08e785e Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 18 Aug 2004 12:47:08 +0000
Subject: r1879: - add a user sub struct in net_context

- add 'net password change' command
  (it doesn'T work yet because libnet_rpc_connect() isn't implemented yet,
   and we don't fill in the net_context user substruct yet)

metze
(This used to be commit 939da063cdf18a5ab7e7f0490ac58d1f138cf0f0)
---
 source4/utils/net/net.c | 84 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 63 insertions(+), 21 deletions(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index a636e4cdaa..f1bb4cef4c 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -50,64 +50,99 @@
 int net_run_function(struct net_context *ctx,
 			int argc, const char **argv,
 			const struct net_functable *functable, 
-			int (*help_fn)(struct net_context *ctx, int argc, const char **argv))
+			int (*usage_fn)(struct net_context *ctx, int argc, const char **argv))
 {
 	int i;
-	
+
 	if (argc < 1) {
 		d_printf("Usage: \n");
-		return help_fn(ctx, argc, argv);
+		return usage_fn(ctx, argc, argv);
 	}
+
 	for (i=0; functable[i].name; i++) {
 		if (StrCaseCmp(argv[0], functable[i].name) == 0)
 			return functable[i].fn(ctx, argc-1, argv+1);
 	}
+
 	d_printf("No command: %s\n", argv[0]);
-	return help_fn(ctx, argc, argv);
+	return usage_fn(ctx, argc, argv);
 }
 
 /*
-  run a help function from a function table. If not found then fail
+  run a usage function from a function table. If not found then fail
+*/
+int net_run_usage(struct net_context *ctx,
+			int argc, const char **argv,
+			const struct net_functable *functable)
+{
+	int i;
+
+	if (argc < 1) {
+		d_printf("net_run_usage: TODO (argc < 1)\n");
+		return 1;
+	}
+
+	for (i=0; functable[i].name; i++) {
+		if (StrCaseCmp(argv[0], functable[i].name) == 0)
+			if (functable[i].usage) {
+				return functable[i].usage(ctx, argc-1, argv+1);
+			}
+	}
+
+	d_printf("No usage for command: %s\n", argv[0]);
+
+	return 1;
+}
+
+/*
+  run a usage function from a function table. If not found then fail
 */
 int net_run_help(struct net_context *ctx,
 			int argc, const char **argv,
 			const struct net_functable *functable)
 {
 	int i;
-	
+
 	if (argc < 1) {
 		d_printf("net_run_help: TODO (argc < 1)\n");
 		return 1;
 	}
+
 	for (i=0; functable[i].name; i++) {
 		if (StrCaseCmp(argv[0], functable[i].name) == 0)
 			if (functable[i].help) {
 				return functable[i].help(ctx, argc-1, argv+1);
 			}
 	}
+
 	d_printf("No help for command: %s\n", argv[0]);
+
 	return 1;
 }
 
-static int net_help_msg(struct net_context *ctx, int argc, const char **argv)
+static int net_help(struct net_context *ctx, int argc, const char **argv)
 {
-	d_printf("Help: TODO\n");
-	return 0;	
+	d_printf("net_help: TODO\n");
+	return 0;
 }
 
-static int net_help(struct net_context *ctx, int argc, const char **argv);
+static int net_help_usage(struct net_context *ctx, int argc, const char **argv)
+{
+	d_printf("net_help_usage: TODO\n");
+	return 0;	
+}
 
 /* main function table */
-static const struct net_functable net_functable[] = {
-/*	{"password", net_password, net_password_help},*/
+static const struct net_functable const net_functable[] = {
+	{"password", net_password, net_password_usage, net_password_help},
 
-	{"help", net_help_msg, net_help_msg},
+	{"help", net_help, net_help_usage, net_help},
 	{NULL, NULL}
 };
 
-static int net_help(struct net_context *ctx, int argc, const char **argv)
+static int net_usage(struct net_context *ctx, int argc, const char **argv)
 {
-	return net_run_help(ctx, argc, argv, net_functable);
+	return net_run_usage(ctx, argc, argv, net_functable);
 }
 
 /****************************************************************************
@@ -119,7 +154,8 @@ static int binary_net(int argc, const char **argv)
 	int rc;
 	int argc_new;
 	const char **argv_new;
-	struct net_context ctx;
+	TALLOC_CTX *mem_ctx;
+	struct net_context *ctx;
 	poptContext pc;
 
 	setup_logging("net", DEBUG_STDOUT);
@@ -128,12 +164,16 @@ static int binary_net(int argc, const char **argv)
 	setbuffer(stdout, NULL, 0);
 #endif
 
-	ctx.mem_ctx = talloc_init("net_context");
-	if (!ctx.mem_ctx) {
+	mem_ctx = talloc_init("net_context");
+	ctx = talloc_p(mem_ctx, struct net_context);
+	if (!ctx) {
 		d_printf("talloc_init(net_context) failed\n");
 		exit(1);
 	}
 
+	ZERO_STRUCTP(ctx);
+	ctx->mem_ctx		= mem_ctx;
+
 	struct poptOption long_options[] = {
 		{"help",	'h', POPT_ARG_NONE,   0, 'h'},
 		{NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
@@ -146,13 +186,13 @@ static int binary_net(int argc, const char **argv)
 	while((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {
 		case 'h':
-			net_help(&ctx, argc, argv);
+			net_help(ctx, argc, argv);
 			exit(0);
 			break;
 		default:
 			d_printf("Invalid option %s: %s\n", 
 				 poptBadOption(pc, 0), poptStrerror(opt));
-			net_help(&ctx, argc, argv);
+			net_help(ctx, argc, argv);
 			exit(1);
 		}
 	}
@@ -175,11 +215,13 @@ static int binary_net(int argc, const char **argv)
 		return 1;
 	}
 
-	rc = net_run_function(&ctx, argc_new-1, argv_new+1, net_functable, net_help_msg);
+	rc = net_run_function(ctx, argc_new-1, argv_new+1, net_functable, net_usage);
 
 	if (rc != 0) {
 		DEBUG(0,("return code = %d\n", rc));
 	}
+
+	talloc_destroy(mem_ctx);
 	return rc;
 }
 
-- 
cgit 


From 770fb6d22d4bfeb87a35cff49b2756ea94d0979d Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 18 Aug 2004 13:00:28 +0000
Subject: r1880: bugger, now I have used gcc 3.4.1 myself and have statements
 before declarations

Does any knows if there are flags to let gcc 3.4.1 fail with that?

metze
(This used to be commit 6ad57a86c8583df90a93fdf36b7184010d2054bc)
---
 source4/utils/net/net.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index f1bb4cef4c..b6b3fb6fb9 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -157,6 +157,11 @@ static int binary_net(int argc, const char **argv)
 	TALLOC_CTX *mem_ctx;
 	struct net_context *ctx;
 	poptContext pc;
+	struct poptOption long_options[] = {
+		{"help",	'h', POPT_ARG_NONE,   0, 'h'},
+		{NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
+		{ 0, 0, 0, 0}
+	};
 
 	setup_logging("net", DEBUG_STDOUT);
 
@@ -172,13 +177,7 @@ static int binary_net(int argc, const char **argv)
 	}
 
 	ZERO_STRUCTP(ctx);
-	ctx->mem_ctx		= mem_ctx;
-
-	struct poptOption long_options[] = {
-		{"help",	'h', POPT_ARG_NONE,   0, 'h'},
-		{NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
-		{ 0, 0, 0, 0}
-	};
+	ctx->mem_ctx = mem_ctx;
 
 	pc = poptGetContext(NULL, argc, (const char **) argv, long_options, 
 			    POPT_CONTEXT_KEEP_FIRST);
-- 
cgit 


From 5c9c6b47412e93caab4c55086f679fb12fc9a9af Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 19 Aug 2004 12:24:58 +0000
Subject: r1914: use common popt stuff in net

metze
(This used to be commit 52b866c40332ab408c57a0eab415e0755e4b5081)
---
 source4/utils/net/net.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index b6b3fb6fb9..05dbb35f41 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -158,9 +158,12 @@ static int binary_net(int argc, const char **argv)
 	struct net_context *ctx;
 	poptContext pc;
 	struct poptOption long_options[] = {
-		{"help",	'h', POPT_ARG_NONE,   0, 'h'},
-		{NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
-		{ 0, 0, 0, 0}
+		POPT_AUTOHELP
+		POPT_COMMON_SAMBA
+		POPT_COMMON_CONNECTION
+		POPT_COMMON_CREDENTIALS
+		POPT_COMMON_VERSION
+		POPT_TABLEEND
 	};
 
 	setup_logging("net", DEBUG_STDOUT);
@@ -179,15 +182,11 @@ static int binary_net(int argc, const char **argv)
 	ZERO_STRUCTP(ctx);
 	ctx->mem_ctx = mem_ctx;
 
-	pc = poptGetContext(NULL, argc, (const char **) argv, long_options, 
-			    POPT_CONTEXT_KEEP_FIRST);
+	pc = poptGetContext("net", argc, (const char **) argv, long_options, 
+				POPT_CONTEXT_KEEP_FIRST);
 
 	while((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {
-		case 'h':
-			net_help(ctx, argc, argv);
-			exit(0);
-			break;
 		default:
 			d_printf("Invalid option %s: %s\n", 
 				 poptBadOption(pc, 0), poptStrerror(opt));
-- 
cgit 


From 124e00068f2187e254f76cd82e913809870d799c Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 19 Aug 2004 12:36:05 +0000
Subject: r1915: use popt's cmdline_auth_info to fill the net_context and print
 the user domain when prompting for a new password

metze
(This used to be commit aedb2e9e1c418a7ac3cc18299707ae9146e4047a)
---
 source4/utils/net/net.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 05dbb35f41..89f4e77735 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -156,6 +156,7 @@ static int binary_net(int argc, const char **argv)
 	const char **argv_new;
 	TALLOC_CTX *mem_ctx;
 	struct net_context *ctx;
+	const char *domain;
 	poptContext pc;
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
@@ -172,16 +173,6 @@ static int binary_net(int argc, const char **argv)
 	setbuffer(stdout, NULL, 0);
 #endif
 
-	mem_ctx = talloc_init("net_context");
-	ctx = talloc_p(mem_ctx, struct net_context);
-	if (!ctx) {
-		d_printf("talloc_init(net_context) failed\n");
-		exit(1);
-	}
-
-	ZERO_STRUCTP(ctx);
-	ctx->mem_ctx = mem_ctx;
-
 	pc = poptGetContext("net", argc, (const char **) argv, long_options, 
 				POPT_CONTEXT_KEEP_FIRST);
 
@@ -213,6 +204,25 @@ static int binary_net(int argc, const char **argv)
 		return 1;
 	}
 
+	if (cmdline_auth_info.domain[0]) {
+		domain = cmdline_auth_info.domain;
+	} else {
+		domain = lp_workgroup();
+	}
+
+	mem_ctx = talloc_init("net_context");
+	ctx = talloc_p(mem_ctx, struct net_context);
+	if (!ctx) {
+		d_printf("talloc_init(net_context) failed\n");
+		exit(1);
+	}
+
+	ZERO_STRUCTP(ctx);
+	ctx->mem_ctx = mem_ctx;
+	ctx->user.account_name = talloc_strdup(ctx->mem_ctx, cmdline_auth_info.username);
+	ctx->user.domain_name = talloc_strdup(ctx->mem_ctx, domain);
+	ctx->user.password = talloc_strdup(ctx->mem_ctx, cmdline_auth_info.password);
+
 	rc = net_run_function(ctx, argc_new-1, argv_new+1, net_functable, net_usage);
 
 	if (rc != 0) {
-- 
cgit 


From c2e2921bada17aae84e6c29f48401fa467e8ed9c Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 20 Aug 2004 09:48:25 +0000
Subject: r1949: provide functions to access the username, userdomain and
 userpassword

now you're prompted when cmdline_get_userpassword() is called
and the password is not yet known

metze
(This used to be commit d14a01533c5d465ff3709c48576b798b3be807e0)
---
 source4/utils/net/net.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 89f4e77735..da64466869 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -156,7 +156,6 @@ static int binary_net(int argc, const char **argv)
 	const char **argv_new;
 	TALLOC_CTX *mem_ctx;
 	struct net_context *ctx;
-	const char *domain;
 	poptContext pc;
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
@@ -204,12 +203,6 @@ static int binary_net(int argc, const char **argv)
 		return 1;
 	}
 
-	if (cmdline_auth_info.domain[0]) {
-		domain = cmdline_auth_info.domain;
-	} else {
-		domain = lp_workgroup();
-	}
-
 	mem_ctx = talloc_init("net_context");
 	ctx = talloc_p(mem_ctx, struct net_context);
 	if (!ctx) {
@@ -219,9 +212,9 @@ static int binary_net(int argc, const char **argv)
 
 	ZERO_STRUCTP(ctx);
 	ctx->mem_ctx = mem_ctx;
-	ctx->user.account_name = talloc_strdup(ctx->mem_ctx, cmdline_auth_info.username);
-	ctx->user.domain_name = talloc_strdup(ctx->mem_ctx, domain);
-	ctx->user.password = talloc_strdup(ctx->mem_ctx, cmdline_auth_info.password);
+	ctx->user.account_name = talloc_strdup(ctx->mem_ctx, cmdline_get_username());
+	ctx->user.domain_name = talloc_strdup(ctx->mem_ctx, cmdline_get_userdomain());
+	ctx->user.password = talloc_strdup(ctx->mem_ctx, cmdline_get_userpassword());
 
 	rc = net_run_function(ctx, argc_new-1, argv_new+1, net_functable, net_usage);
 
-- 
cgit 


From 7eb820d31b39cda74b56c4c2dc66daa768f5216f Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 25 Aug 2004 12:14:06 +0000
Subject: r2066: add 'net time' command

use it like:

net time <server>
net time <server> -U "" -N
net time <server> -U DOM\\user
...

metze
(This used to be commit ea14b2780f1cb6597ba4e71b83364e6a39e966fe)
---
 source4/utils/net/net.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index da64466869..ce817309cc 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -135,6 +135,7 @@ static int net_help_usage(struct net_context *ctx, int argc, const char **argv)
 /* main function table */
 static const struct net_functable const net_functable[] = {
 	{"password", net_password, net_password_usage, net_password_help},
+	{"time", net_time, net_time_usage, net_time_help},
 
 	{"help", net_help, net_help_usage, net_help},
 	{NULL, NULL}
-- 
cgit 


From edbfc0f6e70150e321822365bf0eead2821551bd Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 2 Nov 2004 02:57:18 +0000
Subject: r3453: - split out the auth and popt includes

- tidied up some of the system includes

- moved a few more structures back from misc.idl to netlogon.idl and samr.idl now that pidl
  knows about inter-IDL dependencies
(This used to be commit 7b7477ac42d96faac1b0ff361525d2c63cedfc64)
---
 source4/utils/net/net.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index ce817309cc..5a4ececa5b 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -42,6 +42,7 @@
 /*****************************************************/
 
 #include "includes.h"
+#include "lib/cmdline/popt_common.h"
 
 /*
   run a function from a function table. If not found then
-- 
cgit 


From 6bd02aa5046b606171a680e6f8aefba31b744af1 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 2 Nov 2004 11:42:35 +0000
Subject: r3478: split out some more pieces of includes.h (This used to be
 commit 8e9212ecfc61c509f686363d8ec412ce54bc1c8d)

---
 source4/utils/net/net.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 5a4ececa5b..3409101b71 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -42,6 +42,7 @@
 /*****************************************************/
 
 #include "includes.h"
+#include "utils/net/net.h"
 #include "lib/cmdline/popt_common.h"
 
 /*
-- 
cgit 


From 6f214cc510a59b7a65ee9d4486baf14a3e579f73 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 3 Nov 2004 00:17:12 +0000
Subject: r3494: got rid of include/rewrite.h, and split out the dynconfig.h
 header (This used to be commit 558de54ec6432a4ae90aa14a585f32c6cd03ced2)

---
 source4/utils/net/net.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 3409101b71..380afd6120 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -42,6 +42,7 @@
 /*****************************************************/
 
 #include "includes.h"
+#include "dynconfig.h"
 #include "utils/net/net.h"
 #include "lib/cmdline/popt_common.h"
 
-- 
cgit 


From 71db46ea665606384f2be1be708c74c97c9adfb2 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 6 Nov 2004 23:23:15 +0000
Subject: r3586: Fix some of the issues with the module init functions.

Both subsystems and modules can now have init functions, which can be
specified in .mk files (INIT_FUNCTION = ...)

The build system will define :
 - SUBSYSTEM_init_static_modules that calls the init functions of all statically compiled modules. Failing to load will generate an error which is not fatal
 - BINARY_init_subsystems that calls the init functions (if defined) for the subsystems the binary depends on

This removes the hack with the "static bool Initialised = " and the
"lazy_init" functions
(This used to be commit 7a8244761bfdfdfb48f8264d76951ebdfbf7bd8a)
---
 source4/utils/net/net.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 380afd6120..dcd663d3fd 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -232,5 +232,6 @@ static int binary_net(int argc, const char **argv)
 
  int main(int argc, const char **argv)
 {
+	net_init_subsystems;
 	return binary_net(argc, argv);
 }
-- 
cgit 


From 4815480bb6ed44081076bac5471267609f7668cf Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 9 Nov 2004 09:26:47 +0000
Subject: r3633: - moved module init functions to after smb.conf and command
 line   parsing, so that module init can take account of lp_ parms (thats  
 why gensec:krb5=no wasn't working)

- added a BASE-DISCONNECT torture test that tests server response to
  clients disconnecting with open lock and open requests pending
(This used to be commit 5205f598b8c0be6985e61cc842cc5da109ba5b7e)
---
 source4/utils/net/net.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index dcd663d3fd..ac427c4935 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -207,6 +207,8 @@ static int binary_net(int argc, const char **argv)
 		return 1;
 	}
 
+	net_init_subsystems;
+
 	mem_ctx = talloc_init("net_context");
 	ctx = talloc_p(mem_ctx, struct net_context);
 	if (!ctx) {
@@ -232,6 +234,5 @@ static int binary_net(int argc, const char **argv)
 
  int main(int argc, const char **argv)
 {
-	net_init_subsystems;
 	return binary_net(argc, argv);
 }
-- 
cgit 


From 4183b2ac3832cdc2055d7eb3ed7121a9ea91085c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 2 Dec 2004 04:51:56 +0000
Subject: r4037: fixed a bunch of "might be uninitialised" warnings after
 enabling -O1 in my compile (This used to be commit
 0928b1f5b68c858922c3ea6c27ed03b5091c6221)

---
 source4/utils/net/net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index ac427c4935..199f0429d6 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -159,7 +159,7 @@ static int binary_net(int argc, const char **argv)
 	int argc_new;
 	const char **argv_new;
 	TALLOC_CTX *mem_ctx;
-	struct net_context *ctx;
+	struct net_context *ctx = NULL;
 	poptContext pc;
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
-- 
cgit 


From e07525eabdf9d6430a683dc809b453212e764fd5 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 14 Dec 2004 06:25:19 +0000
Subject: r4201: Remove duplicate const. (This used to be commit
 1d96717843a9b60a757548a24967bbb553775fa3)

---
 source4/utils/net/net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 199f0429d6..022bb9225e 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -136,7 +136,7 @@ static int net_help_usage(struct net_context *ctx, int argc, const char **argv)
 }
 
 /* main function table */
-static const struct net_functable const net_functable[] = {
+static const struct net_functable net_functable[] = {
 	{"password", net_password, net_password_usage, net_password_help},
 	{"time", net_time, net_time_usage, net_time_help},
 
-- 
cgit 


From 335a277662d28b935c9d84a3d7a98276afdffd3e Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 13 Jan 2005 07:50:09 +0000
Subject: r4722: Start to add 'net join' to Samba4.

Andrew Bartlett
(This used to be commit a9b960609142e15ba5950eb1b22944eb6df18d9c)
---
 source4/utils/net/net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 022bb9225e..350ec251d9 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -139,7 +139,7 @@ static int net_help_usage(struct net_context *ctx, int argc, const char **argv)
 static const struct net_functable net_functable[] = {
 	{"password", net_password, net_password_usage, net_password_help},
 	{"time", net_time, net_time_usage, net_time_help},
-
+	{"join", net_join, net_join_usage, net_join_help},
 	{"help", net_help, net_help_usage, net_help},
 	{NULL, NULL}
 };
-- 
cgit 


From 759da3b915e2006d4c87b5ace47f399accd9ce91 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 27 Jan 2005 07:08:20 +0000
Subject: r5037: got rid of all of the TALLOC_DEPRECATED stuff. My apologies
 for the large commit. I thought this was worthwhile to get done for
 consistency. (This used to be commit
 ec32b22ed5ec224f6324f5e069d15e92e38e15c0)

---
 source4/utils/net/net.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 350ec251d9..7b716f0916 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -210,7 +210,7 @@ static int binary_net(int argc, const char **argv)
 	net_init_subsystems;
 
 	mem_ctx = talloc_init("net_context");
-	ctx = talloc_p(mem_ctx, struct net_context);
+	ctx = talloc(mem_ctx, struct net_context);
 	if (!ctx) {
 		d_printf("talloc_init(net_context) failed\n");
 		exit(1);
@@ -228,7 +228,7 @@ static int binary_net(int argc, const char **argv)
 		DEBUG(0,("return code = %d\n", rc));
 	}
 
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return rc;
 }
 
-- 
cgit 


From 082a5684738e7b9fce7466d7e7519816605b0958 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Mon, 14 Feb 2005 00:59:52 +0000
Subject: r5381: Added net_user.c with net tool interface for managing user
 accounts.

rafal
(This used to be commit 3005f0408c647fcab65c11de9bf680f7f5831492)
---
 source4/utils/net/net.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 7b716f0916..63f19624f0 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -140,6 +140,7 @@ static const struct net_functable net_functable[] = {
 	{"password", net_password, net_password_usage, net_password_help},
 	{"time", net_time, net_time_usage, net_time_help},
 	{"join", net_join, net_join_usage, net_join_help},
+	{"user", net_user, net_user_usage, net_user_help},
 	{"help", net_help, net_help_usage, net_help},
 	{NULL, NULL}
 };
-- 
cgit 


From a19b2e84f81baaa24651a44076ce2c62056135e9 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Wed, 16 Feb 2005 21:51:37 +0000
Subject: r5424: Automatically generate basic help display on basis of name and
 description from function table.

rafal
(This used to be commit 24f7a3860e82bf632ebd6b3416e5e874e832be5f)
---
 source4/utils/net/net.c | 81 +++++++++++++++++++------------------------------
 1 file changed, 31 insertions(+), 50 deletions(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 63f19624f0..fb87a5a6d9 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -57,9 +57,11 @@ int net_run_function(struct net_context *ctx,
 {
 	int i;
 
-	if (argc < 1) {
-		d_printf("Usage: \n");
+	if (argc == 0) {
 		return usage_fn(ctx, argc, argv);
+
+	} else if (argc == 1 && strequal(argv[0], "help")) {
+		return net_help(ctx, functable);
 	}
 
 	for (i=0; functable[i].name; i++) {
@@ -79,12 +81,12 @@ int net_run_usage(struct net_context *ctx,
 			const struct net_functable *functable)
 {
 	int i;
-
+/*
 	if (argc < 1) {
 		d_printf("net_run_usage: TODO (argc < 1)\n");
 		return 1;
 	}
-
+*/
 	for (i=0; functable[i].name; i++) {
 		if (StrCaseCmp(argv[0], functable[i].name) == 0)
 			if (functable[i].usage) {
@@ -92,62 +94,42 @@ int net_run_usage(struct net_context *ctx,
 			}
 	}
 
-	d_printf("No usage for command: %s\n", argv[0]);
+	d_printf("No usage information for command: %s\n", argv[0]);
 
 	return 1;
 }
 
-/*
-  run a usage function from a function table. If not found then fail
-*/
-int net_run_help(struct net_context *ctx,
-			int argc, const char **argv,
-			const struct net_functable *functable)
-{
-	int i;
 
-	if (argc < 1) {
-		d_printf("net_run_help: TODO (argc < 1)\n");
-		return 1;
-	}
+/* main function table */
+static const struct net_functable net_functable[] = {
+	{"password", "change password\n", net_password, net_password_usage},
+	{"time", "get remote server's time\n", net_time, net_time_usage},
+	{"join", "join a domain\n", net_join, net_join_usage},
+	{"user", "manage user accounts\n", net_user, net_user_usage},
+	{NULL, NULL, NULL, NULL}
+};
 
-	for (i=0; functable[i].name; i++) {
-		if (StrCaseCmp(argv[0], functable[i].name) == 0)
-			if (functable[i].help) {
-				return functable[i].help(ctx, argc-1, argv+1);
-			}
+int net_help(struct net_context *ctx, const struct net_functable *ftable)
+{
+	int i = 0;
+	const char *name = ftable[i].name;
+	const char *desc = ftable[i].desc;
+
+	d_printf("Available commands:\n");
+	while (name && desc) {
+		d_printf("\t%s\t\t%s", name, desc);
+		name = ftable[++i].name;
+		desc = ftable[i].desc;
 	}
 
-	d_printf("No help for command: %s\n", argv[0]);
-
-	return 1;
-}
-
-static int net_help(struct net_context *ctx, int argc, const char **argv)
-{
-	d_printf("net_help: TODO\n");
 	return 0;
 }
 
-static int net_help_usage(struct net_context *ctx, int argc, const char **argv)
-{
-	d_printf("net_help_usage: TODO\n");
-	return 0;	
-}
-
-/* main function table */
-static const struct net_functable net_functable[] = {
-	{"password", net_password, net_password_usage, net_password_help},
-	{"time", net_time, net_time_usage, net_time_help},
-	{"join", net_join, net_join_usage, net_join_help},
-	{"user", net_user, net_user_usage, net_user_help},
-	{"help", net_help, net_help_usage, net_help},
-	{NULL, NULL}
-};
-
 static int net_usage(struct net_context *ctx, int argc, const char **argv)
 {
-	return net_run_usage(ctx, argc, argv, net_functable);
+	d_printf("Usage:\n");
+	d_printf("net <command> [options]\n");
+	return 0;
 }
 
 /****************************************************************************
@@ -185,7 +167,7 @@ static int binary_net(int argc, const char **argv)
 		default:
 			d_printf("Invalid option %s: %s\n", 
 				 poptBadOption(pc, 0), poptStrerror(opt));
-			net_help(ctx, argc, argv);
+			net_usage(ctx, argc, argv);
 			exit(1);
 		}
 	}
@@ -204,8 +186,7 @@ static int binary_net(int argc, const char **argv)
 	}
 
 	if (argc_new < 2) {
-		d_printf("Usage: TODO\n");
-		return 1;
+		return net_usage(ctx, argc, argv);
 	}
 
 	net_init_subsystems;
-- 
cgit 


From 02075be0bbc2095073f8898350fded64a7c97c79 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 21 Mar 2005 02:08:38 +0000
Subject: r5917: First step in using the new cli_credentials structure. This
 patch puts support for it into popt_common, adds a few utility functions (in
 lib/credentials.c) and the callback functions for the command-line
 (lib/cmdline/credentials.c). Comments are welcome :-) (This used to be commit
 1d49b57c50fe8c2683ea23e9df41ce8ad774db98)

---
 source4/utils/net/net.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index fb87a5a6d9..96ae23c7e4 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -200,9 +200,7 @@ static int binary_net(int argc, const char **argv)
 
 	ZERO_STRUCTP(ctx);
 	ctx->mem_ctx = mem_ctx;
-	ctx->user.account_name = talloc_strdup(ctx->mem_ctx, cmdline_get_username());
-	ctx->user.domain_name = talloc_strdup(ctx->mem_ctx, cmdline_get_userdomain());
-	ctx->user.password = talloc_strdup(ctx->mem_ctx, cmdline_get_userpassword());
+	ctx->credentials = cmdline_credentials;
 
 	rc = net_run_function(ctx, argc_new-1, argv_new+1, net_functable, net_usage);
 
-- 
cgit 


From 8bf57cf8f57be28831023c2218d358b24b705256 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 2 May 2005 14:17:19 +0000
Subject: r6573: Start on my project to implement an NT4 compatible BDC in
 Samba4.

This brings in a compatability layer for Samba3 in Samba4 - where we
will start to define file formats and similar details.

The 'net samdump' command uses 'password server = ' for now, and
performs a similar task to Samba3's 'net rpc samsync'.

Andrew Bartlett
(This used to be commit 550f17f9924fe783917318753de7d1a388423908)
---
 source4/utils/net/net.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 96ae23c7e4..c7c6f7dec9 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -105,6 +105,7 @@ static const struct net_functable net_functable[] = {
 	{"password", "change password\n", net_password, net_password_usage},
 	{"time", "get remote server's time\n", net_time, net_time_usage},
 	{"join", "join a domain\n", net_join, net_join_usage},
+	{"samdump", "dump the sam of a domain\n", net_samdump, net_samdump_usage},
 	{"user", "manage user accounts\n", net_user, net_user_usage},
 	{NULL, NULL, NULL, NULL}
 };
-- 
cgit 


From 2b4791ae733488845b2c36bca64db695203de571 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 13 Jun 2005 08:12:39 +0000
Subject: r7525: Unify lp_load(), load_interfaces and logging setup into
 popt().

There is now a new --debug-stderr option to enable debug to STDERR.

popt isn't perfect, but the callbacks are used in all the main Samba
binaries, and should be used in the rest.  This avoids duplicated
code, and ensures every binary is setup correctly.

This also ensures the setup happens early enough to have -s function,
and have a correct impact on the credentials code.  (Fixing a bug that
frustrated tridge earlier today).

The only 'subtle' aspect of all this is that I'm pretty sure that the
SAMBA_COMMON popt code must be above the CREDENTIALS code, in the
popt tables.

Andrew Bartlett
(This used to be commit 50f3c2b3a22971f40e0d3a88127b5120bfc47591)
---
 source4/utils/net/net.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index c7c6f7dec9..51b860234d 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -154,14 +154,12 @@ static int binary_net(int argc, const char **argv)
 		POPT_TABLEEND
 	};
 
-	setup_logging("net", DEBUG_STDOUT);
-
 #ifdef HAVE_SETBUFFER
 	setbuffer(stdout, NULL, 0);
 #endif
 
 	pc = poptGetContext("net", argc, (const char **) argv, long_options, 
-				POPT_CONTEXT_KEEP_FIRST);
+			    POPT_CONTEXT_KEEP_FIRST);
 
 	while((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {
@@ -173,9 +171,6 @@ static int binary_net(int argc, const char **argv)
 		}
 	}
 
-	lp_load(dyn_CONFIGFILE,True,False,False);
-	load_interfaces();
-
 	argv_new = (const char **)poptGetArgs(pc);
 
 	argc_new = argc;
-- 
cgit 


From 6d26a7114f233418b17b76c3e8dc73086a901ed7 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 25 Jul 2005 06:33:51 +0000
Subject: r8752: With all the infrustructure done, details like a SamSync
 migration into LDB are actually quite easy.

This brings us the users, and sets basic domain information.

You are expected to have provisioned with the settings for the target
domain, and have joined the domain as a BDC.  Then simply 'net
samsync'.

Now we just need to flesh out the delta types.

Andrew Bartlett
(This used to be commit 1e0f7792bb29b17c23197a5e42ee8cabb0cf17d0)
---
 source4/utils/net/net.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 51b860234d..787f71705b 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -106,6 +106,7 @@ static const struct net_functable net_functable[] = {
 	{"time", "get remote server's time\n", net_time, net_time_usage},
 	{"join", "join a domain\n", net_join, net_join_usage},
 	{"samdump", "dump the sam of a domain\n", net_samdump, net_samdump_usage},
+	{"samsync", "syncrosnise into the local ldb the sam of a domain\n", net_samsync_ldb, net_samsync_ldb_usage},
 	{"user", "manage user accounts\n", net_user, net_user_usage},
 	{NULL, NULL, NULL, NULL}
 };
-- 
cgit 


From b674411eb46c9e45f2740a1f9bac365e9a347e9c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 30 Aug 2005 11:55:05 +0000
Subject: r9792: Rename StrCaseCmp -> strcasecmp_m. All these years I was
 thinking StrCaseCmp was sys_strcasecmp, while it is in fact strcasecmp_m!
 (This used to be commit 200a8f6652cb2de7a8037a7a4c2a204b50aee2b1)

---
 source4/utils/net/net.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 787f71705b..b6f54a46ce 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -65,7 +65,7 @@ int net_run_function(struct net_context *ctx,
 	}
 
 	for (i=0; functable[i].name; i++) {
-		if (StrCaseCmp(argv[0], functable[i].name) == 0)
+		if (strcasecmp_m(argv[0], functable[i].name) == 0)
 			return functable[i].fn(ctx, argc-1, argv+1);
 	}
 
@@ -88,7 +88,7 @@ int net_run_usage(struct net_context *ctx,
 	}
 */
 	for (i=0; functable[i].name; i++) {
-		if (StrCaseCmp(argv[0], functable[i].name) == 0)
+		if (strcasecmp_m(argv[0], functable[i].name) == 0)
 			if (functable[i].usage) {
 				return functable[i].usage(ctx, argc-1, argv+1);
 			}
-- 
cgit 


From d2a666acbe04f741387ff4351e3971b24f1c3b14 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 19 Sep 2005 13:26:07 +0000
Subject: r10316: More dynconfig fixes (This used to be commit
 0963ab9c148772b961f17ec779213b0eb861e1dd)

---
 source4/utils/net/net.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index b6f54a46ce..132b3a1c03 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -42,7 +42,6 @@
 /*****************************************************/
 
 #include "includes.h"
-#include "dynconfig.h"
 #include "utils/net/net.h"
 #include "lib/cmdline/popt_common.h"
 
-- 
cgit 


From 6aafed9600a3fa05932668c70fc0e20f3724dab6 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 26 Dec 2005 18:48:23 +0000
Subject: r12499: Move smb_build.h out of includes.h (This used to be commit
 c92ace494f92084ddf178626cdf392d151043bc7)

---
 source4/utils/net/net.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 132b3a1c03..17b12b7103 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -44,6 +44,7 @@
 #include "includes.h"
 #include "utils/net/net.h"
 #include "lib/cmdline/popt_common.h"
+#include "smb_build.h"
 
 /*
   run a function from a function table. If not found then
-- 
cgit 


From aa9f67163cd2df2a815ef585edad1951343b82c8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 30 Dec 2005 22:46:16 +0000
Subject: r12620: Get rid of automatically generated lists of init functions of
 subsystems. This allows Samba libraries to be used by other projects (and
 parts of Samba to be built as shared libraries). (This used to be commit
 44f0aba715bfedc7e1ee3d07e9a101a91dbd84b3)

---
 source4/utils/net/net.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 17b12b7103..f82eddb763 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -44,7 +44,6 @@
 #include "includes.h"
 #include "utils/net/net.h"
 #include "lib/cmdline/popt_common.h"
-#include "smb_build.h"
 
 /*
   run a function from a function table. If not found then
@@ -186,7 +185,7 @@ static int binary_net(int argc, const char **argv)
 		return net_usage(ctx, argc, argv);
 	}
 
-	net_init_subsystems;
+	dcerpc_init();
 
 	mem_ctx = talloc_init("net_context");
 	ctx = talloc(mem_ctx, struct net_context);
-- 
cgit 


From 49efc495417b5900c653f8d6453dcceed9c02239 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 6 Mar 2006 23:34:57 +0000
Subject: r13904: Make sure LDB gets initialized (This used to be commit
 4339e3e7d746d2fcb16ce2662a22a880e426367b)

---
 source4/utils/net/net.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index f82eddb763..303449c742 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -44,6 +44,7 @@
 #include "includes.h"
 #include "utils/net/net.h"
 #include "lib/cmdline/popt_common.h"
+#include "lib/ldb/include/ldb.h"
 
 /*
   run a function from a function table. If not found then
@@ -187,6 +188,8 @@ static int binary_net(int argc, const char **argv)
 
 	dcerpc_init();
 
+	ldb_global_init();
+
 	mem_ctx = talloc_init("net_context");
 	ctx = talloc(mem_ctx, struct net_context);
 	if (!ctx) {
-- 
cgit 


From 35349a58df5b69446607fbd742a05f57f3515319 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 18 Mar 2006 15:42:57 +0000
Subject: r14542: Remove librpc, libndr and libnbt from includes.h (This used
 to be commit 51b4270513752d2eafbe77f9de598de16ef84a1f)

---
 source4/utils/net/net.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 303449c742..a6015f7c34 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -45,6 +45,7 @@
 #include "utils/net/net.h"
 #include "lib/cmdline/popt_common.h"
 #include "lib/ldb/include/ldb.h"
+#include "librpc/rpc/dcerpc.h"
 
 /*
   run a function from a function table. If not found then
-- 
cgit 


From ece95aad3da31809369e8867493bffb5cb749993 Mon Sep 17 00:00:00 2001
From: Rafal Szczesniak <mimir@samba.org>
Date: Sun, 7 May 2006 13:40:56 +0000
Subject: r15490: Typo fixes and remove long forgotten commented piece.

rafal
(This used to be commit a2f6dc786031aa368b0398c21baf18cf82375c46)
---
 source4/utils/net/net.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index a6015f7c34..f2223a03a3 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -82,12 +82,7 @@ int net_run_usage(struct net_context *ctx,
 			const struct net_functable *functable)
 {
 	int i;
-/*
-	if (argc < 1) {
-		d_printf("net_run_usage: TODO (argc < 1)\n");
-		return 1;
-	}
-*/
+
 	for (i=0; functable[i].name; i++) {
 		if (strcasecmp_m(argv[0], functable[i].name) == 0)
 			if (functable[i].usage) {
@@ -107,7 +102,7 @@ static const struct net_functable net_functable[] = {
 	{"time", "get remote server's time\n", net_time, net_time_usage},
 	{"join", "join a domain\n", net_join, net_join_usage},
 	{"samdump", "dump the sam of a domain\n", net_samdump, net_samdump_usage},
-	{"samsync", "syncrosnise into the local ldb the sam of a domain\n", net_samsync_ldb, net_samsync_ldb_usage},
+	{"samsync", "synchronise into the local ldb the sam of a domain\n", net_samsync_ldb, net_samsync_ldb_usage},
 	{"user", "manage user accounts\n", net_user, net_user_usage},
 	{NULL, NULL, NULL, NULL}
 };
-- 
cgit 


From 873749f2189ecf1fbfdc681df4dd304a17716279 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 6 Sep 2006 12:28:01 +0000
Subject: r18168: Use {NULL} rather than POPT_TABLEEND, which is not always
 available. (This used to be commit 8b622c5ded0732df0eaf9f6226f52a27b6eacd73)

---
 source4/utils/net/net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index f2223a03a3..70c1de922d 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -148,7 +148,7 @@ static int binary_net(int argc, const char **argv)
 		POPT_COMMON_CONNECTION
 		POPT_COMMON_CREDENTIALS
 		POPT_COMMON_VERSION
-		POPT_TABLEEND
+		{ NULL }
 	};
 
 #ifdef HAVE_SETBUFFER
-- 
cgit 


From a8421e81078b91ae97ada3be352416eae26a9c7b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 10 Sep 2006 14:19:38 +0000
Subject: r18343: fixed setlinebuf() prototype, added test for it, and use it
 in two places to avoid a #ifdef (This used to be commit
 095b8057740a4bb207e24e4c63a2dcb53521a72f)

---
 source4/utils/net/net.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 70c1de922d..7e885acfe8 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -151,9 +151,7 @@ static int binary_net(int argc, const char **argv)
 		{ NULL }
 	};
 
-#ifdef HAVE_SETBUFFER
-	setbuffer(stdout, NULL, 0);
-#endif
+	setlinebuf(stdout);
 
 	pc = poptGetContext("net", argc, (const char **) argv, long_options, 
 			    POPT_CONTEXT_KEEP_FIRST);
-- 
cgit 


From 0479a2f1cbae51fcd8dbdc3c148c808421fb4d25 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 10 Jul 2007 02:07:03 +0000
Subject: r23792: convert Samba4 to GPLv3

There are still a few tidyups of old FSF addresses to come (in both s3
and s4). More commits soon.
(This used to be commit fcf38a38ac691abd0fa51b89dc951a08e89fdafa)
---
 source4/utils/net/net.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 7e885acfe8..64e82e226a 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -16,7 +16,7 @@
 
    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,
@@ -25,8 +25,7 @@
    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/>.
 */
  
 /*****************************************************/
-- 
cgit 


From a693e6f1c71d9772b52cf40a85b0504cea837240 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 4 Dec 2007 19:33:00 +0100
Subject: r26295: Remove use of global_loadparm for net and wb_pam_auth. (This
 used to be commit 47696b42987ea67ae1c6c09a4bec5858e5db4542)

---
 source4/utils/net/net.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 64e82e226a..2741f485cc 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -45,6 +45,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "lib/ldb/include/ldb.h"
 #include "librpc/rpc/dcerpc.h"
+#include "param/param.h"
 
 /*
   run a function from a function table. If not found then
@@ -192,6 +193,7 @@ static int binary_net(int argc, const char **argv)
 
 	ZERO_STRUCTP(ctx);
 	ctx->mem_ctx = mem_ctx;
+	ctx->lp_ctx = global_loadparm;
 	ctx->credentials = cmdline_credentials;
 
 	rc = net_run_function(ctx, argc_new-1, argv_new+1, net_functable, net_usage);
-- 
cgit 


From b65dba2245bf382c47d65c95ac9b1efa43918fc0 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 10 Dec 2007 04:33:16 +0100
Subject: r26355: Eliminate global_loadparm in more places. (This used to be
 commit 5d589a0d94bd76a9b4c9fc748854e8098ea43c4d)

---
 source4/utils/net/net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 2741f485cc..2c95e9033d 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -193,7 +193,7 @@ static int binary_net(int argc, const char **argv)
 
 	ZERO_STRUCTP(ctx);
 	ctx->mem_ctx = mem_ctx;
-	ctx->lp_ctx = global_loadparm;
+	ctx->lp_ctx = cmdline_lp_ctx;
 	ctx->credentials = cmdline_credentials;
 
 	rc = net_run_function(ctx, argc_new-1, argv_new+1, net_functable, net_usage);
-- 
cgit 


From 0020793515ade04f3ef5754717490e2eb2ca6bb9 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 20 Feb 2008 03:40:44 +0100
Subject: Fix static module list generation for ldb. (This used to be commit
 92c1c0e9137f0845cac6cc96bf78711b6aaffe21)

---
 source4/utils/net/net.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 2c95e9033d..e0865c4416 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -182,8 +182,6 @@ static int binary_net(int argc, const char **argv)
 
 	dcerpc_init();
 
-	ldb_global_init();
-
 	mem_ctx = talloc_init("net_context");
 	ctx = talloc(mem_ctx, struct net_context);
 	if (!ctx) {
-- 
cgit 


From 8a982108a4f115e350c4246276f2ec886934c7fe Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 9 Apr 2008 14:59:32 +1000
Subject: Link the new vampire code togeather.

This adds in the newly attached secrets handling, as well as an
interface to the command line 'net' tool.

Andrew Bartlett
(This used to be commit 1282e3c39479aa580124206814b493370d10690a)
---
 source4/utils/net/net.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index e0865c4416..c908ea6279 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -102,7 +102,8 @@ static const struct net_functable net_functable[] = {
 	{"time", "get remote server's time\n", net_time, net_time_usage},
 	{"join", "join a domain\n", net_join, net_join_usage},
 	{"samdump", "dump the sam of a domain\n", net_samdump, net_samdump_usage},
-	{"samsync", "synchronise into the local ldb the sam of a domain\n", net_samsync_ldb, net_samsync_ldb_usage},
+	{"vampire", "join and syncronise an AD domain onto the local server\n", net_vampire, net_vampire_usage},
+	{"samsync", "synchronise into the local ldb the sam of an NT4 domain\n", net_samsync_ldb, net_samsync_ldb_usage},
 	{"user", "manage user accounts\n", net_user, net_user_usage},
 	{NULL, NULL, NULL, NULL}
 };
-- 
cgit 


From 4f51b0246db3242ee02ee16905cba13a5dc5633a Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Mon, 14 Apr 2008 12:43:37 -0400
Subject: Fix problems with event context not being the parent. (This used to
 be commit 957c4d893acf9e6db06a3fc3a4687ab6bb238635)

---
 source4/utils/net/net.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index c908ea6279..6086a4ce32 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -46,6 +46,8 @@
 #include "lib/ldb/include/ldb.h"
 #include "librpc/rpc/dcerpc.h"
 #include "param/param.h"
+#include "lib/events/events.h"
+#include "auth/credentials/credentials.h"
 
 /*
   run a function from a function table. If not found then
@@ -140,7 +142,7 @@ static int binary_net(int argc, const char **argv)
 	int rc;
 	int argc_new;
 	const char **argv_new;
-	TALLOC_CTX *mem_ctx;
+	struct event_context *ev;
 	struct net_context *ctx = NULL;
 	poptContext pc;
 	struct poptOption long_options[] = {
@@ -183,17 +185,21 @@ static int binary_net(int argc, const char **argv)
 
 	dcerpc_init();
 
-	mem_ctx = talloc_init("net_context");
-	ctx = talloc(mem_ctx, struct net_context);
+	ev = event_context_init(NULL);
+	if (!ev) {
+		d_printf("Failed to create an event context\n");
+		exit(1);
+	}
+	ctx = talloc(ev, struct net_context);
 	if (!ctx) {
-		d_printf("talloc_init(net_context) failed\n");
+		d_printf("Failed to talloc a net_context\n");
 		exit(1);
 	}
 
 	ZERO_STRUCTP(ctx);
-	ctx->mem_ctx = mem_ctx;
 	ctx->lp_ctx = cmdline_lp_ctx;
 	ctx->credentials = cmdline_credentials;
+	cli_credentials_set_event_context(ctx->credentials, ev);
 
 	rc = net_run_function(ctx, argc_new-1, argv_new+1, net_functable, net_usage);
 
@@ -201,7 +207,7 @@ static int binary_net(int argc, const char **argv)
 		DEBUG(0,("return code = %d\n", rc));
 	}
 
-	talloc_free(mem_ctx);
+	talloc_free(ev);
 	return rc;
 }
 
-- 
cgit 


From a5d52174bd993b32d01d26a795a56df4a92eba45 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 16 Apr 2008 22:30:15 +0200
Subject: Avoid event_find_context() when the event context is already
 available in the net utility. (This used to be commit
 d40804777edf41889bd461f63f7a07cc1cc60e27)

---
 source4/utils/net/net.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 6086a4ce32..ab81f07225 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -199,6 +199,7 @@ static int binary_net(int argc, const char **argv)
 	ZERO_STRUCTP(ctx);
 	ctx->lp_ctx = cmdline_lp_ctx;
 	ctx->credentials = cmdline_credentials;
+	ctx->event_ctx = ev;
 	cli_credentials_set_event_context(ctx->credentials, ev);
 
 	rc = net_run_function(ctx, argc_new-1, argv_new+1, net_functable, net_usage);
-- 
cgit 


From 1efbd5fbf6b0f606ed29a763e2adfa6f99c6beac Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 17 Apr 2008 01:03:18 +0200
Subject: Remove event context tracking from the credentials struct. (This used
 to be commit 4d7fc946b2ec50e774689c9036423b6feef99b8e)

---
 source4/utils/net/net.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index ab81f07225..a87b266568 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -200,7 +200,6 @@ static int binary_net(int argc, const char **argv)
 	ctx->lp_ctx = cmdline_lp_ctx;
 	ctx->credentials = cmdline_credentials;
 	ctx->event_ctx = ev;
-	cli_credentials_set_event_context(ctx->credentials, ev);
 
 	rc = net_run_function(ctx, argc_new-1, argv_new+1, net_functable, net_usage);
 
-- 
cgit 


From 2daf2897d5c70c0efbeba9b827c62700b9a9537c Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sat, 14 Jun 2008 13:00:53 -0400
Subject: Use a custom init function for samba4 that sets a samba4 specific
 debug function. By default do not debug, this is the most appropriate action
 for a library as we cannot assume what stderr is use for in the main app. The
 main app is responsible to set ev_debug_stderr if they so desire. (This used
 to be commit e566a2f308ac6fb4b526a744f7059b565670aea5)

---
 source4/utils/net/net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/utils/net/net.c')

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index a87b266568..1c834fe4f0 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -185,7 +185,7 @@ static int binary_net(int argc, const char **argv)
 
 	dcerpc_init();
 
-	ev = event_context_init(NULL);
+	ev = s4_event_context_init(NULL);
 	if (!ev) {
 		d_printf("Failed to create an event context\n");
 		exit(1);
-- 
cgit