[SCM] NSS Wrapper Repository - branch master updated

Andreas Schneider asn at samba.org
Fri Aug 15 02:53:18 MDT 2014


The branch, master has been updated
       via  e5f6917 tests: Fix possible null pointer dereference in testsuite.
      from  bb8a492 doc: Add nss_wrapper manpage.

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


- Log -----------------------------------------------------------------
commit e5f6917c8707888bfff9b46e546c8ba77ec90962
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Aug 15 10:48:10 2014 +0200

    tests: Fix possible null pointer dereference in testsuite.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>

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

Summary of changes:
 tests/testsuite.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/tests/testsuite.c b/tests/testsuite.c
index 64887cb..4a84778 100644
--- a/tests/testsuite.c
+++ b/tests/testsuite.c
@@ -130,10 +130,10 @@ static bool test_nwrap_getpwnam(const char *name, struct passwd *pwd_p)
 	pwd = getpwnam(name);
 	if (pwd != NULL) {
 		print_passwd(pwd);
-	}
 
-	if (pwd_p != NULL) {
-		copy_passwd(pwd, pwd_p);
+		if (pwd_p != NULL) {
+			copy_passwd(pwd, pwd_p);
+		}
 	}
 
 	return pwd != NULL ? true : false;
@@ -173,10 +173,10 @@ static bool test_nwrap_getpwuid(uid_t uid,
 	pwd = getpwuid(uid);
 	if (pwd != NULL) {
 		print_passwd(pwd);
-	}
 
-	if (pwd_p != NULL) {
-		copy_passwd(pwd, pwd_p);
+		if (pwd_p != NULL) {
+			copy_passwd(pwd, pwd_p);
+		}
 	}
 
 	return pwd != NULL ? true : false;
@@ -292,10 +292,10 @@ static bool test_nwrap_getgrnam(const char *name,
 	grp = getgrnam(name);
 	if (grp != NULL) {
 		print_group(grp);
-	}
 
-	if (grp_p != NULL) {
-		copy_group(grp, grp_p);
+		if (grp_p != NULL) {
+			copy_group(grp, grp_p);
+		}
 	}
 
 	return grp != NULL ? true : false;
@@ -337,10 +337,10 @@ static bool test_nwrap_getgrgid(gid_t gid,
 	grp = getgrgid(gid);
 	if (grp != NULL) {
 		print_group(grp);
-	}
 
-	if (grp_p != NULL) {
-		copy_group(grp, grp_p);
+		if (grp_p != NULL) {
+			copy_group(grp, grp_p);
+		}
 	}
 
 	return grp != NULL ? true : false;


-- 
NSS Wrapper Repository


More information about the samba-cvs mailing list