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

Conflicts:

	source/auth/credentials/config.mk
	source/auth/gensec/config.mk
	source/build/smb_build/makefile.pm
	source/heimdal_build/config.mk
	source/lib/events/config.mk
	source/lib/nss_wrapper/config.mk
	source/lib/policy/config.mk
	source/lib/registry/config.mk
	source/lib/socket_wrapper/config.mk
	source/lib/tdb/config.mk
	source/lib/tls/config.mk
	source/lib/util/config.mk
	source/libcli/config.mk
	source/libcli/ldap/config.mk
	source/libnet/config.mk
	source/librpc/config.mk
	source/param/config.mk
	source/rpc_server/config.mk
	source/scripting/ejs/config.mk
	source/smbd/process_model.mk
(This used to be commit 760378e0294dd0cd4523a83448328478632d7e3d)

26 files changed, 345 insertions, 315 deletions

diff --git a/source4/librpc/idl/audiosrv.idl b/source4/librpc/idl/audiosrv.idl
index 9b9399ffee..1b059868ff 100644
--- a/source4/librpc/idl/audiosrv.idl
+++ b/source4/librpc/idl/audiosrv.idl
@@ -5,19 +5,19 @@
 	helpstring("Audio Server")
 ] interface audiosrv
 {
-	void audiosrv_CreatezoneFactoriesList();
-	void audiosrv_CreateGfxFactoriesList();
-	void audiosrv_CreateGfxList();
-	void audiosrv_RemoveGfx();
-	void audiosrv_AddGfx();
-	void audiosrv_ModifyGfx();
-	void audiosrv_OpenGfx();
-	void audiosrv_Logon();
-	void audiosrv_Logoff();
-	void audiosrv_RegisterSessionNotificationEvent();
-	void audiosrv_UnregisterSessionNotificationEvent();
-	void audiosrv_SessionConnectState();
-	void audiosrv_DriverOpenDrvRegKey();
-	void audiosrv_AdvisePreferredDeviceChange();
-	void audiosrv_GetPnpInfo();
+	[todo] void audiosrv_CreatezoneFactoriesList();
+	[todo] void audiosrv_CreateGfxFactoriesList();
+	[todo] void audiosrv_CreateGfxList();
+	[todo] void audiosrv_RemoveGfx();
+	[todo] void audiosrv_AddGfx();
+	[todo] void audiosrv_ModifyGfx();
+	[todo] void audiosrv_OpenGfx();
+	[todo] void audiosrv_Logon();
+	[todo] void audiosrv_Logoff();
+	[todo] void audiosrv_RegisterSessionNotificationEvent();
+	[todo] void audiosrv_UnregisterSessionNotificationEvent();
+	[todo] void audiosrv_SessionConnectState();
+	[todo] void audiosrv_DriverOpenDrvRegKey();
+	[todo] void audiosrv_AdvisePreferredDeviceChange();
+	[todo] void audiosrv_GetPnpInfo();
 }
diff --git a/source4/librpc/idl/browser.idl b/source4/librpc/idl/browser.idl
index 5cc2475119..5b05be9cbb 100644
--- a/source4/librpc/idl/browser.idl
+++ b/source4/librpc/idl/browser.idl
@@ -9,50 +9,50 @@ interface browser
 {
 	/******************/
 	/* Function  0x00 */
-	NTSTATUS BrowserrServerEnum();
+	[todo] NTSTATUS BrowserrServerEnum();
 
 	/******************/
 	/* Function  0x01 */
-	NTSTATUS BrowserrDebugCall();
+	[todo] NTSTATUS BrowserrDebugCall();
 
 	/******************/
 	/* Function  0x02 */
-	NTSTATUS BrowserrQueryOtherDomains();
+	[todo] NTSTATUS BrowserrQueryOtherDomains();
 
 	/******************/
 	/* Function  0x03 */
-	NTSTATUS BrowserrResetNetlogonState();
+	[todo] NTSTATUS BrowserrResetNetlogonState();
 
 	/******************/
 	/* Function  0x04 */
-	NTSTATUS BrowserrDebugTrace();
+	[todo] NTSTATUS BrowserrDebugTrace();
 
 	/******************/
 	/* Function  0x05 */
-	NTSTATUS BrowserrQueryStatistics();
+	[todo] NTSTATUS BrowserrQueryStatistics();
 
 	/******************/
 	/* Function  0x06 */
-	NTSTATUS BrowserResetStatistics();
+	[todo] NTSTATUS BrowserResetStatistics();
 
 	/******************/
 	/* Function  0x07 */
-	NTSTATUS NetrBrowserStatisticsClear();
+	[todo] NTSTATUS NetrBrowserStatisticsClear();
 
 	/******************/
 	/* Function  0x08 */
-	NTSTATUS NetrBrowserStatisticsGet();
+	[todo] NTSTATUS NetrBrowserStatisticsGet();
 
 	/******************/
 	/* Function  0x09 */
-	NTSTATUS BrowserrSetNetlogonState();
+	[todo] NTSTATUS BrowserrSetNetlogonState();
 
 	/******************/
 	/* Function  0x0a */
-	NTSTATUS BrowserrQueryEmulatedDomains();
+	[todo] NTSTATUS BrowserrQueryEmulatedDomains();
 
 	/******************/
 	/* Function  0x0b */
-	NTSTATUS BrowserrServerEnumEx();
+	[todo] NTSTATUS BrowserrServerEnumEx();
 
 }
diff --git a/source4/librpc/idl/dfs.idl b/source4/librpc/idl/dfs.idl
index dbbd15039c..b279f555d9 100644
--- a/source4/librpc/idl/dfs.idl
+++ b/source4/librpc/idl/dfs.idl
@@ -308,16 +308,16 @@ import "misc.idl";
 		);
 
 	/* Function 0x06 */
-	WERROR dfs_Rename();
+	[todo] WERROR dfs_Rename();
 
 	/* Function 0x07 */
-	WERROR dfs_Move();
+	[todo] WERROR dfs_Move();
 
 	/* Function 0x08 */
-	WERROR dfs_ManagerGetConfigInfo();
+	[todo] WERROR dfs_ManagerGetConfigInfo();
 
 	/* Function 0x09 */
-	WERROR dfs_ManagerSendSiteInfo();
+	[todo] WERROR dfs_ManagerSendSiteInfo();
 
 	/* Function 0x0a */
 	typedef struct {
@@ -399,10 +399,10 @@ import "misc.idl";
 		);
 
 	/* Function 0x13 */
-	WERROR dfs_Add2();
+	[todo] WERROR dfs_Add2();
 
 	/* Function 0x14 */
-	WERROR dfs_Remove2();
+	[todo] WERROR dfs_Remove2();
 
 	/* Function 0x15 */
 	[public] WERROR dfs_EnumEx(
@@ -414,5 +414,5 @@ import "misc.idl";
 	);
 
 	/* Function 0x16 */
-	WERROR dfs_SetInfo2();
+	[todo] WERROR dfs_SetInfo2();
 }
diff --git a/source4/librpc/idl/drsblobs.idl b/source4/librpc/idl/drsblobs.idl
index eaea6aa30e..f8cbdac8c5 100644
--- a/source4/librpc/idl/drsblobs.idl
+++ b/source4/librpc/idl/drsblobs.idl
@@ -1,6 +1,6 @@
 #include "idl_types.h"
 
-import "drsuapi.idl";
+import "drsuapi.idl", "misc.idl";
 
 [
   uuid("12345778-1234-abcd-0001-00000001"),
diff --git a/source4/librpc/idl/drsuapi.idl b/source4/librpc/idl/drsuapi.idl
index fb24122e26..9652571668 100644
--- a/source4/librpc/idl/drsuapi.idl
+++ b/source4/librpc/idl/drsuapi.idl
@@ -666,7 +666,7 @@ interface drsuapi
 		/* TODO ... */
 	} drsuapi_DsReplicaAddOptions;
 
-	WERROR DRSUAPI_REPLICA_ADD();
+	[todo] WERROR DRSUAPI_REPLICA_ADD();
 
 	/*****************/
         /* Function 0x06 */
@@ -676,7 +676,7 @@ interface drsuapi
 		/* TODO ... */
 	} drsuapi_DsReplicaDeleteOptions;
 
-	WERROR DRSUAPI_REPLICA_DEL();
+	[todo] WERROR DRSUAPI_REPLICA_DEL();
 
 	/*****************/
         /* Function 0x07 */
@@ -685,11 +685,11 @@ interface drsuapi
 		DRSUAPI_DS_REPLICA_MODIFY_WRITEABLE			= 0x00000002
 	} drsuapi_DsReplicaModifyOptions;
 
-	WERROR DRSUAPI_REPLICA_MODIFY();
+	[todo] WERROR DRSUAPI_REPLICA_MODIFY();
 
 	/*****************/
         /* Function 0x08 */
-	WERROR DRSUAPI_VERIFY_NAMES();
+	[todo] WERROR DRSUAPI_VERIFY_NAMES();
 
 	/*****************/
         /* Function 0x09 */
@@ -732,7 +732,7 @@ interface drsuapi
 		[case(1)] drsuapi_DsGetMembershipsRequest1 req1;
 	} drsuapi_DsGetMembershipsRequest;
 
-	WERROR drsuapi_DsGetMemberships(
+	[todo] WERROR drsuapi_DsGetMemberships(
 		[in] policy_handle *bind_handle,
 		[in,out] int32 level,
 		[in] [switch_is(level)] drsuapi_DsGetMembershipsRequest req,
@@ -741,7 +741,7 @@ interface drsuapi
 
 	/*****************/
         /* Function 0x0a */
-	WERROR DRSUAPI_INTER_DOMAIN_MOVE();
+	[todo] WERROR DRSUAPI_INTER_DOMAIN_MOVE();
 
 	/*****************/
         /* Function 0x0b */
@@ -774,7 +774,7 @@ interface drsuapi
 		[case(1)] drsuapi_DsGetNT4ChangeLogInfo1 info1;
 	} drsuapi_DsGetNT4ChangeLogInfo;
 
-	WERROR drsuapi_DsGetNT4ChangeLog(
+	[todo] WERROR drsuapi_DsGetNT4ChangeLog(
 		[in] policy_handle *bind_handle,
 		[in,out] uint32 level,
 		[in] [switch_is(level)] drsuapi_DsGetNT4ChangeLogRequest req,
@@ -849,7 +849,7 @@ interface drsuapi
 		[case(1)] drsuapi_DsNameCtr1 *ctr1;
 	} drsuapi_DsNameCtr;
 
-	WERROR drsuapi_DsCrackNames(
+	[todo] WERROR drsuapi_DsCrackNames(
 		[in] policy_handle *bind_handle,
 		[in, out] int32 level,
 		[in,switch_is(level)] drsuapi_DsNameRequest req,
@@ -920,7 +920,7 @@ interface drsuapi
 
 	/*****************/
         /* Function 0x0f */
-	WERROR DRSUAPI_REMOVE_DS_DOMAIN();
+	[todo] WERROR DRSUAPI_REMOVE_DS_DOMAIN();
 
 	/*****************/
         /* Function 0x10 */
@@ -1138,7 +1138,7 @@ interface drsuapi
 
 	/*****************/
         /* Function 0x12 */
-	WERROR DRSUAPI_EXECUTE_KCC();
+	[todo] WERROR DRSUAPI_EXECUTE_KCC();
 
 	/*****************/
 	/* Function 0x13 */
@@ -1419,7 +1419,7 @@ interface drsuapi
 
 	/*****************/
         /* Function 0x14 */
-	WERROR DRSUAPI_ADD_SID_HISTORY();
+	[todo] WERROR DRSUAPI_ADD_SID_HISTORY();
 
 	/*****************/
         /* Function 0x15 */
@@ -1452,11 +1452,11 @@ interface drsuapi
 
 	/*****************/
         /* Function 0x16 */
-	WERROR DRSUAPI_REPLICA_VERIFY_OBJECTS();
+	[todo] WERROR DRSUAPI_REPLICA_VERIFY_OBJECTS();
 
 	/*****************/
         /* Function 0x17 */
-	WERROR DRSUAPI_GET_OBJECT_EXISTENCE();
+	[todo] WERROR DRSUAPI_GET_OBJECT_EXISTENCE();
 
 	/*****************/
         /* Function 0x18 */
diff --git a/source4/librpc/idl/dsbackup.idl b/source4/librpc/idl/dsbackup.idl
index 21dca8fa0e..72e8bf9c2b 100644
--- a/source4/librpc/idl/dsbackup.idl
+++ b/source4/librpc/idl/dsbackup.idl
@@ -5,15 +5,15 @@
 	helpstring("Backup support for Active Directory")
 ] interface ad_backup
 {
-	void HrRBackupPrepare();
-	void HrRBackupEnd();
-	void HrRBackupGetAttachmentInformation();
-	void HrRBackupOpenFile();
-	void HrRBackupRead();
-	void HrRBackupClose();
-	void HrRBackupGetBackupLogs();
-	void HrRBackupTruncateLogs();
-	void HrRBackupPing();
+	[todo] void HrRBackupPrepare();
+	[todo] void HrRBackupEnd();
+	[todo] void HrRBackupGetAttachmentInformation();
+	[todo] void HrRBackupOpenFile();
+	[todo] void HrRBackupRead();
+	[todo] void HrRBackupClose();
+	[todo] void HrRBackupGetBackupLogs();
+	[todo] void HrRBackupTruncateLogs();
+	[todo] void HrRBackupPing();
 }
 
 [
@@ -23,12 +23,12 @@
 	helpstring("Restoring Active Directory backups")
 ] interface ad_restore
 {
-	void HrRIsNTDSOnline();
-	void HrRRestorePrepare();
-	void HrRRestoreRegister();
-	void HrRRestoreRegisterComplete();
-	void HrRRestoreGetDatabaseLocations();
-	void HrRRestoreEnd();
-	void HrRRestoreSetCurrentLogNumber();
-	void HrRRestoreCheckLogsForBackup();
+	[todo] void HrRIsNTDSOnline();
+	[todo] void HrRRestorePrepare();
+	[todo] void HrRRestoreRegister();
+	[todo] void HrRRestoreRegisterComplete();
+	[todo] void HrRRestoreGetDatabaseLocations();
+	[todo] void HrRRestoreEnd();
+	[todo] void HrRRestoreSetCurrentLogNumber();
+	[todo] void HrRRestoreCheckLogsForBackup();
 }
diff --git a/source4/librpc/idl/dssetup.idl b/source4/librpc/idl/dssetup.idl
index af6350cc43..14de9f7633 100644
--- a/source4/librpc/idl/dssetup.idl
+++ b/source4/librpc/idl/dssetup.idl
@@ -88,14 +88,14 @@ import "misc.idl";
 	  These stubs are left here only as a way of documenting the names
 	  of the calls in case they ever turn up on the wire.
 	*/
-	WERROR dssetup_DsRoleDnsNameToFlatName();
-	WERROR dssetup_DsRoleDcAsDc();
-	WERROR dssetup_DsRoleDcAsReplica();
-	WERROR dssetup_DsRoleDemoteDc();
-	WERROR dssetup_DsRoleGetDcOperationProgress();
-	WERROR dssetup_DsRoleGetDcOperationResults();
-	WERROR dssetup_DsRoleCancel();
-	WERROR dssetup_DsRoleServerSaveStateForUpgrade();
-	WERROR dssetup_DsRoleUpgradeDownlevelServer();
-	WERROR dssetup_DsRoleAbortDownlevelServerUpgrade();
+	[todo] WERROR dssetup_DsRoleDnsNameToFlatName();
+	[todo] WERROR dssetup_DsRoleDcAsDc();
+	[todo] WERROR dssetup_DsRoleDcAsReplica();
+	[todo] WERROR dssetup_DsRoleDemoteDc();
+	[todo] WERROR dssetup_DsRoleGetDcOperationProgress();
+	[todo] WERROR dssetup_DsRoleGetDcOperationResults();
+	[todo] WERROR dssetup_DsRoleCancel();
+	[todo] WERROR dssetup_DsRoleServerSaveStateForUpgrade();
+	[todo] WERROR dssetup_DsRoleUpgradeDownlevelServer();
+	[todo] WERROR dssetup_DsRoleAbortDownlevelServerUpgrade();
 }
diff --git a/source4/librpc/idl/efs.idl b/source4/librpc/idl/efs.idl
index 62fefda606..4279b08d13 100644
--- a/source4/librpc/idl/efs.idl
+++ b/source4/librpc/idl/efs.idl
@@ -18,13 +18,13 @@ WERROR EfsRpcOpenFileRaw(
 	[in] uint32 Flags
 	);
 
-WERROR EfsRpcReadFileRaw(
+[todo] WERROR EfsRpcReadFileRaw(
 	[in,ref] policy_handle *pvContext
 /* incomplete */
 );
 
 
-WERROR EfsRpcWriteFileRaw(
+[todo] WERROR EfsRpcWriteFileRaw(
 	[in,ref] policy_handle *pvContext
 /* incomplete */
 );
@@ -70,12 +70,12 @@ WERROR EfsRpcQueryRecoveryAgents(
 	[out,ref,unique] ENCRYPTION_CERTIFICATE_HASH_LIST **pRecoveryAgents
 );
 
-WERROR EfsRpcRemoveUsersFromFile(
+[todo] WERROR EfsRpcRemoveUsersFromFile(
 	[in] [charset(UTF16),string] uint16 FileName[]
 	/*	[in] ENCRYPTION_CERTIFICATE_LIST Hashes*/
 );
 
-WERROR EfsRpcAddUsersToFile(
+[todo] WERROR EfsRpcAddUsersToFile(
 	[in] [charset(UTF16),string] uint16 FileName[]
 	/*	[in] ENCRYPTION_CERTIFICATE_LIST Hashes*/
 );
@@ -96,13 +96,13 @@ WERROR EfsRpcSetFileEncryptionKey(
 	[in] [unique] ENCRYPTION_CERTIFICATE *pEncryptionCertificate
 );
 
-WERROR EfsRpcNotSupported(
+[todo] WERROR EfsRpcNotSupported(
 );
 
-WERROR EfsRpcFileKeyInfo(
+[todo] WERROR EfsRpcFileKeyInfo(
 );
 
-WERROR EfsRpcDuplicateEncryptionInfoFile(
+[todo] WERROR EfsRpcDuplicateEncryptionInfoFile(
 );
 
 }
diff --git a/source4/librpc/idl/epmapper.idl b/source4/librpc/idl/epmapper.idl
index 60ff338ec4..ea04878094 100644
--- a/source4/librpc/idl/epmapper.idl
+++ b/source4/librpc/idl/epmapper.idl
@@ -310,5 +310,5 @@ interface epmapper
 
 	/**********************/
 	/* Function 0x07      */
-	error_status_t epm_MapAuth();
+	[todo] error_status_t epm_MapAuth();
 }
diff --git a/source4/librpc/idl/eventlog.idl b/source4/librpc/idl/eventlog.idl
index 3defd99400..ee42300c7c 100644
--- a/source4/librpc/idl/eventlog.idl
+++ b/source4/librpc/idl/eventlog.idl
@@ -65,7 +65,7 @@ import "lsa.idl", "security.idl";
 
 	/******************/
 	/* Function: 0x01 */
-	NTSTATUS eventlog_BackupEventLogW();
+	[todo] NTSTATUS eventlog_BackupEventLogW();
 	
 	/******************/
 	/* Function: 0x02 */
@@ -75,7 +75,7 @@ import "lsa.idl", "security.idl";
 
 	/******************/
 	/* Function: 0x03 */
-	NTSTATUS eventlog_DeregisterEventSource();
+	[todo] NTSTATUS eventlog_DeregisterEventSource();
 
 	/******************/
 	/* Function: 0x04 */
@@ -86,11 +86,11 @@ import "lsa.idl", "security.idl";
 
 	/******************/
 	/* Function: 0x05 */
-	NTSTATUS eventlog_GetOldestRecord();
+	[todo] NTSTATUS eventlog_GetOldestRecord();
 
 	/******************/
 	/* Function: 0x06 */
-	NTSTATUS eventlog_ChangeNotify();
+	[todo] NTSTATUS eventlog_ChangeNotify();
 
 	/******************/
 	/* Function: 0x07 */
@@ -105,11 +105,11 @@ import "lsa.idl", "security.idl";
 
 	/******************/
 	/* Function: 0x08 */
-	NTSTATUS eventlog_RegisterEventSourceW();
+	[todo] NTSTATUS eventlog_RegisterEventSourceW();
 
 	/******************/
 	/* Function: 0x09 */
-	NTSTATUS eventlog_OpenBackupEventLogW();
+	[todo] NTSTATUS eventlog_OpenBackupEventLogW();
 
 	/******************/
 	/* Function: 0x0a */
@@ -125,51 +125,51 @@ import "lsa.idl", "security.idl";
 
 	/*****************/
 	/* Function 0x0b */
-	NTSTATUS eventlog_ReportEventW();
+	[todo] NTSTATUS eventlog_ReportEventW();
 
 	/*****************/
 	/* Function 0x0c */
-	NTSTATUS eventlog_ClearEventLogA();
+	[todo] NTSTATUS eventlog_ClearEventLogA();
 	
 	/******************/
 	/* Function: 0x0d */
-	NTSTATUS eventlog_BackupEventLogA();
+	[todo] NTSTATUS eventlog_BackupEventLogA();
 
 	/*****************/
 	/* Function 0x0e */
-	NTSTATUS eventlog_OpenEventLogA();
+	[todo] NTSTATUS eventlog_OpenEventLogA();
 
 	/*****************/
 	/* Function 0x0f */
-	NTSTATUS eventlog_RegisterEventSourceA();
+	[todo] NTSTATUS eventlog_RegisterEventSourceA();
 
 	/*****************/
 	/* Function 0x10 */
-	NTSTATUS eventlog_OpenBackupEventLogA();
+	[todo] NTSTATUS eventlog_OpenBackupEventLogA();
 
 	/*****************/
 	/* Function 0x11 */
-	NTSTATUS eventlog_ReadEventLogA();
+	[todo] NTSTATUS eventlog_ReadEventLogA();
 
 	/*****************/
 	/* Function 0x12 */
-	NTSTATUS eventlog_ReportEventA();
+	[todo] NTSTATUS eventlog_ReportEventA();
 
 	/*****************/
 	/* Function 0x13 */
-	NTSTATUS eventlog_RegisterClusterSvc();
+	[todo] NTSTATUS eventlog_RegisterClusterSvc();
 
 	/*****************/
 	/* Function 0x14 */
-	NTSTATUS eventlog_DeregisterClusterSvc();
+	[todo] NTSTATUS eventlog_DeregisterClusterSvc();
 
 	/*****************/
 	/* Function 0x15 */
-	NTSTATUS eventlog_WriteClusterEvents();
+	[todo] NTSTATUS eventlog_WriteClusterEvents();
 
 	/*****************/
 	/* Function 0x16 */
-	NTSTATUS eventlog_GetLogIntormation();
+	[todo] NTSTATUS eventlog_GetLogIntormation();
 
 	/*****************/
 	/* Function 0x17 */
diff --git a/source4/librpc/idl/frsapi.idl b/source4/librpc/idl/frsapi.idl
index 2931a83da4..11593f479a 100644
--- a/source4/librpc/idl/frsapi.idl
+++ b/source4/librpc/idl/frsapi.idl
@@ -13,19 +13,19 @@ interface frsapi
 {
 	/****************/
 	/* Function 0x00 */
-	void FRSAPI_VERIFY_PROMOTION();
+	[todo] void FRSAPI_VERIFY_PROMOTION();
 
 	/****************/
 	/* Function 0x01 */
-	void FRSAPI_PROMOTION_STATUS();
+	[todo] void FRSAPI_PROMOTION_STATUS();
 
 	/****************/
 	/* Function 0x02 */
-	void FRSAPI_START_DEMOTION();
+	[todo] void FRSAPI_START_DEMOTION();
 
 	/****************/
 	/* Function 0x03 */
-	void FRSAPI_COMMIT_DEMOTION();
+	[todo] void FRSAPI_COMMIT_DEMOTION();
 
 	/****************/
 	/* Function 0x04 */
@@ -49,7 +49,7 @@ interface frsapi
 
 	/****************/
 	/* Function 0x06 */
-	void FRSAPI_VERIFY_PROMOTION_W();
+	[todo] void FRSAPI_VERIFY_PROMOTION_W();
 
 	/****************/
 	/* Function 0x07 */
@@ -106,7 +106,7 @@ interface frsapi
 
 	/****************/
 	/* Function 0x09 */
-	void FRSAPI_WRITER_COMMAND();
+	[todo] void FRSAPI_WRITER_COMMAND();
 
 	/****************/
 	/* Function 0x0a */
diff --git a/source4/librpc/idl/frsrpc.idl b/source4/librpc/idl/frsrpc.idl
index 6a0ec394d0..1019a25b28 100644
--- a/source4/librpc/idl/frsrpc.idl
+++ b/source4/librpc/idl/frsrpc.idl
@@ -128,41 +128,41 @@ interface frsrpc
 
 	/*****************/
 	/* Function 0x01 */
-	void FRSRPC_VERIFY_PROMOTION_PARENT();
+	[todo] void FRSRPC_VERIFY_PROMOTION_PARENT();
 
 	/*****************/
 	/* Function 0x02 */
-	void FRSRPC_START_PROMOTION_PARENT();
+	[todo] void FRSRPC_START_PROMOTION_PARENT();
 
 	/*****************/
 	/* Function 0x03 */
-	void FRSRPC_NOP();
+	[todo] void FRSRPC_NOP();
 
 	/*****************/
 	/* Function 0x04 */
-	void FRSRPC_BACKUP_COMPLETE();
+	[todo] void FRSRPC_BACKUP_COMPLETE();
 
 	/*****************/
 	/* Function 0x05 */
-	void FRSRPC_BACKUP_COMPLETE_5();
+	[todo] void FRSRPC_BACKUP_COMPLETE_5();
 
 	/*****************/
 	/* Function 0x06 */
-	void FRSRPC_BACKUP_COMPLETE_6();
+	[todo] void FRSRPC_BACKUP_COMPLETE_6();
 
 	/*****************/
 	/* Function 0x07 */
-	void FRSRPC_BACKUP_COMPLETE_7();
+	[todo] void FRSRPC_BACKUP_COMPLETE_7();
 
 	/*****************/
 	/* Function 0x08 */
-	void FRSRPC_BACKUP_COMPLETE_8();
+	[todo] void FRSRPC_BACKUP_COMPLETE_8();
 
 	/*****************/
 	/* Function 0x09 */
-	void FRSRPC_BACKUP_COMPLETE_9();
+	[todo] void FRSRPC_BACKUP_COMPLETE_9();
 
 	/*****************/
 	/* Function 0x0a */
-	void FRSRPC_VERIFY_PROMOTION_PARENT_EX();
+	[todo] void FRSRPC_VERIFY_PROMOTION_PARENT_EX();
 }
diff --git a/source4/librpc/idl/irpc.idl b/source4/librpc/idl/irpc.idl
index 0a53494049..2c659aa785 100644
--- a/source4/librpc/idl/irpc.idl
+++ b/source4/librpc/idl/irpc.idl
@@ -1,6 +1,6 @@
 #include "idl_types.h"
 
-import "security.idl", "nbt.idl";
+import "misc.idl", "security.idl", "nbt.idl";
 
 /*
   definitions for irpc primitives
diff --git a/source4/librpc/idl/lsa.idl b/source4/librpc/idl/lsa.idl
index 3159a7d16d..93cfdee201 100644
--- a/source4/librpc/idl/lsa.idl
+++ b/source4/librpc/idl/lsa.idl
@@ -4,7 +4,7 @@
   lsa interface definition
 */
 
-import "security.idl";
+import "misc.idl", "security.idl";
 
 [ uuid("12345778-1234-abcd-ef00-0123456789ab"),
   version(0.0),
@@ -94,12 +94,12 @@ import "security.idl";
 
 	/******************/
 	/* Function: 0x04 */
-	NTSTATUS lsa_SetSecObj ();
+	[todo] NTSTATUS lsa_SetSecObj ();
 
 
 	/******************/
 	/* Function: 0x05 */
-	NTSTATUS lsa_ChangePassword ();
+	[todo] NTSTATUS lsa_ChangePassword ();
 
 
 	/******************/
@@ -273,7 +273,7 @@ import "security.idl";
 
 	/******************/
 	/* Function:       0x09 */
-	NTSTATUS lsa_ClearAuditLog ();
+	[todo] NTSTATUS lsa_ClearAuditLog ();
 
 	/******************/
 	/* Function: 0x0a */
@@ -338,7 +338,7 @@ import "security.idl";
 
 	/******************/
 	/* Function: 0x0e */
-	typedef enum {
+	typedef [public] enum {
 		SID_NAME_USE_NONE = 0,/* NOTUSED */
 		SID_NAME_USER     = 1, /* user */
 		SID_NAME_DOM_GRP  = 2, /* domain group */
@@ -477,15 +477,15 @@ import "security.idl";
 		);
 
 	/* Function:           0x15 */
-	NTSTATUS lsa_GetQuotasForAccount();
+	[todo] NTSTATUS lsa_GetQuotasForAccount();
 	
 	/* Function:           0x16 */
-	NTSTATUS lsa_SetQuotasForAccount();
+	[todo] NTSTATUS lsa_SetQuotasForAccount();
 	
 	/* Function:    0x17 */
-	NTSTATUS lsa_GetSystemAccessAccount();
+	[todo] NTSTATUS lsa_GetSystemAccessAccount();
 	/* Function:    0x18 */
-	NTSTATUS lsa_SetSystemAccessAccount();
+	[todo] NTSTATUS lsa_SetSystemAccessAccount();
 
 	/* Function:        0x19 */
 	NTSTATUS lsa_OpenTrustedDomain(
@@ -599,7 +599,7 @@ import "security.idl";
 		);
 
 	/* Function:     0x1b */
-	NTSTATUS lsa_SetInformationTrustedDomain();
+	[todo] NTSTATUS lsa_SetInformationTrustedDomain();
 
 	/* Function:          0x1c */
 	[public] NTSTATUS lsa_OpenSecret(
@@ -659,7 +659,7 @@ import "security.idl";
 		);
 
 	/* Function:        0x22 */
-	NTSTATUS lsa_DeleteObject();
+	[todo] NTSTATUS lsa_DeleteObject();
 
 	
 	/*******************/
@@ -713,7 +713,7 @@ import "security.idl";
         );
 
 	/* Function:     0x28 */
-	NTSTATUS lsa_SetTrustedDomainInfo();
+	[todo] NTSTATUS lsa_SetTrustedDomainInfo();
 	/* Function:      0x29 */
 	NTSTATUS lsa_DeleteTrustedDomain(
 		[in]               policy_handle         *handle,
@@ -721,9 +721,9 @@ import "security.idl";
 	);
 
 	/* Function:       0x2a */
-	NTSTATUS lsa_StorePrivateData();
+	[todo] NTSTATUS lsa_StorePrivateData();
 	/* Function:        0x2b */
-	NTSTATUS lsa_RetrievePrivateData();
+	[todo] NTSTATUS lsa_RetrievePrivateData();
 
 
 	/**********************/
@@ -800,7 +800,7 @@ import "security.idl";
 
 
 	/* Function 0x33 */
-	NTSTATUS lsa_CreateTrustedDomainEx();
+	[todo] NTSTATUS lsa_CreateTrustedDomainEx();
 
 	/* Function 0x34 */
 	NTSTATUS lsa_CloseTrustedDomainEx(
@@ -858,7 +858,7 @@ import "security.idl";
 		);
 
 	/* Function 0x38 */
-	NTSTATUS lsa_TestCall();
+	[todo] NTSTATUS lsa_TestCall();
 
 	/**********************/
 	/* Function 0x39 */
@@ -914,31 +914,31 @@ import "security.idl";
 		);
 
 	/* Function 0x3b */
-	NTSTATUS lsa_CreateTrustedDomainEx2();
+	[todo] NTSTATUS lsa_CreateTrustedDomainEx2();
 
 	/* Function 0x3c */
-	NTSTATUS lsa_CREDRWRITE();
+	[todo] NTSTATUS lsa_CREDRWRITE();
 
 	/* Function 0x3d */
-	NTSTATUS lsa_CREDRREAD();
+	[todo] NTSTATUS lsa_CREDRREAD();
 
 	/* Function 0x3e */
-	NTSTATUS lsa_CREDRENUMERATE();
+	[todo] NTSTATUS lsa_CREDRENUMERATE();
 
 	/* Function 0x3f */
-	NTSTATUS lsa_CREDRWRITEDOMAINCREDENTIALS();
+	[todo] NTSTATUS lsa_CREDRWRITEDOMAINCREDENTIALS();
 
 	/* Function 0x40 */
-	NTSTATUS lsa_CREDRREADDOMAINCREDENTIALS();
+	[todo] NTSTATUS lsa_CREDRREADDOMAINCREDENTIALS();
 
 	/* Function 0x41 */
-	NTSTATUS lsa_CREDRDELETE();
+	[todo] NTSTATUS lsa_CREDRDELETE();
 
 	/* Function 0x42 */
-	NTSTATUS lsa_CREDRGETTARGETINFO();
+	[todo] NTSTATUS lsa_CREDRGETTARGETINFO();
 
 	/* Function 0x43 */
-	NTSTATUS lsa_CREDRPROFILELOADED();
+	[todo] NTSTATUS lsa_CREDRPROFILELOADED();
 
 	/**********************/
 	/* Function 0x44 */
@@ -967,16 +967,16 @@ import "security.idl";
 		);
 
 	/* Function 0x45 */
-	NTSTATUS lsa_CREDRGETSESSIONTYPES();
+	[todo] NTSTATUS lsa_CREDRGETSESSIONTYPES();
 
 	/* Function 0x46 */
-	NTSTATUS lsa_LSARREGISTERAUDITEVENT();
+	[todo] NTSTATUS lsa_LSARREGISTERAUDITEVENT();
 
 	/* Function 0x47 */
-	NTSTATUS lsa_LSARGENAUDITEVENT();
+	[todo] NTSTATUS lsa_LSARGENAUDITEVENT();
 
 	/* Function 0x48 */
-	NTSTATUS lsa_LSARUNREGISTERAUDITEVENT();
+	[todo] NTSTATUS lsa_LSARUNREGISTERAUDITEVENT();
 
 	/* Function 0x49 */
 	typedef struct {
@@ -1024,10 +1024,10 @@ import "security.idl";
 		);
 
 	/* Function 0x4a */
-	NTSTATUS lsa_LSARSETFORESTTRUSTINFORMATION();
+	[todo] NTSTATUS lsa_LSARSETFORESTTRUSTINFORMATION();
 
 	/* Function 0x4b */
-	NTSTATUS lsa_CREDRRENAME();
+	[todo] NTSTATUS lsa_CREDRRENAME();
 
 	/*****************/
 	/* Function 0x4c */
@@ -1055,15 +1055,15 @@ import "security.idl";
 		);
 
 	/* Function 0x4e */
-	NTSTATUS lsa_LSAROPENPOLICYSCE();
+	[todo] NTSTATUS lsa_LSAROPENPOLICYSCE();
 
 	/* Function 0x4f */
-	NTSTATUS lsa_LSARADTREGISTERSECURITYEVENTSOURCE();
+	[todo] NTSTATUS lsa_LSARADTREGISTERSECURITYEVENTSOURCE();
 
 	/* Function 0x50 */
-	NTSTATUS lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE();
+	[todo] NTSTATUS lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE();
 
 	/* Function 0x51 */
-	NTSTATUS lsa_LSARADTREPORTSECURITYEVENT();
+	[todo] NTSTATUS lsa_LSARADTREPORTSECURITYEVENT();
 
 }
diff --git a/source4/librpc/idl/msgsvc.idl b/source4/librpc/idl/msgsvc.idl
index 09878ac7a4..d196daf06b 100644
--- a/source4/librpc/idl/msgsvc.idl
+++ b/source4/librpc/idl/msgsvc.idl
@@ -7,10 +7,10 @@
 	helpstring("Messaging Service")
 ] interface msgsvc
 {
-	void NetrMessageNameAdd();
-	void NetrMessageNameEnum();
-	void NetrMessageNameGetInfo();
-	void NetrMessageNameDel();
+	[todo] void NetrMessageNameAdd();
+	[todo] void NetrMessageNameEnum();
+	[todo] void NetrMessageNameGetInfo();
+	[todo] void NetrMessageNameDel();
 }
 
 [
@@ -18,5 +18,5 @@
 	version(1.0)
 ] interface msgsvcsend
 {
-	void NetrSendMessage();
+	[todo] void NetrSendMessage();
 }
diff --git a/source4/librpc/idl/nbt.idl b/source4/librpc/idl/nbt.idl
index 17304bfa0d..aa88360882 100644
--- a/source4/librpc/idl/nbt.idl
+++ b/source4/librpc/idl/nbt.idl
@@ -8,9 +8,9 @@
    encoding if it doesn't work out
 */
 
-import "security.idl", "svcctl.idl";
+import "misc.idl", "security.idl", "svcctl.idl";
 [
-helper("libcli/nbt/nbtname.h")
+helper("libcli/nbt/libnbt.h")
 ]
 interface nbt
 {
diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl
index d06c2acdd4..6da496a486 100644
--- a/source4/librpc/idl/netlogon.idl
+++ b/source4/librpc/idl/netlogon.idl
@@ -4,7 +4,7 @@
   who contributed!
 */
 
-import "lsa.idl", "samr.idl", "security.idl", "nbt.idl";
+import "misc.idl", "lsa.idl", "samr.idl", "security.idl", "nbt.idl";
 
 #include "idl_types.h"
 
@@ -983,11 +983,11 @@ interface netlogon
 
 	/*****************/
 	/* Function 0x15 */
-	WERROR netr_NETRLOGONDUMMYROUTINE1();
+	[todo] WERROR netr_NETRLOGONDUMMYROUTINE1();
 
 	/****************/
 	/* Function 0x16 */
-	WERROR netr_NETRLOGONSETSERVICEBITS();
+	[todo] WERROR netr_NETRLOGONSETSERVICEBITS();
 
 	/****************/
 	/* Function 0x17 */
@@ -999,11 +999,11 @@ interface netlogon
 
 	/****************/
 	/* Function 0x18 */
-	WERROR netr_NETRLOGONCOMPUTESERVERDIGEST();
+	[todo] WERROR netr_NETRLOGONCOMPUTESERVERDIGEST();
 
 	/****************/
 	/* Function 0x19 */
-	WERROR netr_NETRLOGONCOMPUTECLIENTDIGEST();
+	[todo] WERROR netr_NETRLOGONCOMPUTECLIENTDIGEST();
 
 	/****************/
 	/* Function 0x1a */
@@ -1128,7 +1128,7 @@ interface netlogon
 
 	/****************/
 	/* Function 0x20 */
-	WERROR netr_NETRLOGONSENDTOSAM();
+	[todo] WERROR netr_NETRLOGONSENDTOSAM();
 
 	/****************/
 	/* Function 0x21 */
@@ -1164,7 +1164,7 @@ interface netlogon
 
 	/****************/
 	/* Function 0x23 */
-	WERROR netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN();
+	[todo] WERROR netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN();
 
 	/****************/
 	/* Function 0x24 */
@@ -1332,5 +1332,5 @@ interface netlogon
 
 	/****************/
 	/* Function 0x2e */
-	WERROR netr_NETRSERVERGETTRUSTINFO();
+	[todo] WERROR netr_NETRSERVERGETTRUSTINFO();
 }
diff --git a/source4/librpc/idl/ntsvcs.idl b/source4/librpc/idl/ntsvcs.idl
index 05ba68e727..1cdf8eecaa 100644
--- a/source4/librpc/idl/ntsvcs.idl
+++ b/source4/librpc/idl/ntsvcs.idl
@@ -9,69 +9,69 @@
 ]
 interface ntsvcs
 {
-	void PNP_Disconnect();
-	void PNP_Connect();
-	void PNP_GetVersion();
-	void PNP_GetGlobalState();
-	void PNP_InitDetection();
-	void PNP_ReportLogOn();
-	void PNP_ValidateDeviceInstance();
-	void PNP_GetRootDeviceInstance();
-	void PNP_GetRelatedDeviceInstance();
-	void PNP_EnumerateSubKeys();
-	void PNP_GetDeviceList();
-	void PNP_GetDeviceListSize();
-	void PNP_GetDepth();
-	void PNP_GetDeviceRegProp();
-	void PNP_SetDeviceRegProp();
-	void PNP_GetClassInstance();
-	void PNP_CreateKey();
-	void PNP_DeleteRegistryKey();
-	void PNP_GetClassCount();
-	void PNP_GetClassName();
-	void PNP_DeleteClassKey();
-	void PNP_GetInterfaceDeviceAlias();
-	void PNP_GetInterfaceDeviceList();
-	void PNP_GetInterfaceDeviceListSize();
-	void PNP_RegisterDeviceClassAssociation();
-	void PNP_UnregisterDeviceClassAssociation();
-	void PNP_GetClassRegProp();
-	void PNP_SetClassRegProp();
-	void PNP_CreateDevInst();
-	void PNP_DeviceInstanceAction();
-	void PNP_GetDeviceStatus();
-	void PNP_SetDeviceProblem();
-	void PNP_DisableDevInst();
-	void PNP_UninstallDevInst();
-	void PNP_AddID();
-	void PNP_RegisterDriver();
-	void PNP_QueryRemove();
-	void PNP_RequestDeviceEject();
-	void PNP_IsDockStationPresent();
-	void PNP_RequestEjectPC();
-	void PNP_HwProfFlags();
-	void PNP_GetHwProfInfo();
-	void PNP_AddEmptyLogConf();
-	void PNP_FreeLogConf();
-	void PNP_GetFirstLogConf();
-	void PNP_GetNextLogConf();
-	void PNP_GetLogConfPriority();
-	void PNP_AddResDes();
-	void PNP_FreeResDes();
-	void PNP_GetNextResDes();
-	void PNP_GetResDesData();
-	void PNP_GetResDesDataSize();
-	void PNP_ModifyResDes();
-	void PNP_DetectResourceLimit();
-	void PNP_QueryResConfList();
-	void PNP_SetHwProf();
-	void PNP_QueryArbitratorFreeData();
-	void PNP_QueryArbitratorFreeSize();
-	void PNP_RunDetection();
-	void PNP_RegisterNotification();
-	void PNP_UnregisterNotification();
-	void PNP_GetCustomDevProp();
-	void PNP_GetVersionInternal();
-	void PNP_GetBlockedDriverInfo();
-	void PNP_GetServerSideDeviceInstallFlags();
+	[todo] void PNP_Disconnect();
+	[todo] void PNP_Connect();
+	[todo] void PNP_GetVersion();
+	[todo] void PNP_GetGlobalState();
+	[todo] void PNP_InitDetection();
+	[todo] void PNP_ReportLogOn();
+	[todo] void PNP_ValidateDeviceInstance();
+	[todo] void PNP_GetRootDeviceInstance();
+	[todo] void PNP_GetRelatedDeviceInstance();
+	[todo] void PNP_EnumerateSubKeys();
+	[todo] void PNP_GetDeviceList();
+	[todo] void PNP_GetDeviceListSize();
+	[todo] void PNP_GetDepth();
+	[todo] void PNP_GetDeviceRegProp();
+	[todo] void PNP_SetDeviceRegProp();
+	[todo] void PNP_GetClassInstance();
+	[todo] void PNP_CreateKey();
+	[todo] void PNP_DeleteRegistryKey();
+	[todo] void PNP_GetClassCount();
+	[todo] void PNP_GetClassName();
+	[todo] void PNP_DeleteClassKey();
+	[todo] void PNP_GetInterfaceDeviceAlias();
+	[todo] void PNP_GetInterfaceDeviceList();
+	[todo] void PNP_GetInterfaceDeviceListSize();
+	[todo] void PNP_RegisterDeviceClassAssociation();
+	[todo] void PNP_UnregisterDeviceClassAssociation();
+	[todo] void PNP_GetClassRegProp();
+	[todo] void PNP_SetClassRegProp();
+	[todo] void PNP_CreateDevInst();
+	[todo] void PNP_DeviceInstanceAction();
+	[todo] void PNP_GetDeviceStatus();
+	[todo] void PNP_SetDeviceProblem();
+	[todo] void PNP_DisableDevInst();
+	[todo] void PNP_UninstallDevInst();
+	[todo] void PNP_AddID();
+	[todo] void PNP_RegisterDriver();
+	[todo] void PNP_QueryRemove();
+	[todo] void PNP_RequestDeviceEject();
+	[todo] void PNP_IsDockStationPresent();
+	[todo] void PNP_RequestEjectPC();
+	[todo] void PNP_HwProfFlags();
+	[todo] void PNP_GetHwProfInfo();
+	[todo] void PNP_AddEmptyLogConf();
+	[todo] void PNP_FreeLogConf();
+	[todo] void PNP_GetFirstLogConf();
+	[todo] void PNP_GetNextLogConf();
+	[todo] void PNP_GetLogConfPriority();
+	[todo] void PNP_AddResDes();
+	[todo] void PNP_FreeResDes();
+	[todo] void PNP_GetNextResDes();
+	[todo] void PNP_GetResDesData();
+	[todo] void PNP_GetResDesDataSize();
+	[todo] void PNP_ModifyResDes();
+	[todo] void PNP_DetectResourceLimit();
+	[todo] void PNP_QueryResConfList();
+	[todo] void PNP_SetHwProf();
+	[todo] void PNP_QueryArbitratorFreeData();
+	[todo] void PNP_QueryArbitratorFreeSize();
+	[todo] void PNP_RunDetection();
+	[todo] void PNP_RegisterNotification();
+	[todo] void PNP_UnregisterNotification();
+	[todo] void PNP_GetCustomDevProp();
+	[todo] void PNP_GetVersionInternal();
+	[todo] void PNP_GetBlockedDriverInfo();
+	[todo] void PNP_GetServerSideDeviceInstallFlags();
 }
diff --git a/source4/librpc/idl/oxidresolver.idl b/source4/librpc/idl/oxidresolver.idl
index ac028cec29..95c8a1c5f0 100644
--- a/source4/librpc/idl/oxidresolver.idl
+++ b/source4/librpc/idl/oxidresolver.idl
@@ -10,7 +10,7 @@
  (used by DCOM)
  */
 
-import "orpc.idl";
+import "misc.idl", "orpc.idl";
 
 [ 
 	uuid("99fcfec4-5260-101b-bbcb-00aa0021347a"),
diff --git a/source4/librpc/idl/remact.idl b/source4/librpc/idl/remact.idl
index 58d976e078..2165ecfc81 100644
--- a/source4/librpc/idl/remact.idl
+++ b/source4/librpc/idl/remact.idl
@@ -3,7 +3,7 @@
   http://www.grimes.demon.co.uk/DCOM/DCOMSpec.htm
  */
 
-import "orpc.idl";
+import "misc.idl", "orpc.idl";
 
 [
 	uuid("4d9f4ab8-7d1c-11cf-861e-0020af6e7c57"),
diff --git a/source4/librpc/idl/spoolss.idl b/source4/librpc/idl/spoolss.idl
index 2144393ebd..6b4b0b8a16 100644
--- a/source4/librpc/idl/spoolss.idl
+++ b/source4/librpc/idl/spoolss.idl
@@ -3,7 +3,7 @@
 /*
   spoolss interface definitions
 */
-import "security.idl", "winreg.idl";
+import "misc.idl", "security.idl", "winreg.idl";
 
 [ uuid("12345678-1234-abcd-ef00-0123456789ab"),
   version(1.0),
@@ -386,14 +386,14 @@ import "security.idl", "winreg.idl";
 
 	/******************/
 	/* Function: 0x05 */
-	WERROR spoolss_AddPrinter(
+	[todo] WERROR spoolss_AddPrinter(
  		/* This function is not implemented in Samba 3 as no
  		   clients have been observed using it. */
 	);
 
 	/******************/
 	/* Function: 0x06 */
-	WERROR spoolss_DeletePrinter(
+	[todo] WERROR spoolss_DeletePrinter(
 	);
 
 	/******************/
@@ -442,7 +442,7 @@ import "security.idl", "winreg.idl";
 
 	/******************/
 	/* Function: 0x09 */
-	WERROR spoolss_AddPrinterDriver(
+	[todo] WERROR spoolss_AddPrinterDriver(
 	);
 
 	typedef struct {
@@ -564,7 +564,7 @@ import "security.idl", "winreg.idl";
 
 	/******************/
 	/* Function: 0x0b */
-	WERROR spoolss_GetPrinterDriver(
+	[todo] WERROR spoolss_GetPrinterDriver(
 	);
 
 	/******************/
@@ -602,7 +602,7 @@ import "security.idl", "winreg.idl";
 
 	/******************/
 	/* Function: 0x0e */
-	WERROR spoolss_AddPrintProcessor(
+	[todo] WERROR spoolss_AddPrintProcessor(
 	);
 
 	/******************/
@@ -644,7 +644,7 @@ import "security.idl", "winreg.idl";
 
 	/******************/
 	/* Function: 0x10 */
-	WERROR spoolss_GetPrintProcessorDirectory(
+	[todo] WERROR spoolss_GetPrintProcessorDirectory(
 	);
 
 	/******************/
@@ -713,12 +713,12 @@ import "security.idl", "winreg.idl";
 
 	/******************/
 	/* Function: 0x18 */
-	WERROR spoolss_AddJob(
+	[todo] WERROR spoolss_AddJob(
 	);
 
 	/******************/
 	/* Function: 0x19 */
-	WERROR spoolss_ScheduleJob(
+	[todo] WERROR spoolss_ScheduleJob(
 	);
 
 	/******************/
@@ -806,7 +806,7 @@ import "security.idl", "winreg.idl";
 
 	/******************/
 	/* Function: 0x1c */
-	WERROR spoolss_WaitForPrinterChange(
+	[todo] WERROR spoolss_WaitForPrinterChange(
 	);
 
 	/******************/
@@ -1022,79 +1022,79 @@ import "security.idl", "winreg.idl";
 
 	/******************/
 	/* Function: 0x26 */
-	WERROR spoolss_ConfigurePort(
+	[todo] WERROR spoolss_ConfigurePort(
 	);
 
 	/******************/
 	/* Function: 0x27 */
-	WERROR spoolss_DeletePort(
+	[todo] WERROR spoolss_DeletePort(
 	);
 
 	/******************/
 	/* Function: 0x28 */
-	WERROR spoolss_CreatePrinterIC(
+	[todo] WERROR spoolss_CreatePrinterIC(
 	);
 
 	/******************/
 	/* Function: 0x29 */
-	WERROR spoolss_PlayGDIScriptOnPrinterIC(
+	[todo] WERROR spoolss_PlayGDIScriptOnPrinterIC(
 	);
 
 	/******************/
 	/* Function: 0x2a */
-	WERROR spoolss_DeletePrinterIC(
+	[todo] WERROR spoolss_DeletePrinterIC(
 	);
 
 	/******************/
 	/* Function: 0x2b */
-	WERROR spoolss_AddPrinterConnection(
+	[todo] WERROR spoolss_AddPrinterConnection(
 	);
 
 	/******************/
 	/* Function: 0x2c */
-	WERROR spoolss_DeletePrinterConnection(
+	[todo] WERROR spoolss_DeletePrinterConnection(
 	);
 
 	/******************/
 	/* Function: 0x2d */
-	WERROR spoolss_PrinterMessageBox(
+	[todo] WERROR spoolss_PrinterMessageBox(
 		/* Marked as obsolete in MSDN.  "Not necessary and has
 		   no effect". */
 	);
 
 	/******************/
 	/* Function: 0x2e */
-	WERROR spoolss_AddMonitor(
+	[todo] WERROR spoolss_AddMonitor(
 	);
 
 	/******************/
 	/* Function: 0x2f */
-	WERROR spoolss_DeleteMonitor(
+	[todo] WERROR spoolss_DeleteMonitor(
 	);
 
 	/******************/
 	/* Function: 0x30 */
-	WERROR spoolss_DeletePrintProcessor(
+	[todo] WERROR spoolss_DeletePrintProcessor(
 	);
 
 	/******************/
 	/* Function: 0x31 */
-	WERROR spoolss_AddPrintProvidor(
+	[todo] WERROR spoolss_AddPrintProvidor(
 	);
 
 	/******************/
 	/* Function: 0x32 */
-	WERROR spoolss_DeletePrintProvidor(
+	[todo] WERROR spoolss_DeletePrintProvidor(
 	);
 
 	/******************/
 	/* Function: 0x33 */
-	WERROR spoolss_EnumPrintProcDataTypes(
+	[todo] WERROR spoolss_EnumPrintProcDataTypes(
 	);
 
 	/******************/
 	/* Function: 0x34 */
-	WERROR spoolss_ResetPrinter(
+	[todo] WERROR spoolss_ResetPrinter(
 	);
 
 	/******************/
@@ -1115,12 +1115,12 @@ import "security.idl", "winreg.idl";
 
 	/******************/
 	/* Function: 0x36 */
-	WERROR spoolss_FindFirstPrinterChangeNotification(
+	[todo] WERROR spoolss_FindFirstPrinterChangeNotification(
 	);
 
 	/******************/
 	/* Function: 0x37 */
-	WERROR spoolss_FindNextPrinterChangeNotification(
+	[todo] WERROR spoolss_FindNextPrinterChangeNotification(
 	);
 
 	/******************/
@@ -1131,7 +1131,7 @@ import "security.idl", "winreg.idl";
 
 	/******************/
 	/* Function: 0x39 */
-	WERROR spoolss_RouterFindFirstPrinterChangeNotificationOld(
+	[todo] WERROR spoolss_RouterFindFirstPrinterChangeNotificationOld(
 	);
 
 	/******************/
@@ -1147,7 +1147,7 @@ import "security.idl", "winreg.idl";
 
 	/******************/
 	/* Function: 0x3b */
-	WERROR spoolss_RouterReplyPrinter(
+	[todo] WERROR spoolss_RouterReplyPrinter(
 	);
 
 	/******************/
@@ -1158,22 +1158,22 @@ import "security.idl", "winreg.idl";
 
 	/******************/
 	/* Function: 0x3d */
-	WERROR spoolss_AddPortEx(
+	[todo] WERROR spoolss_AddPortEx(
 	);
 
 	/******************/
 	/* Function: 0x3e */
-	WERROR spoolss_RouterFindFirstPrinterChangeNotification(
+	[todo] WERROR spoolss_RouterFindFirstPrinterChangeNotification(
 	);
 
 	/******************/
 	/* Function: 0x3f */
-	WERROR spoolss_SpoolerInit(
+	[todo] WERROR spoolss_SpoolerInit(
 	);
 
 	/******************/
 	/* Function: 0x40 */
-	WERROR spoolss_ResetPrinterEx(
+	[todo] WERROR spoolss_ResetPrinterEx(
 	);
 
 	typedef [enum16bit] enum {
@@ -1239,7 +1239,7 @@ import "security.idl", "winreg.idl";
 
 	/******************/
 	/* Function: 0x42 */
-	WERROR spoolss_RouterRefreshPrinterChangeNotification(
+	[todo] WERROR spoolss_RouterRefreshPrinterChangeNotification(
 	);
 
 	typedef struct {
@@ -1295,7 +1295,7 @@ import "security.idl", "winreg.idl";
 
 	/******************/
 	/* Function: 0x44 */
-	WERROR spoolss_44(
+	[todo] WERROR spoolss_44(
 	);
 
 	typedef struct {
@@ -1399,7 +1399,7 @@ import "security.idl", "winreg.idl";
 
 	/******************/
 	/* Function: 0x47 */
-	WERROR spoolss_47(
+	[todo] WERROR spoolss_47(
 	);
 
 	/******************/
@@ -1425,17 +1425,17 @@ import "security.idl", "winreg.idl";
 
 	/******************/
 	/* Function: 0x4a */
-	WERROR spoolss_4a(
+	[todo] WERROR spoolss_4a(
 	);
 
 	/******************/
 	/* Function: 0x4b */
-	WERROR spoolss_4b(
+	[todo] WERROR spoolss_4b(
 	);
 
 	/******************/
 	/* Function: 0x4c */
-	WERROR spoolss_4c(
+	[todo] WERROR spoolss_4c(
 	);
 
 	/******************/
@@ -1492,32 +1492,32 @@ import "security.idl", "winreg.idl";
 
 	/******************/
 	/* Function: 0x52 */
-	WERROR spoolss_DeletePrinterKey(
+	[todo] WERROR spoolss_DeletePrinterKey(
 	);
 
 	/******************/
 	/* Function: 0x53 */
-	WERROR spoolss_53(
+	[todo] WERROR spoolss_53(
 	);
 
 	/******************/
 	/* Function: 0x54 */
-	WERROR spoolss_DeletePrinterDriverEx(
+	[todo] WERROR spoolss_DeletePrinterDriverEx(
 	);
 
 	/******************/
 	/* Function: 0x55 */
-	WERROR spoolss_55(
+	[todo] WERROR spoolss_55(
 	);
 
 	/******************/
 	/* Function: 0x56 */
-	WERROR spoolss_56(
+	[todo] WERROR spoolss_56(
 	);
 
 	/******************/
 	/* Function: 0x57 */
-	WERROR spoolss_57(
+	[todo] WERROR spoolss_57(
 	);
 
 	/******************/
@@ -1536,36 +1536,36 @@ import "security.idl", "winreg.idl";
 
 	/******************/
 	/* Function: 0x59 */
-	[public] WERROR spoolss_AddPrinterDriverEx(
+	[public,todo] WERROR spoolss_AddPrinterDriverEx(
 	);
 
 	/******************/
 	/* Function: 0x5a */
-	WERROR spoolss_5a(
+	[todo] WERROR spoolss_5a(
 	);
 
 	/******************/
 	/* Function: 0x5b */
-	WERROR spoolss_5b(
+	[todo] WERROR spoolss_5b(
 	);
 
 	/******************/
 	/* Function: 0x5c */
-	WERROR spoolss_5c(
+	[todo] WERROR spoolss_5c(
 	);
 
 	/******************/
 	/* Function: 0x5d */
-	WERROR spoolss_5d(
+	[todo] WERROR spoolss_5d(
 	);
 
 	/******************/
 	/* Function: 0x5e */
-	WERROR spoolss_5e(
+	[todo] WERROR spoolss_5e(
 	);
 
 	/******************/
 	/* Function: 0x5f */
-	WERROR spoolss_5f(
+	[todo] WERROR spoolss_5f(
 	);
 }
diff --git a/source4/librpc/idl/srvsvc.idl b/source4/librpc/idl/srvsvc.idl
index 8ef49413bc..703f3281cf 100644
--- a/source4/librpc/idl/srvsvc.idl
+++ b/source4/librpc/idl/srvsvc.idl
@@ -1370,7 +1370,7 @@ import "security.idl", "svcctl.idl";
 
 	/******************/
 	/* Function: 0x22 */
-	WERROR srvsvc_NETRPRNAMECANONICALIZE(
+	[todo] WERROR srvsvc_NETRPRNAMECANONICALIZE(
 		);
 
 	/******************/
@@ -1464,56 +1464,56 @@ import "security.idl", "svcctl.idl";
 
 	/******************/
 	/* Function: 0x2b */
-	WERROR srvsvc_NETRDFSGETVERSION(
+	[todo] WERROR srvsvc_NETRDFSGETVERSION(
 		);
 
 	/******************/
 	/* Function: 0x2c */
-	WERROR srvsvc_NETRDFSCREATELOCALPARTITION(
+	[todo] WERROR srvsvc_NETRDFSCREATELOCALPARTITION(
 		);
 
 	/******************/
 	/* Function: 0x2d */
-	WERROR srvsvc_NETRDFSDELETELOCALPARTITION(
+	[todo] WERROR srvsvc_NETRDFSDELETELOCALPARTITION(
 		);
 
 	/******************/
 	/* Function: 0x2e */
-	WERROR srvsvc_NETRDFSSETLOCALVOLUMESTATE(
+	[todo] WERROR srvsvc_NETRDFSSETLOCALVOLUMESTATE(
 		);
 
 	/******************/
 	/* Function: 0x2f */
-	WERROR srvsvc_NETRDFSSETSERVERINFO(
+	[todo] WERROR srvsvc_NETRDFSSETSERVERINFO(
 		);
 
 	/******************/
 	/* Function: 0x30 */
-	WERROR srvsvc_NETRDFSCREATEEXITPOINT(
+	[todo] WERROR srvsvc_NETRDFSCREATEEXITPOINT(
 		);
 
 	/******************/
 	/* Function: 0x31 */
-	WERROR srvsvc_NETRDFSDELETEEXITPOINT(
+	[todo] WERROR srvsvc_NETRDFSDELETEEXITPOINT(
 		);
 
 	/******************/
 	/* Function: 0x32 */
-	WERROR srvsvc_NETRDFSMODIFYPREFIX(
+	[todo] WERROR srvsvc_NETRDFSMODIFYPREFIX(
 		);
 
 	/******************/
 	/* Function: 0x33 */
-	WERROR srvsvc_NETRDFSFIXLOCALVOLUME(
+	[todo] WERROR srvsvc_NETRDFSFIXLOCALVOLUME(
 		);
 
 	/******************/
 	/* Function: 0x34 */
-	WERROR srvsvc_NETRDFSMANAGERREPORTSITEINFO(
+	[todo] WERROR srvsvc_NETRDFSMANAGERREPORTSITEINFO(
 		);
 
 	/******************/
 	/* Function: 0x35 */
-	WERROR srvsvc_NETRSERVERTRANSPORTDELEX(
+	[todo] WERROR srvsvc_NETRSERVERTRANSPORTDELEX(
 		);
 }
diff --git a/source4/librpc/idl/svcctl.idl b/source4/librpc/idl/svcctl.idl
index 8f368ef878..615f4e3dab 100644
--- a/source4/librpc/idl/svcctl.idl
+++ b/source4/librpc/idl/svcctl.idl
@@ -115,12 +115,12 @@ import "misc.idl";
 
 	/*****************/
 	/* Function 0x04 */
-	WERROR svcctl_QueryServiceObjectSecurity(
+	[todo] WERROR svcctl_QueryServiceObjectSecurity(
 	);
 
 	/*****************/
 	/* Function 0x05 */
-	WERROR svcctl_SetServiceObjectSecurity(
+	[todo] WERROR svcctl_SetServiceObjectSecurity(
 	);
 
 	/*****************/
@@ -132,7 +132,7 @@ import "misc.idl";
 
 	/*****************/
 	/* Function 0x07 */
-	WERROR svcctl_SetServiceStatus(
+	[todo] WERROR svcctl_SetServiceStatus(
 	);
 
 	/*****************/
@@ -143,7 +143,7 @@ import "misc.idl";
 
 	/*****************/
 	/* Function 0x09 */
-	WERROR svcctl_NotifyBootConfigStatus(
+	[todo] WERROR svcctl_NotifyBootConfigStatus(
 	);
 
 	/*****************/
@@ -408,12 +408,12 @@ import "misc.idl";
 
 	/*****************/
 	/* Function 0x22 */
-	WERROR svcctl_GetCurrentGroupeStateW(
+	[todo] WERROR svcctl_GetCurrentGroupeStateW(
 	);
 
 	/*****************/
 	/* Function 0x23 */
-	WERROR svcctl_EnumServiceGroupW(
+	[todo] WERROR svcctl_EnumServiceGroupW(
 	);
 
 	/*****************/
@@ -494,6 +494,6 @@ import "misc.idl";
 
 	/*****************/
 	/* Function 0x2b */
-	WERROR svcctl_SCSendTSMessage(
+	[todo] WERROR svcctl_SCSendTSMessage(
 	);
 }
diff --git a/source4/librpc/idl/w32time.idl b/source4/librpc/idl/w32time.idl
index c3c6e014de..4839899629 100644
--- a/source4/librpc/idl/w32time.idl
+++ b/source4/librpc/idl/w32time.idl
@@ -14,8 +14,8 @@ interface w32time
 
 	/*****************/
 	/* Function 0x00 */
-	WERROR w32time_SyncTime();
+	[todo] WERROR w32time_SyncTime();
 
-	WERROR w32time_GetNetLogonServiceBits();
-	WERROR w32time_QueryProviderStatus();
+	[todo] WERROR w32time_GetNetLogonServiceBits();
+	[todo] WERROR w32time_QueryProviderStatus();
 }
diff --git a/source4/librpc/idl/winbind.idl b/source4/librpc/idl/winbind.idl
index 29649c0ea7..5cefb38f75 100644
--- a/source4/librpc/idl/winbind.idl
+++ b/source4/librpc/idl/winbind.idl
@@ -3,8 +3,8 @@
 */
 
 #include "idl_types.h"
-  
-import "netlogon.idl";
+
+import "netlogon.idl", "lsa.idl", "security.idl";
 
 [
   uuid("245f3e6b-3c5d-6e21-3a2d-2a3d645b7221"),
@@ -16,6 +16,24 @@ interface winbind
 	typedef [switch_type(uint16)] union netr_LogonLevel netr_LogonLevel;
 	typedef [switch_type(uint16)] union netr_Validation netr_Validation;
 
+	typedef enum {
+		ID_TYPE_NOT_SPECIFIED,
+		ID_TYPE_UID,
+		ID_TYPE_GID,
+		ID_TYPE_BOTH
+	} id_type;
+
+	typedef struct {
+		uint32 id;
+		id_type type;
+	} unixid;
+
+	typedef struct {
+		unixid *unixid;
+		dom_sid *sid;
+		NTSTATUS status;
+	} id_mapping;
+
 	/* a call to get runtime informations */
 	void winbind_information(/* TODO */);
 
@@ -35,4 +53,16 @@ interface winbind
 		[out] [switch_is(validation_level)] netr_Validation validation,
 		[out] uint8 authoritative
 	);
+
+	typedef [v1_enum] enum {
+		WINBIND_IDMAP_LEVEL_SIDS_TO_XIDS	= 1,
+		WINBIND_IDMAP_LEVEL_XIDS_TO_SIDS	= 2
+	} winbind_get_idmap_level;
+
+	NTSTATUS winbind_get_idmap(
+		[in]     winbind_get_idmap_level level,
+		[in]     uint32 count,
+		[in,out] [size_is(count)] id_mapping ids[]
+	);
+
 }
diff --git a/source4/librpc/idl/winreg.idl b/source4/librpc/idl/winreg.idl
index 5e5d5542b6..1e01a91197 100644
--- a/source4/librpc/idl/winreg.idl
+++ b/source4/librpc/idl/winreg.idl
@@ -249,7 +249,7 @@ import "lsa.idl", "security.idl";
 
 	/******************/
 	/* Function: 0x12 */
-	WERROR winreg_ReplaceKey(
+	[todo] WERROR winreg_ReplaceKey(
 	);
 
 	/******************/
@@ -295,7 +295,7 @@ import "lsa.idl", "security.idl";
 
 	/******************/
 	/* Function: 0x17 */
-	WERROR winreg_UnLoadKey(
+	[todo] WERROR winreg_UnLoadKey(
 	);
 
 	/******************/
@@ -375,7 +375,7 @@ import "lsa.idl", "security.idl";
 
 	/******************/
 	/* Function: 0x1f */
-	WERROR winreg_SaveKeyEx(
+	[todo] WERROR winreg_SaveKeyEx(
 	);
 
 	/******************/
@@ -396,6 +396,6 @@ import "lsa.idl", "security.idl";
 
 	/******************/
 	/* Function: 0x22 */
-	WERROR winreg_QueryMultipleValues2(
+	[todo] WERROR winreg_QueryMultipleValues2(
 	);
 }