r26570: - Trim size of the swig-generated Python bindings by removing a bunch of {}'s.

- Start working on Python equivalents for various EJS tests.
- Fix regression in argument order for reg_diff_apply() in EJS bindings.
(This used to be commit c550c03372cb260b78f6a6c132e70571bc4cb852)

2 files changed, 248 insertions, 232 deletions

diff --git a/source4/scripting/bin/samba3dump b/source4/scripting/bin/samba3dump
index 6b3d999803..44ffc6a861 100755
--- a/source4/scripting/bin/samba3dump
+++ b/source4/scripting/bin/samba3dump
@@ -1,234 +1,157 @@
-#!/bin/sh
-exec smbscript "$0" ${1+"$@"}
-/*
-	Dump Samba3 data
-	Copyright Jelmer Vernooij 2005
-	Released under the GNU GPL v2 or later
-*/
-
-options = GetOptions(ARGV,
-		"POPT_AUTOHELP",
-		"POPT_COMMON_SAMBA",
-		"POPT_COMMON_VERSION",
-		'format=s',
-		'quiet', 'blank');
-
-if (options == undefined) {
-   println("Failed to parse options");
-   return -1;
-}
-
-if (options.format == undefined) {
-	options.format = "summary";
-}
-
-if (options.format != "summary" && options.format != "full") {
-	printf("Unknown format %s\n", options.format);
-	return -1;
-}
-
-libinclude("base.js");
-
-if (options.ARGV.length != 2) {
-	println("Usage: samba3dump <libdir> <smb.conf>");
-	return -1;
-}
-
-function print_header(txt)
-{
-	printf("\n%s\n", txt);
-	println("==========================================");
-}
-
-function print_samba3_policy(pol)
-{
-	print_header("Account Policies");
-	printf("Min password length: %d\n", pol.min_password_length);
-	printf("Password history length: %d\n", pol.password_history);
-	printf("User must logon to change password: %d\n", pol.user_must_logon_to_change_password);
-	printf("Maximum password age: %d\n", pol.maximum_password_age);
-	printf("Minimum password age: %d\n", pol.minimum_password_age);
-	printf("Lockout duration: %d\n", pol.lockout_duration);
-	printf("Reset Count Minutes: %d\n", pol.reset_count_minutes);
-	printf("Bad Lockout Minutes: %d\n", pol.bad_lockout_minutes);
-	printf("Disconnect Time: %d\n", pol.disconnect_time);
-	printf("Refuse Machine Password Change: %d\n", pol.refuse_machine_password_change);
-}
-
-function print_samba3_sam(samba3)
-{
-	var i;
-	print_header("SAM Database");
+#!/usr/bin/python
+#
+#	Dump Samba3 data
+#	Copyright Jelmer Vernooij 2005-2007
+#	Released under the GNU GPL v3 or later
+#
+
+import optparse
+import os, sys
+sys.path.append(os.path.join(os.path.dirname(__file__), "../python"))
+import samba
+import samba.samba3
+
+parser = optparse.OptionParser("provision <libdir> <smb.conf>")
+parser.add_option("--format", type="choice", metavar="FORMAT",
+		          choices=["full", "summary"])
+
+opts, args = parser.parse_args()
+
+if opts.format is None:
+	opts.format = "summary"
+
+def print_header(txt):
+	print "\n%s" % txt
+	print "=========================================="
+
+def print_samba3_policy(pol):
+	print_header("Account Policies")
+	print "Min password length: %d" % pol.min_password_length
+	print "Password history length: %d" % pol.password_history
+	print "User must logon to change password: %d" % pol.user_must_logon_to_change_password
+	print "Maximum password age: %d" % pol.maximum_password_age
+	print "Minimum password age: %d" % pol.minimum_password_age
+	print "Lockout duration: %d" % pol.lockout_duration
+	print "Reset Count Minutes: %d" % pol.reset_count_minutes
+	print "Bad Lockout Minutes: %d" % pol.bad_lockout_minutes
+	print "Disconnect Time: %d" % pol.disconnect_time
+	print "Refuse Machine Password Change: %d" % pol.refuse_machine_password_change
+
+def print_samba3_sam(samba3):
+	print_header("SAM Database")
 	
-	for (i in samba3.samaccounts) {
-		var a = samba3.samaccounts[i];
-		printf("%d: %s\n", a.user_rid, a.username);
-	}
-}
-
-function print_samba3_shares(samba3)
-{
-	var i, j;
-	print_header("Configured shares");
-	for (i in samba3.shares) {
-		var s = samba3.shares[i];
-		printf("--- %s ---\n", s.name);
-
-		for (j in s.parameters) {
-			var p = s.parameters[j];
-			printf("\t%s = %s\n", p.name, p.value);
-		}
-
-		println("");
-	}
-}
-
-function print_samba3_secrets(secrets)
-{
-	var i;
-	print_header("Secrets");
-
-	println("IPC Credentials:");
-	if (secrets.ipc_cred.username_obtained) 
-		printf("	User: %s\n", secrets.ipc_cred.get_username);
-	if (secrets.ipc_cred.password_obtained)
-		printf("	Password: %s\n", secrets.ipc_cred.get_password);
-
-	if (secrets.ipc_cred.domain_obtained)
-		printf("	Domain: %s\n\n", secrets.ipc_cred.get_domain);
-
-	println("LDAP passwords:");
-	for (i in secrets.ldappws) {
-		var pw = secrets.ldappws[i];
-		printf("\t%s -> %s\n", pw.dn, pw.password);
-	}
-	println("");
-
-	println("Domains:");
-	for (i in secrets.domains) {
-		var d = secrets.domains[i];
-		printf("\t--- %s ---\n", d.name);
-		printf("\tSID: %s\n", d.sid);
-		printf("\tGUID: %s\n", d.guid);
-		printf("\tPlaintext pwd: %s\n", d.plaintext_pw);
-		printf("\tLast Changed: %lu\n", d.last_change_time);
-		printf("\tSecure Channel Type: %d\n\n", d.sec_channel_type);
-	}
-
-	println("Trusted domains:");
-	for (i in secrets.trusted_domains) {
-		var td = secrets.trusted_domains[i];
-		for (j = 0; j < td.uni_name_len; j++) {
-			printf("\t--- %s ---\n", td.uni_name[j]);
-		}
-		printf("\tPassword: %s\n", td.pass);
-		printf("\tModified: %lu\n", td.mod_time);
-		printf("\tSID: %s\n", td.domain_sid);
-	}
-}
-
-function print_samba3_regdb(regdb)
-{
-	var i, j;
-	print_header("Registry");
-
-	for (i in regdb.keys) {
-		var k = regdb.keys[i];
-		printf("%s\n", k.name);
-		for (j in k.values) {
-			var v = k.values[j];
-			printf("\t%s: type %d, length %d\n", v.name, v.type, v.data.length);
-		}
-	}
-}
-
-function print_samba3_winsdb(samba3)
-{
-	var i;
-	print_header("WINS Database");
-
-	for (i in samba3.winsentries) {
-		var e = samba3.winsentries[i];
-		printf("%s, nb_flags: %x, type: %d, ttl: %lu, %d ips, fst: %s\n", e.name, e.nb_flags, e.type, e.ttl, e.ips.length, e.ips[0]);
-	}
-}
-
-function print_samba3_groupmappings(groupdb)
-{
-	print_header("Group Mappings");
+	for a in samba3.samaccounts:
+		print "%d: %s" % a.user_rid, a.username
+
+def print_samba3_shares(samba3):
+	print_header("Configured shares")
+	for s in samba3.shares:
+		print "--- %s ---" % s.name
+
+		for p in s.parameters:
+			print "\t%s = %s" % (p.name, p.value)
+
+		print ""
+
+def print_samba3_secrets(secrets):
+	print_header("Secrets")
+
+	print "IPC Credentials:"
+	if secrets.ipc_cred.username_obtained:
+		print "	User: %s\n" % secrets.ipc_cred.get_username
+	if secrets.ipc_cred.password_obtained:
+		print "	Password: %s\n" % secrets.ipc_cred.get_password
+
+	if secrets.ipc_cred.domain_obtained:
+		print "	Domain: %s\n" % secrets.ipc_cred.get_domain
+
+	print "LDAP passwords:"
+	for pw in secrets.ldappws:
+		print "\t%s -> %s" % (pw.dn, pw.password)
+	print ""
+
+	print "Domains:"
+	for d in secrets.domains:
+		print "\t--- %s ---" % d.name
+		print "\tSID: %s" % d.sid
+		print "\tGUID: %s" % d.guid
+		print "\tPlaintext pwd: %s" % d.plaintext_pw
+		print "\tLast Changed: %lu" % d.last_change_time
+		print "\tSecure Channel Type: %d\n" % d.sec_channel_type
+
+	print "Trusted domains:"
+	for td in secrets.trusted_domains:
+		for n in td.uni_name:
+			print "\t--- %s ---" % n
+		print "\tPassword: %s" % td.password
+		print "\tModified: %lu" % td.mod_time
+		print "\tSID: %s" % td.domain_sid
+
+def print_samba3_regdb(regdb):
+	print_header("Registry")
+
+	for k in regdb.keys:
+		print "%s\n" % k.name
+		for v in regdb.values(k):
+			print "\t%s: type %d, length %d" % (v.name, v.type, v.data.length)
+
+def print_samba3_winsdb(samba3):
+	print_header("WINS Database")
+
+	for e in samba3.winsentries:
+		print "%s, nb_flags: %x, type: %d, ttl: %lu, %d ips, fst: %s" % (e.name, e.nb_flags, e.type, e.ttl, e.ips.length, e.ips[0])
+
+def print_samba3_groupmappings(groupdb):
+	print_header("Group Mappings")
 	
-	for (var i in groupdb.groupmappings) {
-		var g = groupdb.groupmappings[i];
-		printf("\t--- Group: %s ---\n", g.nt_name);
-		printf("\tComment: %s\n", g.comment);
-		printf("\tGID: %d\n", g.gid);
-		printf("\tSID Name Use: %d\n", g.sid_name_use);
-		printf("\tSID: %s\n\n", g.sid);
-	}
-}
-
-function print_samba3_aliases(groupdb)
-{
-	var i, j;
-	for (i in groupdb.aliases) {
-		var a = groupdb.aliases[i];
-		printf("\t--- Alias: %s ---\n", a.sid);
-		for (j in a.members) {
-			printf("\t%s\n", a.members[j]);
-		}
-	}
-}
-
-function print_samba3_idmapdb(idmapdb)
-{
-	var i;
-	print_header("Winbindd SID<->GID/UID mappings");
-
-	printf("User High Water Mark: %d\n", idmapdb.user_hwm);
-	printf("Group High Water Mark: %d\n\n", idmapdb.group_hwm);
-
-	for (i in idmapdb.mappings) {
-		var e = idmapdb.mappings[i];
-		printf("%s -> ", e.sid);
-
-		if (e.type == e.IDMAP_GROUP) { 
-			printf("GID %d\n", e.unix_id);
-		} else {
-			printf("UID %d\n", e.unix_id);
-		}
-	}
-}
-
-function print_samba3(samba3)
-{
-	print_samba3_sam(samba3);
-	print_samba3_policy(samba3.policy);
-	print_samba3_shares(samba3);
-	print_samba3_winsdb(samba3);
-	print_samba3_regdb(samba3.registry);
-	print_samba3_secrets(samba3.secrets);
-	print_samba3_groupmappings(samba3);
-	print_samba3_aliases(samba3);
-	print_samba3_idmapdb(samba3.idmapdb);
-}
-
-function print_samba3_summary(samba3)
-{
-	printf("WINS db entries: %d\n", samba3.winsentries.length);
-	printf("SAM Accounts: %d\n", samba3.samaccounts.length);
-	printf("Registry key count: %d\n", samba3.registry.keys.length);
-	printf("Shares (including [global]): %d\n", samba3.shares.length);
-	printf("Groupmap count: %d\n", samba3.groupmappings.length);
-	printf("Alias count: %d\n", samba3.aliases.length);
-	printf("Idmap count: %d\n", samba3.idmapdb.mappings.length);
-}
-
-samba3 = samba3_read(options.ARGV[0], options.ARGV[1]);
-
-if (options.format == "summary") {
-	print_samba3_summary(samba3);
-} else if (options.format == "full") {
-	print_samba3(samba3);
-}
-
-return 0;
+	for g in groupdb.groupmappings:
+		print "\t--- Group: %s ---" % g.nt_name
+		print "\tComment: %s" % g.comment
+		print "\tGID: %d" % g.gid
+		print "\tSID Name Use: %d" % g.sid_name_use
+		print "\tSID: %s\n" % g.sid
+
+def print_samba3_aliases(groupdb):
+	for a in groupdb.aliases:
+		print "\t--- Alias: %s ---" % a.sid
+		for m in a.members:
+			print "\t%s" % m
+
+def print_samba3_idmapdb(idmapdb):
+	print_header("Winbindd SID<->GID/UID mappings")
+
+	print "User High Water Mark: %d" % idmapdb.user_hwm
+	print "Group High Water Mark: %d\n" % idmapdb.group_hwm
+
+	for e in idmapdb.mappings:
+		if e.type == e.IDMAP_GROUP:
+			print "%s -> GID %d" % (e.sid, e.unix_id)
+		else:
+			print "%s -> UID %d" % (e.sid, e.unix_id)
+
+def print_samba3(samba3):
+	print_samba3_sam(samba3)
+	print_samba3_policy(samba3.get_policy_db())
+	print_samba3_shares(samba3)
+	print_samba3_winsdb(samba3.get_wins_db())
+	print_samba3_regdb(samba3.get_registry())
+	print_samba3_secrets(samba3.get_secrets_db())
+	print_samba3_groupmappings(samba3.get_groupmapping_db())
+	print_samba3_aliases(samba3)
+	print_samba3_idmapdb(samba3.get_idmap_db())
+
+def print_samba3_summary(samba3):
+	print "WINS db entries: %d" % len(samba3.winsentries)
+	print "SAM Accounts: %d" % len(samba3.samaccounts)
+	print "Registry key count: %d" % len(samba3.registry.keys)
+	print "Shares (including [global]): %d" % len(samba3.shares)
+	print "Groupmap count: %d" % len(samba3.groupmappings)
+	print "Alias count: %d" % len(samba3.aliases)
+	print "Idmap count: %d" % len(samba3.idmapdb.mappings)
+
+samba3 = samba.samba3.Samba3(args[0], args[1])
+
+if opts.format == "summary":
+	print_samba3_summary(samba3)
+elif opts.format == "full":
+	print_samba3(samba3)
diff --git a/source4/scripting/bin/winreg.py b/source4/scripting/bin/winreg.py
new file mode 100644
index 0000000000..6cdc3a5898
--- /dev/null
+++ b/source4/scripting/bin/winreg.py
@@ -0,0 +1,93 @@
+#!/usr/bin/python
+#
+#  tool to manipulate a remote registry
+#  Copyright Andrew Tridgell 2005
+#  Copyright Jelmer Vernooij 2007
+#  Released under the GNU GPL v3 or later
+#
+
+import sys
+
+options = GetOptions(ARGV,
+			 "POPT_AUTOHELP",
+			 "POPT_COMMON_SAMBA",
+			 "POPT_COMMON_CREDENTIALS",
+			 "createkey=s")
+if (options == undefined) {
+	print "Failed to parse options"
+	sys.exit(-1)
+
+if len(sys.argv < 2:
+	print "Usage: %s <BINDING> [path]" % sys.argv[0]
+	sys.exit(-1)
+
+binding = options.ARGV[0]
+reg = winregObj()
+
+print "Connecting to " + binding
+status = reg.connect(binding)
+if (status.is_ok != true) {
+	print("Failed to connect to " + binding + " - " + status.errstr + "\n")
+	return -1
+}
+
+def list_values(path):
+	list = reg.enum_values(path)
+	if (list == undefined) {
+		return
+	}
+	for (i=0;i<list.length;i++) {
+		v = list[i]
+		printf("\ttype=%-30s size=%4d  '%s'\n", reg.typestring(v.type), v.size, v.name)
+		if (v.type == reg.REG_SZ || v.type == reg.REG_EXPAND_SZ) {
+			printf("\t\t'%s'\n", v.value)
+		}
+		if (v.type == reg.REG_MULTI_SZ) {
+			for (j in v.value) {
+				printf("\t\t'%s'\n", v.value[j])
+			}
+		}
+		if (v.type == reg.REG_DWORD || v.type == reg.REG_DWORD_BIG_ENDIAN) {
+			printf("\t\t0x%08x (%d)\n", v.value, v.value)
+		}
+		if (v.type == reg.REG_QWORD) {
+			printf("\t\t0x%llx (%lld)\n", v.value, v.value)
+		}
+	}
+
+def list_path(path):
+	count = 0
+	list = reg.enum_path(path)
+	if (list == undefined) {
+		println("Unable to list " + path)
+		return 0
+	}
+	list_values(path)
+	count = count + list.length
+	for (i=0;i<list.length;i++) {
+		if (path) {
+			npath = path + "\\" + list[i]
+		} else {
+			npath = list[i]
+		}
+		println(npath)
+		count = count + list_path(npath)
+	}
+	return count
+
+if len(sys.argv) > 2:
+	root = sys.argv[2]
+else:
+	root = ''
+
+if options.createkey:
+    try:
+	    reg.create_key("HKLM\\SOFTWARE", options.createkey)
+    except:
+		print "Failed to create key"
+else:
+	printf("Listing registry tree '%s'\n", root)
+	count = list_path(root)
+    if count == 0:
+		println("No entries found")
+		sys.exit(1)