Merge fixes for reconnect_invalidate option

The branch accidentally got merged before it was fully tested.

4 files changed, 5 insertions, 3 deletions

diff --git a/nslcd/cfg.c b/nslcd/cfg.c
index ec1237c..f4b051f 100644
--- a/nslcd/cfg.c
+++ b/nslcd/cfg.c
@@ -490,6 +490,8 @@ static enum ldap_map_selector parse_map(const char *value)
     return LM_SERVICES;
   else if (strcasecmp(value, "shadow") == 0)
     return LM_SHADOW;
+  else if (strcasecmp(value, "nfsidmap") == 0)
+    return LM_NFSIDMAP;
   /* unknown map */
   return LM_NONE;
 }
diff --git a/nslcd/invalidator.c b/nslcd/invalidator.c
index 03584eb..54a8f95 100644
--- a/nslcd/invalidator.c
+++ b/nslcd/invalidator.c
@@ -250,8 +250,8 @@ void invalidator_do(enum ldap_map_selector map)
   if (map == LM_NONE)
   {
     for (map = 0; map < LM_NONE ; map++)
-        invalidator_do(map);
       if (nslcd_cfg->reconnect_invalidate[map])
+        invalidator_do(map);
     return;
   }
   /* write a single byte which should be atomic and not fill the PIPE
diff --git a/pynslcd/invalidator.py b/pynslcd/invalidator.py
index 98c0783..4f260c3 100644
--- a/pynslcd/invalidator.py
+++ b/pynslcd/invalidator.py
@@ -78,7 +78,7 @@ def loop(fd):
         db = _char_to_db.get(db, None)
         if db == 'nfsidmap':
             exec_invalidate('nfsidmap', '-c')
-        else if db:
+        elif db:
             exec_invalidate('nscd', '-i', db)
 
 
diff --git a/pynslcd/pynslcd.py b/pynslcd/pynslcd.py
index 4a57155..e0add71 100755
--- a/pynslcd/pynslcd.py
+++ b/pynslcd/pynslcd.py
@@ -324,7 +324,7 @@ if __name__ == '__main__':
                 logging.getLogger().removeHandler(stderrhandler)
             logging.info('version %s starting', constants.VERSION)
             # start invalidator sub-process if needed
-            if cfg.invalidator_invalidate:
+            if cfg.reconnect_invalidate:
                 invalidator.start_invalidator()
             # create socket
             nslcd_serversocket = create_socket()