[SCM] NSS Wrapper Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  3ddf857 nwrap: Fix the build on FreeBSD
       via  b2ae3be nwrap: fix a copy and paste error in the destructor.
      from  18c1d17 nwrap: Cleanup shadow  getspnam() memory

https://git.samba.org/?p=nss_wrapper.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3ddf8573866601088be02df44f0b04300b502058
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Nov 20 08:51:49 2015 +0100

    nwrap: Fix the build on FreeBSD
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit b2ae3be3ebfece9d59df6f9f945ecff6fb05c586
Author: Michael Adam <obnox at samba.org>
Date:   Fri Nov 20 09:01:01 2015 +0100

    nwrap: fix a copy and paste error in the destructor.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

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

Summary of changes:
 src/nss_wrapper.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/src/nss_wrapper.c b/src/nss_wrapper.c
index 914cd26..a8c97e1 100644
--- a/src/nss_wrapper.c
+++ b/src/nss_wrapper.c
@@ -5551,6 +5551,7 @@ void nwrap_destructor(void)
 		nwrap_pw_global.num = 0;
 	}
 
+#if defined(HAVE_SHADOW_H) && defined(HAVE_GETSPNAM)
 	if (nwrap_sp_global.cache != NULL) {
 		struct nwrap_cache *c = nwrap_sp_global.cache;
 
@@ -5560,8 +5561,9 @@ void nwrap_destructor(void)
 			c->fd = -1;
 		}
 
-		nwrap_he_global.num = 0;
+		nwrap_sp_global.num = 0;
 	}
+#endif /* defined(HAVE_SHADOW_H) && defined(HAVE_GETSPNAM) */
 
 	if (nwrap_he_global.cache != NULL) {
 		struct nwrap_cache *c = nwrap_he_global.cache;


-- 
NSS Wrapper Repository