zenoss-commit Mailing List for Zenoss Community Edition (Page 210)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Author: ahajda
Date: 2007-03-02 00:35:31 -0600 (Fri, 02 Mar 2007)
New Revision: 4170

Added:
   trunk/wmi/Samba/source/wmi/pywmi.i
   trunk/wmi/Samba/source/wmi/wmicore.c
   trunk/wmi/pycom/
   trunk/wmi/pycom/pythoncom.py
   trunk/wmi/pycom/pywintypes.py
   trunk/wmi/pycom/win32com/
   trunk/wmi/pycom/win32com/__init__.py
   trunk/wmi/pycom/win32com/client.py
Modified:
   trunk/wmi/README
   trunk/wmi/Samba/source/lib/com/dcom/dcom.h
   trunk/wmi/Samba/source/lib/com/dcom/main.c
   trunk/wmi/Samba/source/librpc/idl/dcom_wmi.inc
   trunk/wmi/Samba/source/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm
   trunk/wmi/Samba/source/wmi/
   trunk/wmi/Samba/source/wmi/config.mk
   trunk/wmi/Samba/source/wmi/wbemdata.c
   trunk/wmi/Samba/source/wmi/wmic.c
   trunk/wmi/Samba/source/wmi/wmis.c
Log:
Added python bindings allowing work of zenwin on Linux.
See README for details.


Modified: trunk/wmi/README
===================================================================

--- trunk/wmi/README	2007-03-01 22:39:43 UTC (rev 4169)
+++ trunk/wmi/README	2007-03-02 06:35:31 UTC (rev 4170)
@@ -1,5 +1,5 @@
 DCOM/WMI client implementation for Linux.
-    and...@wp..., December 2006
+    and...@wp..., 2006-2007
 
 ABOUT
 
@@ -9,31 +9,53 @@
 REQUIREMENTS
 
 The same as for Samba (gcc ???, autoconf ???).
+SWIG >= 1.3 (I am using version 1.3.25).
 
 COMPILATION
 
-For details follow Samba documentation from samba/howto.txt.
+For details follow Samba documentation from Samba/howto.txt.
 
 Simple steps:
 $ cd Samba/source
 $ ./autogen.sh
 $ ./configure
-$ make proto bin/wmic bin/wmis
+$ make proto bin/wmic bin/wmis wmi/_pywmi.so
 
 INSTALLATION
 
 Currently there is no install procedure. Generated binaries are located 
-in Samba/source/bin:
-  wmic - WMI simple client, it queries server using ExecQuery WMI method,
+in Samba/source:
+  bin/wmic - WMI simple client, it queries server using ExecQuery WMI method,
 	 sample usage: 
 	    wmic -U domain/user%password //host "select Name from Win32_Process"
 	 Program is at early stage of development and there are many bugs.
 	 To retrieve more debug info use switch "-d number", where bigger number
          corresponds to bigger output (I am using "-d 99" :) )
-  wmis - WMI test suite. Currently it does only following things:
+  bin/wmis - WMI test suite. Currently it does only following things:
 	- Creates directory remotely using Win32_Process.Create("cmd.exe /C mkdir C:\wmi_test_dir_tmp").
 	- Executes ExecNotificationQuery for monitoring file create/delete events in this directory.
 	- Waits for 4 notifications and display their types.
+  wmi/_pywmi.so - Samba wrapper for python, together with wmi/pywmi.py and ../pycom/* modules can be used 
+	to run zenwin on Linux.
+
+PYTHON MODULES (early stage, experimental, for zenwin)
+
+There are two locations of python modules required to run zenwin:
+- ./pycom - modules providing api of pywin32 library used in zenwin.
+- ./Samba/source/wmi - SWIG generated Samba binding modules (pywmi.py, _pywmi.so), used by ./pycom.
+To run zenwin you should:
+0. Compile _pywmi.so module, see COMPILATION section.
+1. Download zenwin: svn co http://dev.zenoss.org/svn/trunk/zenwin.
+2. Edit zenwin config files if necessary.
+3. Configure/run zenoss.
+4. Run zenwin components, with properly set env variable PYTHONPATH, for example in bash/sh:
+cd $ZENWINPATH
+PYTHONPATH="$WMIPATH/pycom:$WMIPATH/Samba/source/wmi" python ./$PROG.py -C etc/$PROG.cfg -v 10 --cycle=5
+where:
+    ZENWINPATH - path to zenwin directory
+    WMIPATH - path to wmi directory
+    PROG - one of zenwin components (zenwin, zenwinmodeler, zeneventlog)
+
 TODO
 
 - Implement handling of all CIM types,
@@ -42,4 +64,3 @@
 
 General:
 - Create async version
-- Create Python binding

Modified: trunk/wmi/Samba/source/lib/com/dcom/dcom.h
===================================================================
--- trunk/wmi/Samba/source/lib/com/dcom/dcom.h	2007-03-01 22:39:43 UTC (rev 4169)
+++ trunk/wmi/Samba/source/lib/com/dcom/dcom.h	2007-03-02 06:35:31 UTC (rev 4170)
@@ -34,7 +34,11 @@
 #include "lib/com/dcom/proto.h"
 
 struct dcom_client_context {
-	struct cli_credentials *credentials;
+	struct dcom_server_credentials {
+		const char *server;
+		struct cli_credentials *credentials;
+		struct dcom_server_credentials *prev, *next;
+	} *credentials;
 	struct dcom_object_exporter {
 		uint64_t oxid;
 		struct GUID ipidRemUnknown;

Modified: trunk/wmi/Samba/source/lib/com/dcom/main.c
===================================================================
--- trunk/wmi/Samba/source/lib/com/dcom/main.c	2007-03-01 22:39:43 UTC (rev 4169)
+++ trunk/wmi/Samba/source/lib/com/dcom/main.c	2007-03-02 06:35:31 UTC (rev 4170)
@@ -28,14 +28,52 @@
 #include "lib/com/dcom/dcom.h"
 #include "librpc/rpc/dcerpc_table.h"
 #include "lib/util/dlinklist.h"
+#include "auth/credentials/credentials.h"
 
 #define DCOM_NEGOTIATED_PROTOCOLS { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB, EPM_PROTOCOL_NCALRPC }
 
+struct cli_credentials *dcom_get_server_credentials(struct com_context *ctx, const char *server)
+{
+	struct dcom_server_credentials *c;
+	struct cli_credentials *d;
+
+	d = NULL;
+	for (c = ctx->dcom->credentials; c; c = c->next) {
+		if (c->server == NULL) {
+			d = c->credentials;
+			continue;
+		}
+		if (server && !strcmp(c->server, server)) return c->credentials;
+	}
+	return d;
+}
+
+void dcom_set_server_credentials(struct com_context *ctx, const char *server, struct cli_credentials *credentials)
+{
+	struct dcom_server_credentials *c;
+
+	for (c = ctx->dcom->credentials; c; c = c->next) {
+		if ((server == NULL && c->server == NULL) ||(server && c->server && !strcmp(c->server, server))) {
+			c->credentials = credentials;
+			return;
+		}
+	}
+
+	c = talloc(ctx, struct dcom_server_credentials);
+	c->server = talloc_strdup(ctx, server);
+	c->credentials = credentials;
+	DLIST_ADD(ctx->dcom->credentials, c);
+}
+
 struct dcom_client_context *dcom_client_init(struct com_context *ctx, struct cli_credentials *credentials)
 {
 	ctx->dcom = talloc_zero(ctx, struct dcom_client_context);
-	ctx->dcom->credentials = credentials;
-
+	if (!credentials) {
+                credentials = cli_credentials_init(ctx);
+                cli_credentials_set_conf(credentials);
+                cli_credentials_parse_string(credentials, "%", CRED_SPECIFIED);
+	}
+	dcom_set_server_credentials(ctx, NULL, credentials);
 	return ctx->dcom;
 }
 
@@ -84,7 +122,7 @@
 	if (server == NULL) { 
 		return dcerpc_pipe_connect(ctx, p, "ncalrpc", 
 								   &dcerpc_table_IRemoteActivation,
-					   			   ctx->dcom->credentials, ctx->event_ctx);
+					   			   dcom_get_server_credentials(ctx, NULL), ctx->event_ctx);
 	}
 
 	/* Allow server name to contain a binding string */
@@ -93,7 +131,7 @@
 			bd->flags |= DCERPC_DEBUG_PRINT_BOTH;
 		status = dcerpc_pipe_connect_b(ctx, p, bd, 
 									   &dcerpc_table_IRemoteActivation,
-					       			   ctx->dcom->credentials, ctx->event_ctx);
+					       			   dcom_get_server_credentials(ctx, bd->host), ctx->event_ctx);
 
 		talloc_free(loc_ctx);
 		return status;
@@ -106,11 +144,9 @@
 			talloc_free(loc_ctx);
 			return NT_STATUS_NO_MEMORY;
 		}
+		status = dcerpc_pipe_connect(ctx, p, binding, &dcerpc_table_IRemoteActivation,
+					     dcom_get_server_credentials(ctx, server), ctx->event_ctx);
 
-		status = dcerpc_pipe_connect(ctx, p, binding, 
-									 &dcerpc_table_IRemoteActivation,
-					     ctx->dcom->credentials, ctx->event_ctx);
-
 		if (NT_STATUS_IS_OK(status)) {
 			if (DEBUGLVL(9))
 				(*p)->conn->flags |= DCERPC_DEBUG_PRINT_BOTH;
@@ -156,6 +192,24 @@
 	return object_exporter_by_oxid(ctx, ip->obj.u_objref.u_standard.std.oxid);
 }
 
+void dcom_update_credentials_for_aliases(struct com_context *ctx, const char *server, struct DUALSTRINGARRAY *pds)
+{
+	struct cli_credentials *cc;
+	struct dcerpc_binding *b;
+	uint32_t i;
+	NTSTATUS status;
+
+	cc = dcom_get_server_credentials(ctx, server);
+        for (i = 0; pds->stringbindings[i]; ++i) {
+                if (pds->stringbindings[i]->wTowerId != EPM_PROTOCOL_TCP) continue;
+                status = dcerpc_binding_from_STRINGBINDING(ctx, &b, pds->stringbindings[i]);
+		if (!NT_STATUS_IS_OK(status)) continue;
+		dcom_set_server_credentials(ctx, b->host, cc);
+		talloc_free(b);
+	}
+}
+
+
 WERROR dcom_create_object(struct com_context *ctx, struct GUID *clsid, const char *server, int num_ifaces, struct GUID *iid, struct IUnknown ***ip, WERROR *results)
 {
 	uint16_t protseq[] = DCOM_NEGOTIATED_PROTOCOLS;
@@ -231,11 +285,12 @@
 		}
 	}
 
-	/* Add the OXID data for the returned oxid */
 	m = object_exporter_update_oxid(ctx, oxid, pds);
 	m->pipe = NULL;
 	m->ipidRemUnknown = ipidRemUnknown;
 
+	dcom_update_credentials_for_aliases(ctx, server, pds);
+
 	talloc_free(loc_ctx);
 	return WERR_OK;
 }
@@ -345,12 +400,12 @@
 			DEBUG(1, ("Error parsing string binding"));
 		} else {
 			/* FIXME:LOW Make flags more flexible */
-			binding->flags |= DCERPC_AUTH_NTLM | DCERPC_SIGN; // | DCERPC_NDR_REF_ALLOC;
+			binding->flags |= DCERPC_AUTH_NTLM | DCERPC_SIGN;
 			if (DEBUGLVL(9))
 				binding->flags |= DCERPC_DEBUG_PRINT_BOTH;
 			status = dcerpc_pipe_connect_b(ox, &p, binding, 
 						       idl_iface_by_uuid(&iid),
-						       iface->ctx->dcom->credentials,
+						       dcom_get_server_credentials(iface->ctx, binding->host),
 							   iface->ctx->event_ctx);
 		}
 		talloc_free(binding);

Modified: trunk/wmi/Samba/source/librpc/idl/dcom_wmi.inc
===================================================================
--- trunk/wmi/Samba/source/librpc/idl/dcom_wmi.inc	2007-03-01 22:39:43 UTC (rev 4169)
+++ trunk/wmi/Samba/source/librpc/idl/dcom_wmi.inc	2007-03-02 06:35:31 UTC (rev 4170)
@@ -23,13 +23,6 @@
         pointer_default(unique)
 ] interface IWbemServices : IUnknown
 {
-
-    typedef [public] enum
-    {
-	WBEM_NO_WAIT = 0,
-        WBEM_INFINITE = 0xFFFFFFFF
-    } WBEM_TIMEOUT_TYPE;
-
     typedef [public,noprint] enum
     {
         WBEM_FLAG_RETURN_IMMEDIATELY = 0x10,
@@ -55,6 +48,12 @@
 
     } WBEM_GENERIC_FLAG_TYPE;
 
+    typedef [public,noprint,v1_enum] enum tag_WBEM_TIMEOUT_TYPE
+    {
+        WBEM_NO_WAIT = 0,
+        WBEM_INFINITE = 0xFFFFFFFF
+    } WBEM_TIMEOUT_TYPE;
+
     typedef [public,nopull,nopush,noprint,string,charset(UTF16)] uint16 *CIMSTRING;
 
     typedef [public,v1_enum] enum
@@ -145,6 +144,12 @@
 	uint32 count;
 	[relative] CIMSTRING item[count];
     } arr_CIMSTRING;
+
+    typedef [public] struct {
+	uint32 count;
+	[relative,subcontext(4)] WbemClassObject *item[count];
+    } arr_WbemClassObject;
+
 // FIXME:avg implement rest of types
     typedef [public,nodiscriminant] union
     {
@@ -156,6 +161,8 @@
 	[case(CIM_UINT32)] uint32 v_uint32;
 	[case(CIM_SINT64)] dlong v_sint64;
 	[case(CIM_UINT64)] udlong v_uint64;
+	[case(CIM_REAL32)] uint32 v_real32;
+	[case(CIM_REAL64)] udlong v_real64;
 	[case(CIM_BOOLEAN)] uint16 v_boolean;
 	[case(CIM_STRING),relative] CIMSTRING v_string;
 	[case(CIM_DATETIME),relative] CIMSTRING v_datetime;
@@ -170,11 +177,13 @@
 	[case(CIM_ARR_UINT32),relative] arr_uint32 *a_uint32;
 	[case(CIM_ARR_SINT64),relative] arr_dlong *a_sint64;
 	[case(CIM_ARR_UINT64),relative] arr_udlong *a_uint64;
+	[case(CIM_ARR_REAL32),relative] arr_uint32 *a_real32;
+	[case(CIM_ARR_REAL64),relative] arr_udlong *a_real64;
 	[case(CIM_ARR_BOOLEAN),relative] arr_uint16 *a_boolean;
 	[case(CIM_ARR_STRING),relative] arr_CIMSTRING *a_string;
 	[case(CIM_ARR_DATETIME),relative] arr_CIMSTRING *a_datetime;
 	[case(CIM_ARR_REFERENCE),relative] arr_CIMSTRING *a_reference;
-//	[case(CIM_ARR_OBJECT),relative] arr_IWbemClassObject *a_object;
+	[case(CIM_ARR_OBJECT),relative] arr_WbemClassObject *a_object;
     } CIMVAR;
 
     typedef [public,bitmap8bit] bitmap
@@ -648,8 +657,8 @@
 	  [in,ref] GUID *gEWCO,
 	  [in] uint32 lTimeOut,
 	  [in] uint32 uCount,
-	  [in] uint32 unknown,
-	  [in,ref] GUID *gWCO,
+//	  [in] uint32 unknown,
+//	  [in,ref] GUID *gWCO,
 	  [out,ref] uint32 *puReturned,
 	  [out,ref] uint32 *pSize,
 //	  [out,ref] WBEMDATA0 **pData

Modified: trunk/wmi/Samba/source/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm
===================================================================
--- trunk/wmi/Samba/source/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm	2007-03-01 22:39:43 UTC (rev 4169)
+++ trunk/wmi/Samba/source/pidl/lib/Parse/Pidl/Samba4/COM/Proxy.pm	2007-03-02 06:35:31 UTC (rev 4170)
@@ -134,7 +134,7 @@
 
 		if (Parse::Pidl::Typelist::typeIs($a->{TYPE}, "INTERFACE")) {
 			$res .=
-"	if (s->r.out.$a->{NAME}) {
+"	if (s->r.out.$a->{NAME} && *s->r.out.$a->{NAME}) {
 		status = dcom_IUnknown_from_OBJREF(s->d->ctx, (struct IUnknown **)s->$a->{NAME}, &(**s->r.out.$a->{NAME}).obj);
 		if (*s->r.out.$a->{NAME}) talloc_free(*s->r.out.$a->{NAME});
 		talloc_free(s->r.out.$a->{NAME});


Property changes on: trunk/wmi/Samba/source/wmi
___________________________________________________________________
Name: svn:ignore
   - proto.h
*.d

   + proto.h
*.d
*.pyc
*_wrap.c
pywmi.py
_pywmi.so


Modified: trunk/wmi/Samba/source/wmi/config.mk
===================================================================
--- trunk/wmi/Samba/source/wmi/config.mk	2007-03-01 22:39:43 UTC (rev 4169)
+++ trunk/wmi/Samba/source/wmi/config.mk	2007-03-02 06:35:31 UTC (rev 4170)
@@ -5,6 +5,7 @@
 INSTALLDIR = BINDIR
 OBJ_FILES = \
                 wmic.o \
+		wmicore.o \
 		wbemdata.o \
 		../librpc/gen_ndr/dcom_p.o
 PRIVATE_DEPENDENCIES = \
@@ -26,6 +27,7 @@
 INSTALLDIR = BINDIR
 OBJ_FILES = \
                 wmis.o \
+		wmicore.o \
 		wbemdata.o \
 		../librpc/gen_ndr/dcom_p.o
 PRIVATE_DEPENDENCIES = \
@@ -42,3 +44,21 @@
 #################################
 
 librpc/gen_ndr/dcom_p.c: idl
+
+#######################
+# Start LIBRARY swig_dcerpc
+[LIBRARY::pywmi]
+LIBRARY_REALNAME = _pywmi.$(SHLIBEXT)
+PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG \
+		RPC_NDR_OXIDRESOLVER \
+		NDR_DCOM \
+		RPC_NDR_REMACT \
+		NDR_TABLE \
+		DCOM_PROXY_DCOM \
+		dcom
+OBJ_FILES = wbemdata.o \
+	    wmicore.o \
+	    ../librpc/gen_ndr/dcom_p.o \
+	    pywmi_wrap.o
+# End LIBRARY swig_dcerpc
+#######################

Added: trunk/wmi/Samba/source/wmi/pywmi.i

Modified: trunk/wmi/Samba/source/wmi/wbemdata.c
===================================================================
--- trunk/wmi/Samba/source/wmi/wbemdata.c	2007-03-01 22:39:43 UTC (rev 4169)
+++ trunk/wmi/Samba/source/wmi/wbemdata.c	2007-03-02 06:35:31 UTC (rev 4170)
@@ -29,6 +29,7 @@
 #include "librpc/gen_ndr/ndr_dcom.h"
 #include "librpc/rpc/dcerpc.h"
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "lib/talloc/talloc.h"
 
 NTSTATUS ndr_pull_WbemClassObject_Object(struct ndr_pull *ndr, int ndr_flags, struct WbemClassObject *r);
 void duplicate_CIMVAR(TALLOC_CTX *mem_ctx, const union CIMVAR *src, union CIMVAR *dst, enum CIMTYPE_ENUMERATION cimtype);
@@ -445,7 +446,7 @@
 }
 
 #define WERR_CHECK(msg) if (!W_ERROR_IS_OK(result)) { \
-                            DEBUG(0, ("ERROR: %s\n", msg)); \
+                            DEBUG(1, ("ERROR: %s\n", msg)); \
                             goto error; \
                         } else { \
                             DEBUG(1, ("OK   : %s\n", msg)); \
@@ -473,11 +474,12 @@
 	e = talloc(mem_ctx, struct pair_guid_ptr);
 	e->guid = *uuid;
 	e->ptr = ptr;
+	talloc_steal(e, ptr);
 	DLIST_ADD(*list, e);
 }
 
 struct IEnumWbemClassObject_data {
-	struct GUID guid1, guid2;
+	struct GUID guid;
         struct IWbemFetchSmartEnum *pFSE;
 	struct IWbemWCOSmartEnum *pSE;
 	struct pair_guid_ptr *cache;
@@ -551,6 +553,7 @@
 		case DATATYPE_OBJECT:
 			apObjects[i] = talloc_zero(d->ctx, struct WbemClassObject);
 			apObjects[i]->obj_class = get_ptr_by_guid(ecod->cache, &guid);
+			(void)talloc_reference(apObjects[i], apObjects[i]->obj_class);
 			NDR_CHECK(ndr_pull_WbemClassObject_Object(ndr, NDR_SCALARS|NDR_BUFFERS, apObjects[i]));
 			break;
 		default:
@@ -569,7 +572,7 @@
 	return status;
 }
 
-int IEnumWbemClassObject_data_destructor(struct IEnumWbemClassObject_data *ecod)
+static int IEnumWbemClassObject_data_destructor(struct IEnumWbemClassObject_data *ecod)
 {
 //	struct REMINTERFACEREF rif[2] = { {ecod->pFSE->obj.u_objref.u_standard.std.ipid, 5, 0}, {ecod->pSE->obj.u_objref.u_standard.std.ipid, 5, 0} };
 	return 0;
@@ -601,13 +604,12 @@
 	        result = IWbemFetchSmartEnum_Fetch(ecod->pFSE, mem_ctx, &ecod->pSE);
     		WERR_CHECK("Retrieve enumerator of result(IWbemWCOSmartEnum).");
 
-		ecod->guid1 = GUID_random();
-		ecod->guid2 = GUID_random();
+		ecod->guid = GUID_random();
 
 		talloc_set_destructor(ecod, IEnumWbemClassObject_data_destructor);
 	}
 
-	result = IWbemWCOSmartEnum_Next(ecod->pSE, loc_ctx, &ecod->guid1, lTimeout, uCount, 1, &ecod->guid2, puReturned, &size, &data);
+	result = IWbemWCOSmartEnum_Next(ecod->pSE, loc_ctx, &ecod->guid, lTimeout, uCount, puReturned, &size, &data);
 	if (!W_ERROR_EQUAL(result, WERR_BADFUNC)) {
     		WERR_CHECK("IWbemWCOSmartEnum_Next.");
 	}
@@ -620,7 +622,7 @@
 error:
 	if (!W_ERROR_IS_OK(result)) {
     		status = werror_to_ntstatus(result);
-    		DEBUG(0, ("dcom_proxy_IEnumWbemClassObject_Next: %s - %s\n", nt_errstr(status), get_friendly_nt_error_msg(status)));
+    		DEBUG(9, ("dcom_proxy_IEnumWbemClassObject_Next: %s - %s\n", nt_errstr(status), get_friendly_nt_error_msg(status)));
 	}
 	talloc_free(loc_ctx);
 	return result;

Modified: trunk/wmi/Samba/source/wmi/wmic.c
===================================================================
--- trunk/wmi/Samba/source/wmi/wmic.c	2007-03-01 22:39:43 UTC (rev 4169)
+++ trunk/wmi/Samba/source/wmi/wmic.c	2007-03-02 06:35:31 UTC (rev 4170)
@@ -128,6 +128,9 @@
 	struct program_args args = {};
 	uint32_t cnt = 5, ret;
 	char *class_name = NULL;
+	WERROR result;
+	NTSTATUS status;
+	struct IWbemServices *pWS = NULL;
 
         parse_args(argc, argv, &args);
 
@@ -146,25 +149,11 @@
 	com_init_ctx(&ctx, NULL);
 	dcom_client_init(ctx, cmdline_credentials);
 
-	struct GUID clsid;
-	struct GUID iid;
-	WERROR result, coresult;
-	NTSTATUS status;
-	struct IUnknown **mqi = NULL;
-	GUID_from_string(CLSID_WBEMLEVEL1LOGIN, &clsid);
-        GUID_from_string(COM_IWBEMLEVEL1LOGIN_UUID, &iid);
-	result = dcom_create_object(ctx, &clsid, args.hostname, 1, &iid, &mqi, &coresult);
-	WERR_CHECK("dcom_create_object.");
-	result = coresult;
-	WERR_CHECK("Create remote WMI object.");
-
-	struct IWbemLevel1Login *pL = (struct IWbemLevel1Login *)mqi[0];
-	struct IWbemServices *pWS = NULL;
-	result = IWbemLevel1Login_NTLMLogin(pL, ctx, "root\\cimv2", 0, 0, 0, &pWS);
+	result = WBEM_ConnectServer(ctx, args.hostname, "root\\cimv2", 0, 0, 0, 0, 0, 0, &pWS);
 	WERR_CHECK("Login to remote object.");
 
 	struct IEnumWbemClassObject *pEnum = NULL;
-	result = IWbemServices_ExecQuery(pWS, ctx, "WQL", args.query, WBEM_FLAG_RETURN_IMMEDIATELY, NULL, &pEnum);
+	result = IWbemServices_ExecQuery(pWS, ctx, "WQL", args.query, WBEM_FLAG_RETURN_IMMEDIATELY | WBEM_FLAG_ENSURE_LOCATABLE, NULL, &pEnum);
 	WERR_CHECK("WMI query execute.");
 
 	IEnumWbemClassObject_Reset(pEnum, ctx);

Added: trunk/wmi/Samba/source/wmi/wmicore.c

Modified: trunk/wmi/Samba/source/wmi/wmis.c
===================================================================
--- trunk/wmi/Samba/source/wmi/wmis.c	2007-03-01 22:39:43 UTC (rev 4169)
+++ trunk/wmi/Samba/source/wmi/wmis.c	2007-03-02 06:35:31 UTC (rev 4170)
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "lib/cmdline/popt_common.h"
+#include "auth/credentials/credentials.h"
 #include "librpc/rpc/dcerpc.h"
 #include "librpc/gen_ndr/ndr_oxidresolver.h"
 #include "librpc/gen_ndr/ndr_oxidresolver_c.h"
@@ -101,7 +102,7 @@
 			} else { \
 			    DEBUG(1, ("OK   : %s\n", msg)); \
 			}
-
+/*
 WERROR WBEM_ConnectServer(struct com_context *ctx, const char *server, const char *nspace, const char *user, const char *password, const char *locale, uint32_t flags, const char *authority, struct IWbemContext* wbem_ctx, struct IWbemServices** services)
 {
 	struct GUID clsid;
@@ -110,6 +111,18 @@
 	struct IUnknown **mqi;
 	struct IWbemLevel1Login *pL;
 
+	if (user) {
+		char *cred;
+		struct cli_credentials *cc;
+
+		cred = talloc_asprintf(NULL, "%s%%%s", user, password);
+		cc = cli_credentials_init(ctx);
+		cli_credentials_set_conf(cc);
+		cli_credentials_parse_string(cc, cred, CRED_SPECIFIED);
+		dcom_set_server_credentials(ctx, server, cc);
+		talloc_free(cred);
+	}
+
 	GUID_from_string(CLSID_WBEMLEVEL1LOGIN, &clsid);
         GUID_from_string(COM_IWBEMLEVEL1LOGIN_UUID, &iid);
 	result = dcom_create_object(ctx, &clsid, server, 1, &iid, &mqi, &coresult);
@@ -124,7 +137,7 @@
 error:
 	return result;
 }
-
+*/
 WERROR WBEM_RemoteExecute(struct IWbemServices *pWS, const char *cmdline, uint32_t *ret_code)
 {
 	struct IWbemClassObject *wco = NULL;


Property changes on: trunk/wmi/pycom
___________________________________________________________________
Name: svn:ignore
   + *.pyc


Added: trunk/wmi/pycom/pythoncom.py

Added: trunk/wmi/pycom/pywintypes.py


Property changes on: trunk/wmi/pycom/win32com
___________________________________________________________________
Name: svn:ignore
   + *.pyc


Added: trunk/wmi/pycom/win32com/__init__.py

Added: trunk/wmi/pycom/win32com/client.py





2007	Jan	Feb (65)	Mar (276)	Apr (544)	May (638)	Jun (225)	Jul (204)	Aug (294)	Sep (532)	Oct (506)	Nov (324)	Dec (359)
2008	Jan (208)	Feb (225)	Mar (248)	Apr (388)	May (222)	Jun (47)	Jul	Aug	Sep	Oct	Nov	Dec

zenoss-commit Mailing List for Zenoss Community Edition (Page 210)

Zenoss - Intelligent IT Operations Management

zenoss-commit — svn commit list