Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet

It seems the format of main.mk changed in my sleep...

Conflicts:

	source/main.mk
(This used to be commit 56f2288e4f4f1aa70d11fc5f118458baf5803627)

6 files changed, 238 insertions, 282 deletions

diff --git a/source4/scripting/bin/autoidl.py b/source4/scripting/bin/autoidl.py
new file mode 100755
index 0000000000..eed4ba3a80
--- /dev/null
+++ b/source4/scripting/bin/autoidl.py
@@ -0,0 +1,161 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# Unix SMB/CIFS implementation.
+# Copyright © Jelmer Vernooij <jelmer@samba.org> 2008
+#   
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#   
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#   
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import sys
+
+MAX_OPNUM = 1000
+MAX_BASE_SIZE = 0x1000
+MAX_IFACE_VERSION = 1000
+
+DCERPC_FAULT_OP_RNG_ERROR = 0x1c010002
+DCERPC_FAULT_NDR = 0x6f7
+NT_STATUS_NET_WRITE_FAULT = -1073741614
+
+
+sys.path.insert(0, "bin/python")
+
+from samba.dcerpc import ClientConnection
+
+def find_num_funcs(conn):
+    for i in xrange(MAX_OPNUM):
+        try:
+            conn.request(i, "")
+        except RuntimeError, (num, msg):
+            if num == DCERPC_FAULT_OP_RNG_ERROR:
+                return i
+    raise Exception("More than %d functions" % MAX_OPNUM)
+
+class Function:
+    def __init__(self, conn, opnum):
+        self.conn = conn
+        self.opnum = opnum
+
+    def request(self, data):
+        assert isinstance(data, str)
+        self.conn.request(self.opnum, data)
+
+    def valid_ndr(self, data):
+        try:
+            self.request(data)
+        except RuntimeError, (num, msg):
+            if num == DCERPC_FAULT_NDR:
+                return False
+        return True
+
+    def find_base_request(self, start=""):
+        """Find the smallest possible request that we can do that is 
+        valid. 
+        
+        This generally means sending all zeroes so we get NULL pointers where 
+        possible."""
+        # TODO: Don't try with just 0's as there may be switch_is() variables
+        # for which 0 is not a valid value or variables with range() set
+        # See how much input bytes we need
+        for i in range(MAX_BASE_SIZE):
+            data = start + chr(0) * i
+            if self.valid_ndr(data):
+                return data
+        return None
+
+    def check_decision_byte(self, base_request, i):
+        """Check whether the specified byte is a possible "decision" byte, 
+        e.g. a byte that is part of a pointer, array size variable or 
+        discriminant.
+        
+        Note that this function only checks if a byte is definitely a decision 
+        byte. It may return False in some cases while the byte is actually 
+        a decision byte."""
+        data = list(base_request)
+        data[i] = chr(1)
+        return not self.valid_ndr("".join(data))
+
+    def find_deferrant_data(self, base_request, idx):
+        data = list(base_request)
+        data[idx*4] = chr(1)
+        # Just check that this is a pointer to something non-empty:
+        assert not self.valid_ndr("".join(data))
+
+        newdata = self.find_base_request("".join(data))
+
+        if newdata is None:
+            return None
+        
+        assert newdata.startswith(data)
+
+        return newdata[len(data):]
+
+    def find_idl(self):
+        base_request = self.find_base_request()
+
+        if base_request is None:
+            raise Exception("Unable to determine base size for opnum %d" % self.opnum)
+
+        print "\tBase request is %r" % base_request
+
+        decision_byte_map = map(lambda x: self.check_decision_byte(base_request, x), range(len(base_request)))
+
+        print decision_byte_map
+        
+        # find pointers
+        possible_pointers = map(all, 
+            [decision_byte_map[i*4:(i+1)*4] for i in range(int(len(base_request)/4))])
+        print possible_pointers
+
+        pointer_deferrant_bases = map(
+            lambda x: self.find_deferrant_data(base_request, x) if possible_pointers[x] else None, range(len(possible_pointers)))
+
+        print pointer_deferrant_bases
+
+
+if len(sys.argv) < 3:
+    print "Usage: autoidl <binding> <UUID> [<version>]"
+    sys.exit(1)
+
+(binding, uuid) = sys.argv[1:3]
+if len(sys.argv) == 4:
+    version = sys.argv[3]
+else:
+    version = None
+
+if version is None:
+    for i in range(MAX_IFACE_VERSION):
+        try:
+            conn = ClientConnection(binding, (uuid, i))
+        except RuntimeError, (num, msg):
+            if num == NT_STATUS_NET_WRITE_FAULT:
+                continue
+            raise
+        else:
+            break
+else:
+    conn = ClientConnection(binding, (uuid, version))
+
+print "Figuring out number of connections...",
+num_funcs = find_num_funcs(conn)
+print "%d" % num_funcs
+
+# Figure out the syntax for each one
+for i in range(num_funcs):
+    print "Function %d" % i
+    data = Function(conn, i)
+    try:
+        data.find_idl()
+    except Exception, e:
+        print "Error: %r" % e
diff --git a/source4/scripting/bin/minschema.py b/source4/scripting/bin/minschema.py
index 6dd5b42aff..111557126d 100755
--- a/source4/scripting/bin/minschema.py
+++ b/source4/scripting/bin/minschema.py
@@ -5,6 +5,8 @@
 
 import optparse
 
+import os, sys
+
 # Find right directory when running from source tree
 sys.path.insert(0, "bin/python")
 
diff --git a/source4/scripting/bin/samba3dump b/source4/scripting/bin/samba3dump
index d89667233f..c11f8dbd0d 100755
--- a/source4/scripting/bin/samba3dump
+++ b/source4/scripting/bin/samba3dump
@@ -14,7 +14,7 @@ sys.path.insert(0, "bin/python")
 import samba
 import samba.samba3
 
-parser = optparse.OptionParser("provision <libdir> [<smb.conf>]")
+parser = optparse.OptionParser("samba3dump <libdir> [<smb.conf>]")
 parser.add_option("--format", type="choice", metavar="FORMAT",
                   choices=["full", "summary"])
 
@@ -96,7 +96,7 @@ def print_samba3_secrets(secrets):
 
 def print_samba3_regdb(regdb):
     print_header("Registry")
-    from registry import str_regtype
+    from samba.registry import str_regtype
 
     for k in regdb.keys():
         print "[%s]" % k
diff --git a/source4/scripting/bin/smbstatus b/source4/scripting/bin/smbstatus
index 4dfc3365a1..bbd0e84826 100755
--- a/source4/scripting/bin/smbstatus
+++ b/source4/scripting/bin/smbstatus
@@ -1,96 +1,83 @@
-#!/bin/sh
-exec smbscript "$0" ${1+"$@"}
-/*
-  provide information on connected users and open files
-  Copyright Andrew Tridgell 2005
-  Released under the GNU GPL version 3 or later
-*/	
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+#  provide information on connected users and open files
+#  Copyright ǒ Jelmer Vernooij 2008
+#
+#  Based on the original in EJS:
+#  Copyright Andrew Tridgell 2005
+#  Released under the GNU GPL version 3 or later
+#
 
-libinclude("base.js");
-libinclude("management.js");
+import os, sys
 
-var options = new Object();
+sys.path.insert(0, "bin/python")
 
-options = GetOptions(ARGV,
-		"POPT_AUTOHELP",
-		"POPT_COMMON_SAMBA",
-		"POPT_COMMON_VERSION",
-		"nbt");
-if (options == undefined) {
-	println("Failed to parse options: " + options.ERROR);
-	return -1;
-}
+import optparse
+import samba.getopt as options
+from samba import irpc, messaging
 
-/*
-  show open sessions
-*/
-function show_sessions()
-{
-	var sessions = smbsrv_sessions();
-	var i;
-	var sys = sys_init();
-	if (sessions == undefined) {
-		println("No sessions open");
-		return;
-	}
-	printf("User                                  Client      Connected at\n");
-	printf("-------------------------------------------------------------------------------\n");
-	for (i=0;i<sessions.length;i++) {
-		var info = sessions[i];
-		var fulluser = sprintf("%s/%s", info.account_name, info.domain_name);
-		printf("%-30s %16s   %s\n", 
-		       fulluser, info.client_ip, sys.httptime(info.connect_time));
-	}
-	printf("\n");
-}
+def show_sessions(conn):
+	"""show open sessions"""
 
-/*
-  show open tree connects
-*/
-function show_tcons()
-{
-	var tcons = smbsrv_tcons();
-	var sys = sys_init();
-	if (tcons == undefined) {
-		println("No tree connects");
-		return;
-	}
-	printf("Share                                 Client      Connected at\n");
-	printf("-------------------------------------------------------------------------------\n");
-	for (i=0;i<tcons.length;i++) {
-		var info = tcons[i];
-		printf("%-30s %16s   %s\n", 
-		       info.share_name, info.client_ip, sys.httptime(info.connect_time));
-	}
-}
+	sessions = conn.smbsrv_information(irpc.SMBSRV_INFO_SESSIONS).next()
+	print "User                                  Client      Connected at"
+	print "-------------------------------------------------------------------------------"
+	for session in sessions:
+		fulluser = "%s/%s" % (session.account_name, session.domain_name)
+		print "%-30s %16s   %s" % (fulluser, session.client_ip, sys.httptime(session.connect_time))
+	print ""
 
-/*
-  show nbtd information
-*/
-function show_nbt()
-{
-	var stats = nbtd_statistics();
-	if (stats == undefined) {
-		println("nbt server not running");
-		return;
-	}
-	var r;
-	println("NBT server statistics:");
-	for (r in stats) {
-		print("\t" + r + ":\t" + stats[r] + "\n");
-	}
-	println("");
-}
+def show_tcons(open_connection):
+	"""show open tree connects"""
+	conn = open_connection("smb_server")
+	tcons = conn.smbsrv_information(irpc.SMBSRV_INFO_TCONS).next()
+	print "Share                                 Client      Connected at"
+	print "-------------------------------------------------------------------------------"
+	for tcon in tcons:
+		print "%-30s %16s   %s" % (tcon.share_name, tcon.client_ip, sys.httptime(tcon.connect_time))
 
-var lp = loadparm_init();
 
-printf("%s\n\n", lp.get("server string"));
+def show_nbt(open_connection):
+	"""show nbtd information"""
+	conn = open_connection("nbt_server")
+	stats = conn.nbtd_information(irpc.NBTD_INFO_STATISTICS).next()
+	print "NBT server statistics:"
+	fields = [("total_received", "Total received"),
+			  ("total_sent", "Total sent"),
+			  ("query_count", "Query count"),
+			  ("register_count", "Register count"),
+			  ("release_count", "Release count")]
+	for (field, description) in fields:
+		print "\t%s:\t%s" % (description, getattr(stats, field))
+	print
 
-if (options['nbt'] != undefined) {
-	show_nbt();
-} else {
-	show_sessions();
-	show_tcons();
-}
+parser = optparse.OptionParser("%s [options]" % sys.argv[0])
+sambaopts = options.SambaOptions(parser)
+parser.add_option_group(sambaopts)
+parser.add_option("--messaging-path", type="string", metavar="PATH",
+		          help="messaging path")
+parser.add_option("--nbt", help="show NetBIOS status", action="store_true")
 
-return 0;
+opts, args = parser.parse_args()
+
+lp = sambaopts.get_loadparm()
+
+print "%s" % lp.get("server string")
+
+messaging_path = (opts.messaging_path or os.path.join(lp.get("private dir"), "smbd.tmp", "messaging"))
+
+def open_connection(name):
+	return messaging.ClientConnection(name, messaging_path=messaging_path)
+
+if opts.nbt:
+	show_nbt(open_connection)
+else:
+	try:
+		conn = open_connection("smb_server")
+	except RuntimeError, (num, msg):
+		if msg ==  'NT_STATUS_OBJECT_NAME_NOT_FOUND':
+			print "No active connections"
+	else:
+		show_sessions(conn)
+		show_tcons(conn)
diff --git a/source4/scripting/bin/winreg b/source4/scripting/bin/winreg
deleted file mode 100755
index 883c6d7ee3..0000000000
--- a/source4/scripting/bin/winreg
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-exec smbscript "$0" ${1+"$@"}
-/*
-  tool to manipulate a remote registry
-  Copyright Andrew Tridgell 2005
-  Released under the GNU GPL version 3 or later
-*/	
-
-var options = GetOptions(ARGV,
-			 "POPT_AUTOHELP",
-			 "POPT_COMMON_SAMBA",
-			 "POPT_COMMON_CREDENTIALS",
-			 "createkey=s");
-if (options == undefined) {
-	println("Failed to parse options");
-	return -1;
-}
-
-libinclude("base.js");
-libinclude("winreg.js");
-
-if (options.ARGV.length < 1) {
-	println("Usage: winreg.js <BINDING> [path]");
-	return -1;
-}
-var binding = options.ARGV[0];
-reg = winregObj();
-
-print("Connecting to " + binding + "\n");
-status = reg.connect(binding);
-if (status.is_ok != true) {
-	print("Failed to connect to " + binding + " - " + status.errstr + "\n");
-	return -1;
-}
-
-function list_values(path) {
-	var list = reg.enum_values(path);
-	var i;
-	if (list == undefined) {
-		return;
-	}
-	for (i=0;i<list.length;i++) {
-		var 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) {
-			var j;
-			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);
-		}
-	}
-}
-
-function list_path(path) {
-	var count = 0;
-	var list = reg.enum_path(path);
-	if (list == undefined) {
-		println("Unable to list " + path);
-		return 0;
-	}
-	var i;
-	list_values(path);
-	count = count + list.length;
-	for (i=0;i<list.length;i++) {
-		var npath;
-		if (path) {
-			npath = path + "\\" + list[i];
-		} else {
-			npath = list[i];
-		}
-		println(npath);
-		count = count + list_path(npath);
-	}
-	return count;
-}
-
-var root;
-
-if (options.ARGV.length > 1) {
-	root = options.ARGV[1];
-} else {
-	root = '';
-}
-
-if (options.createkey) {
-	var ok = reg.create_key("HKLM\\SOFTWARE", options.createkey);
-	if (!ok) {
-		println("Failed to create key");
-	}
-} else {
-	printf("Listing registry tree '%s'\n", root);
-	var count = list_path(root);
-	if (count == 0) {
-		println("No entries found");
-		return 1;
-	}
-}
-return 0;
diff --git a/source4/scripting/bin/winreg.py b/source4/scripting/bin/winreg.py
deleted file mode 100755
index 19d39e56ab..0000000000
--- a/source4/scripting/bin/winreg.py
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/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
-
-# Find right directory when running from source tree
-sys.path.insert(0, "bin/python")
-
-import winreg
-import optparse
-import samba.getopt as options
-
-parser = optparse.OptionParser("%s <BINDING> [path]" % sys.argv[0])
-sambaopts = options.SambaOptions(parser)
-parser.add_option_group(sambaopts)
-parser.add_option("--createkey", type="string", metavar="KEYNAME", 
-        help="create a key")
-
-opts, args = parser.parse_args()
-
-if len(args) < 1:
-    parser.print_usage()
-    sys.exit(-1)
-
-binding = args[0]
-
-print "Connecting to " + binding
-conn = winreg.winreg(binding, sambaopts.get_loadparm())
-
-def list_values(key):
-    (num_values, max_valnamelen, max_valbufsize) = conn.QueryInfoKey(key, winreg.String())[4:8]
-    for i in range(num_values):
-        name = winreg.StringBuf()
-        name.size = max_valnamelen
-        (name, type, data, _, data_len) = conn.EnumValue(key, i, name, 0, "", max_valbufsize, 0)
-        print "\ttype=%-30s size=%4d  '%s'" % type, len, name
-        if type in (winreg.REG_SZ, winreg.REG_EXPAND_SZ):
-            print "\t\t'%s'" % data
-#        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(key, path):
-    count = 0
-    (num_subkeys, max_subkeylen, max_subkeysize) = conn.QueryInfoKey(key, winreg.String())[1:4]
-    for i in range(num_subkeys):
-        name = winreg.StringBuf()
-        name.size = max_subkeysize
-        keyclass = winreg.StringBuf()
-        keyclass.size = max_subkeysize
-        (name, _, _) = conn.EnumKey(key, i, name, keyclass=keyclass, last_changed_time=None)[0]
-        subkey = conn.OpenKey(key, name, 0, winreg.KEY_QUERY_VALUE | winreg.KEY_ENUMERATE_SUB_KEYS)
-        count += list_path(subkey, "%s\\%s" % (path, name))
-        list_values(subkey)
-    return count
-
-if len(args) > 1:
-    root = args[1]
-else:
-    root = "HKLM"
-
-if opts.createkey:
-    reg.create_key("HKLM\\SOFTWARE", opt.createkey)
-else:
-    print "Listing registry tree '%s'" % root
-    try:
-        root_key = getattr(conn, "Open%s" % root)(None, winreg.KEY_QUERY_VALUE | winreg.KEY_ENUMERATE_SUB_KEYS)
-    except AttributeError:
-        print "Unknown root key name %s" % root
-        sys.exit(1)
-    count = list_path(root_key, root)
-    if count == 0:
-        print "No entries found"
-        sys.exit(1)