Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv

Conflicts:
	source4/lib/registry/ldb.c
	source4/rpc_server/winreg/rpc_winreg.c

1 files changed, 0 insertions, 34 deletions

diff --git a/source4/librpc/idl/dsbackup.idl b/source4/librpc/idl/dsbackup.idl
deleted file mode 100644
index 72e8bf9c2b..0000000000
--- a/source4/librpc/idl/dsbackup.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-[
-	uuid("ecec0d70-a603-11d0-96b1-00a0c91ece30"),
-	version(1.0),
-	pointer_default(unique),
-	helpstring("Backup support for Active Directory")
-] interface ad_backup
-{
-	[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();
-}
-
-[
-	uuid("16e0cf3a-a604-11d0-96b1-00a0c91ece30"),
-	version(1.0),
-    	pointer_default(unique),
-	helpstring("Restoring Active Directory backups")
-] interface ad_restore
-{
-	[todo] void HrRIsNTDSOnline();
-	[todo] void HrRRestorePrepare();
-	[todo] void HrRRestoreRegister();
-	[todo] void HrRRestoreRegisterComplete();
-	[todo] void HrRRestoreGetDatabaseLocations();
-	[todo] void HrRRestoreEnd();
-	[todo] void HrRRestoreSetCurrentLogNumber();
-	[todo] void HrRRestoreCheckLogsForBackup();
-}