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)

1 files changed, 17 insertions, 17 deletions

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();
 }