Don't leave dangling map if adding an indirect map fails

When using the add_indirect helper we create a new map and then add a key
for it all in one step. If adding the key fails for any reason be sure to
remove the map we added.

https://fedorahosted.org/freeipa/ticket/1520

ipalib/plugins/automount.py

@@ -791,11 +791,16 @@ class automountmap_add_indirect(LDAPCreate):
 
     def execute(self, *keys, **options):
         result = self.api.Command['automountmap_add'](*keys, **options)
-        options['automountinformation'] = keys[1]
-        self.api.Command['automountkey_add'](
-            keys[0], options['parentmap'],
-            automountkey=options['key'], **options
-        )
+        try:
+            options['automountinformation'] = keys[1]
+            self.api.Command['automountkey_add'](
+                keys[0], options['parentmap'],
+                automountkey=options['key'], **options
+            )
+        except Exception, e:
+            # The key exists, drop the map
+            self.api.Command['automountmap_del'](*keys, **options)
+            raise e
         return result
 
 api.register(automountmap_add_indirect)