[SCM] Samba Shared Repository - branch master updated - 78ad8fc8aa6fb50ec245f213362bc2b21ddfad84

Jelmer Vernooij jelmer at samba.org
Wed Oct 15 13:18:43 GMT 2008 

The branch, master has been updated
       via  78ad8fc8aa6fb50ec245f213362bc2b21ddfad84 (commit)
       via  ca9e118d7e533be613259b8e49bd4c92e31d5274 (commit)
       via  17e9d499150f1b1d37f1631bc149eb8c0204f7bb (commit)
      from  b54b8912e10af2ca1f64aca8e2cc9538b39f7393 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 78ad8fc8aa6fb50ec245f213362bc2b21ddfad84
Merge: ca9e118d7e533be613259b8e49bd4c92e31d5274 b54b8912e10af2ca1f64aca8e2cc9538b39f7393
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Oct 15 15:18:26 2008 +0200

    Merge branch 'master' of git://git.samba.org/samba

commit ca9e118d7e533be613259b8e49bd4c92e31d5274
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Oct 15 15:17:41 2008 +0200

    Re-add [todo] tags.

commit 17e9d499150f1b1d37f1631bc149eb8c0204f7bb
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Oct 15 15:17:31 2008 +0200

    Fix include flags for merged build.

-----------------------------------------------------------------------

Summary of changes:
 librpc/idl/ntsvcs.idl |  118 ++++++++++++++++++++++++------------------------
 source3/samba4.mk     |    2 +-
 2 files changed, 60 insertions(+), 60 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/idl/ntsvcs.idl b/librpc/idl/ntsvcs.idl
index cd71de5..cfafbea 100644
--- a/librpc/idl/ntsvcs.idl
+++ b/librpc/idl/ntsvcs.idl
@@ -12,12 +12,12 @@ interface ntsvcs
 	/******************/
 	/* Function: 0x00 */
 
-	WERROR PNP_Disconnect();
+	[todo] WERROR PNP_Disconnect();
 
 	/******************/
 	/* Function: 0x01 */
 
-	WERROR PNP_Connect();
+	[todo] WERROR PNP_Connect();
 
 	/******************/
 	/* Function: 0x02 */
@@ -29,17 +29,17 @@ interface ntsvcs
 	/******************/
 	/* Function: 0x03 */
 
-	WERROR PNP_GetGlobalState();
+	[todo] WERROR PNP_GetGlobalState();
 
 	/******************/
 	/* Function: 0x04 */
 
-	WERROR PNP_InitDetection();
+	[todo] WERROR PNP_InitDetection();
 
 	/******************/
 	/* Function: 0x05 */
 
-	WERROR PNP_ReportLogOn();
+	[todo] WERROR PNP_ReportLogOn();
 
 	/******************/
 	/* Function: 0x06 */
@@ -52,22 +52,22 @@ interface ntsvcs
 	/******************/
 	/* Function: 0x07 */
 
-	WERROR PNP_GetRootDeviceInstance();
+	[todo] WERROR PNP_GetRootDeviceInstance();
 
 	/******************/
 	/* Function: 0x08 */
 
-	WERROR PNP_GetRelatedDeviceInstance();
+	[todo] WERROR PNP_GetRelatedDeviceInstance();
 
 	/******************/
 	/* Function: 0x09 */
 
-	WERROR PNP_EnumerateSubKeys();
+	[todo] WERROR PNP_EnumerateSubKeys();
 
 	/******************/
 	/* Function: 0x0a */
 
-	WERROR PNP_GetDeviceList();
+	[todo] WERROR PNP_GetDeviceList();
 
 	/******************/
 	/* Function: 0x0b */
@@ -81,7 +81,7 @@ interface ntsvcs
 	/******************/
 	/* Function: 0x0c */
 
-	WERROR PNP_GetDepth();
+	[todo] WERROR PNP_GetDepth();
 
 	/******************/
 	/* Function: 0x0d */
@@ -101,132 +101,132 @@ interface ntsvcs
 	/******************/
 	/* Function: 0x0e */
 
-	WERROR PNP_SetDeviceRegProp();
+	[todo] WERROR PNP_SetDeviceRegProp();
 
 	/******************/
 	/* Function: 0x0f */
 
-	WERROR PNP_GetClassInstance();
+	[todo] WERROR PNP_GetClassInstance();
 
 	/******************/
 	/* Function: 0x10 */
 
-	WERROR PNP_CreateKey();
+	[todo] WERROR PNP_CreateKey();
 
 	/******************/
 	/* Function: 0x11 */
 
-	WERROR PNP_DeleteRegistryKey();
+	[todo] WERROR PNP_DeleteRegistryKey();
 
 	/******************/
 	/* Function: 0x12 */
 
-	WERROR PNP_GetClassCount();
+	[todo] WERROR PNP_GetClassCount();
 
 	/******************/
 	/* Function: 0x13 */
 
-	WERROR PNP_GetClassName();
+	[todo] WERROR PNP_GetClassName();
 
 	/******************/
 	/* Function: 0x14 */
 
-	WERROR PNP_DeleteClassKey();
+	[todo] WERROR PNP_DeleteClassKey();
 
 	/******************/
 	/* Function: 0x15 */
 
-	WERROR PNP_GetInterfaceDeviceAlias();
+	[todo] WERROR PNP_GetInterfaceDeviceAlias();
 
 	/******************/
 	/* Function: 0x16 */
 
-	WERROR PNP_GetInterfaceDeviceList();
+	[todo] WERROR PNP_GetInterfaceDeviceList();
 
 	/******************/
 	/* Function: 0x17 */
 
-	WERROR PNP_GetInterfaceDeviceListSize();
+	[todo] WERROR PNP_GetInterfaceDeviceListSize();
 
 	/******************/
 	/* Function: 0x18 */
 
-	WERROR PNP_RegisterDeviceClassAssociation();
+	[todo] WERROR PNP_RegisterDeviceClassAssociation();
 
 	/******************/
 	/* Function: 0x19 */
 
-	WERROR PNP_UnregisterDeviceClassAssociation();
+	[todo] WERROR PNP_UnregisterDeviceClassAssociation();
 
 	/******************/
 	/* Function: 0x1a */
 
-	WERROR PNP_GetClassRegProp();
+	[todo] WERROR PNP_GetClassRegProp();
 
 	/******************/
 	/* Function: 0x1b */
 
-	WERROR PNP_SetClassRegProp();
+	[todo] WERROR PNP_SetClassRegProp();
 
 	/******************/
 	/* Function: 0x1c */
 
-	WERROR PNP_CreateDevInst();
+	[todo] WERROR PNP_CreateDevInst();
 
 	/******************/
 	/* Function: 0x1d */
 
-	WERROR PNP_DeviceInstanceAction();
+	[todo] WERROR PNP_DeviceInstanceAction();
 
 	/******************/
 	/* Function: 0x1e */
 
-	WERROR PNP_GetDeviceStatus();
+	[todo] WERROR PNP_GetDeviceStatus();
 
 	/******************/
 	/* Function: 0x1f */
 
-	WERROR PNP_SetDeviceProblem();
+	[todo] WERROR PNP_SetDeviceProblem();
 
 	/******************/
 	/* Function: 0x20 */
 
-	WERROR PNP_DisableDevInst();
+	[todo] WERROR PNP_DisableDevInst();
 
 	/******************/
 	/* Function: 0x21 */
 
-	WERROR PNP_UninstallDevInst();
+	[todo] WERROR PNP_UninstallDevInst();
 
 	/******************/
 	/* Function: 0x22 */
 
-	WERROR PNP_AddID();
+	[todo] WERROR PNP_AddID();
 
 	/******************/
 	/* Function: 0x23 */
 
-	WERROR PNP_RegisterDriver();
+	[todo] WERROR PNP_RegisterDriver();
 
 	/******************/
 	/* Function: 0x24 */
 
-	WERROR PNP_QueryRemove();
+	[todo] WERROR PNP_QueryRemove();
 
 	/******************/
 	/* Function: 0x25 */
 
-	WERROR PNP_RequestDeviceEject();
+	[todo] WERROR PNP_RequestDeviceEject();
 
 	/******************/
 	/* Function: 0x26 */
 
-	WERROR PNP_IsDockStationPresent();
+	[todo] WERROR PNP_IsDockStationPresent();
 
 	/******************/
 	/* Function: 0x27 */
 
-	WERROR PNP_RequestEjectPC();
+	[todo] WERROR PNP_RequestEjectPC();
 
 	/******************/
 	/* Function: 0x28 */
@@ -262,115 +262,115 @@ interface ntsvcs
 	/******************/
 	/* Function: 0x2a */
 
-	WERROR PNP_AddEmptyLogConf();
+	[todo] WERROR PNP_AddEmptyLogConf();
 
 	/******************/
 	/* Function: 0x2b */
 
-	WERROR PNP_FreeLogConf();
+	[todo] WERROR PNP_FreeLogConf();
 
 	/******************/
 	/* Function: 0x2c */
 
-	WERROR PNP_GetFirstLogConf();
+	[todo] WERROR PNP_GetFirstLogConf();
 
 	/******************/
 	/* Function: 0x2d */
 
-	WERROR PNP_GetNextLogConf();
+	[todo] WERROR PNP_GetNextLogConf();
 
 	/******************/
 	/* Function: 0x2e */
 
-	WERROR PNP_GetLogConfPriority();
+	[todo] WERROR PNP_GetLogConfPriority();
 
 	/******************/
 	/* Function: 0x2f */
 
-	WERROR PNP_AddResDes();
+	[todo] WERROR PNP_AddResDes();
 
 	/******************/
 	/* Function: 0x30 */
 
-	WERROR PNP_FreeResDes();
+	[todo] WERROR PNP_FreeResDes();
 
 	/******************/
 	/* Function: 0x31 */
 
-	WERROR PNP_GetNextResDes();
+	[todo] WERROR PNP_GetNextResDes();
 
 	/******************/
 	/* Function: 0x32 */
 
-	WERROR PNP_GetResDesData();
+	[todo] WERROR PNP_GetResDesData();
 
 	/******************/
 	/* Function: 0x33 */
 
-	WERROR PNP_GetResDesDataSize();
+	[todo] WERROR PNP_GetResDesDataSize();
 
 	/******************/
 	/* Function: 0x34 */
 
-	WERROR PNP_ModifyResDes();
+	[todo] WERROR PNP_ModifyResDes();
 
 	/******************/
 	/* Function: 0x35 */
 
-	WERROR PNP_DetectResourceLimit();
+	[todo] WERROR PNP_DetectResourceLimit();
 
 	/******************/
 	/* Function: 0x36 */
 
-	WERROR PNP_QueryResConfList();
+	[todo] WERROR PNP_QueryResConfList();
 
 	/******************/
 	/* Function: 0x37 */
 
-	WERROR PNP_SetHwProf();
+	[todo] WERROR PNP_SetHwProf();
 
 	/******************/
 	/* Function: 0x38 */
 
-	WERROR PNP_QueryArbitratorFreeData();
+	[todo] WERROR PNP_QueryArbitratorFreeData();
 
 	/******************/
 	/* Function: 0x39 */
 
-	WERROR PNP_QueryArbitratorFreeSize();
+	[todo] WERROR PNP_QueryArbitratorFreeSize();
 
 	/******************/
 	/* Function: 0x3a */
 
-	WERROR PNP_RunDetection();
+	[todo] WERROR PNP_RunDetection();
 
 	/******************/
 	/* Function: 0x3b */
 
-	WERROR PNP_RegisterNotification();
+	[todo] WERROR PNP_RegisterNotification();
 
 	/******************/
 	/* Function: 0x3c */
 
-	WERROR PNP_UnregisterNotification();
+	[todo] WERROR PNP_UnregisterNotification();
 
 	/******************/
 	/* Function: 0x3d */
 
-	WERROR PNP_GetCustomDevProp();
+	[todo] WERROR PNP_GetCustomDevProp();
 
 	/******************/
 	/* Function: 0x3e */
 
-	WERROR PNP_GetVersionInternal();
+	[todo] WERROR PNP_GetVersionInternal();
 
 	/******************/
 	/* Function: 0x3f */
 
-	WERROR PNP_GetBlockedDriverInfo();
+	[todo] WERROR PNP_GetBlockedDriverInfo();
 
 	/******************/
 	/* Function: 0x40 */
 
-	WERROR PNP_GetServerSideDeviceInstallFlags();
+	[todo] WERROR PNP_GetServerSideDeviceInstallFlags();
 }
diff --git a/source3/samba4.mk b/source3/samba4.mk
index 15774d9..93022c5 100644
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -11,7 +11,7 @@ samba4srcdir = $(srcdir)/../source4
 
 # Flags used for the samba 4 files
 # $(srcdir)/include is required for config.h
-SAMBA4_CFLAGS = -I$(samba4srcdir) -I$(samba4srcdir)/include \
+SAMBA4_CFLAGS = -I.. -I$(samba4srcdir) -I$(samba4srcdir)/include \
 		 -I$(samba4srcdir)/../lib/replace -I$(samba4srcdir)/lib \
 		 -I$(heimdalsrcdir)/lib/hcrypto -I$(tallocdir) \
 		 -I$(srcdir)/include -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H


-- 
Samba Shared Repository

More information about the samba-cvs mailing list