[SCM] NSS Wrapper Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  581a412 tests: Add the same alias again
       via  604a7ae nwrap: Don't fail if we want to add an existing entry
      from  0b3d6ec Bump version to 1.1.1

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


- Log -----------------------------------------------------------------
commit 581a4123d0aff4349814c6d1f7504390ffcb9429
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Nov 24 17:33:49 2015 +0100

    tests: Add the same alias again
    
    We should be fault tolerant here.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit 604a7ae8cf438d428e25841c729a73d50ed86cff
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Nov 24 17:32:47 2015 +0100

    nwrap: Don't fail if we want to add an existing entry
    
    Pair-Programmed-With: Michael Adam <obnox at samba.org>
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Signed-off-by: Michael Adam <obnox at samba.org>

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

Summary of changes:
 src/nss_wrapper.c | 6 ++++--
 tests/hosts.in    | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/src/nss_wrapper.c b/src/nss_wrapper.c
index a080b80..f48b9cc 100644
--- a/src/nss_wrapper.c
+++ b/src/nss_wrapper.c
@@ -2622,12 +2622,14 @@ static bool nwrap_ed_inventarize_add_to_existing(struct nwrap_entdata *const ed,
 	for (cursor = el; cursor->next != NULL; cursor = cursor->next)
 	{
 		if (cursor->ed == ed) {
-			return false;
+			/* The entry already exists in this list. */
+			return true;
 		}
 	}
 
 	if (cursor->ed == ed) {
-		return false;
+		/* The entry already exists in this list. */
+		return true;
 	}
 
 	el_new = nwrap_entlist_init(ed);
diff --git a/tests/hosts.in b/tests/hosts.in
index 0d97bbc..9f767c3 100644
--- a/tests/hosts.in
+++ b/tests/hosts.in
@@ -5,7 +5,7 @@
 ::13            beteigeuze.galaxy.site beteigeuze mail   
 127.0.0.14 krikkit.galaxy.site
 ::14 krikkit.galaxy.site
-127.1.1.1 		pumpkin.bunny.net
+127.1.1.1 		pumpkin.bunny.net pumpkin.bunny.net
 127.0.0.66 		pumpkin.bunny.net
 2666::22 		pumpkin.bunny.net
 DEAD:BEEF:1:2:3::4 	pumpkin.bunny.net


-- 
NSS Wrapper Repository