nss-pam-ldapd branch master updated. 0.9.0-16-g10eec70

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nss-pam-ldapd".

The branch, master has been updated
       via  10eec70ba47dd5f48698e2346f05c65448bb92f8 (commit)
       via  dce98a5e9eef2c5f5c4313a4effdf28a99eaec2f (commit)
      from  7c85202ab49b005bf4a4fe5113ccaa9b25b584f9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://arthurdejong.org/git/nss-pam-ldapd/commit/?id=10eec70ba47dd5f48698e2346f05c65448bb92f8

commit 10eec70ba47dd5f48698e2346f05c65448bb92f8
Merge: 7c85202 dce98a5
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Fri Jul 26 17:34:23 2013 +0200

    Merge fixes for reconnect_invalidate option
    
    The branch accidentally got merged before it was fully tested.


http://arthurdejong.org/git/nss-pam-ldapd/commit/?id=dce98a5e9eef2c5f5c4313a4effdf28a99eaec2f

commit dce98a5e9eef2c5f5c4313a4effdf28a99eaec2f
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Fri Jul 26 15:21:28 2013 +0200

    Fix errors in invalidator changes
    
    This fixes a few typos and an omission in the configuration file parsing
    code.

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

-----------------------------------------------------------------------

Summary of changes:
 nslcd/cfg.c            |    2 ++
 nslcd/invalidator.c    |    2 +-
 pynslcd/invalidator.py |    2 +-
 pynslcd/pynslcd.py     |    2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
nss-pam-ldapd
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/