[Selinux-commits] SF.net SVN: selinux:[2946] trunk/libselinux/src/seusers.c

[<ssm...@us...>]

Revision: 2946
          http://selinux.svn.sourceforge.net/selinux/?rev=2946&view=rev
Author:   ssmalley
Date:     2008-08-05 13:29:01 +0000 (Tue, 05 Aug 2008)

Log Message:
-----------
Minor cleanups of Dan's code.

Modified Paths:
--------------
    trunk/libselinux/src/seusers.c

Modified: trunk/libselinux/src/seusers.c
===================================================================
--- trunk/libselinux/src/seusers.c	2008-08-05 13:22:15 UTC (rev 2945)
+++ trunk/libselinux/src/seusers.c	2008-08-05 13:29:01 UTC (rev 2946)
@@ -102,7 +102,7 @@
 	if (rbuf == NULL) return -1;
 
 	int retval = getpwnam_r(name, &pwstorage, rbuf, rbuflen, &pwent);
-	if (retval == 0 || pwent != NULL) {
+	if (retval == 0 && pwent) {
 		gid = pwent->pw_gid;
 	}
 	free(rbuf);
@@ -163,7 +163,6 @@
 	char *defaultlevel = NULL;
 
 	gid_t gid = get_default_gid(name);
-	if ( gid == (gid_t) -1 ) goto nomatch;
 
 	cfg = fopen(selinux_usersconf_path(), "r");
 	if (!cfg)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.