--- /home/tpeterse/svn/ucs/ucs-3.1/ucs-3.1-1/services/univention-s4-connector/s4-connector.py	2013-07-10 08:20:26.384673178 +0200
+++ s4-connector.py	2013-09-10 15:15:42.661718159 +0200
@@ -71,10 +71,13 @@
 
 			old_dn=None
 			if os.path.exists(os.path.join(directory, 'tmp','old_dn')):
-				f=open(os.path.join(directory, 'tmp','old_dn'),'r')
-				p=cPickle.Unpickler(f)
-				old_dn=p.load()
-				f.close()
+				if command == 'm':
+					os.unlink(os.path.join(directory, 'tmp','old_dn'))
+				else:
+					f=open(os.path.join(directory, 'tmp','old_dn'),'r')
+					p=cPickle.Unpickler(f)
+					old_dn=p.load()
+					f.close()
 			if command == 'r':
 				filename=os.path.join(directory, 'tmp','old_dn')