[Selinux-commits] SF.net SVN: selinux:[2940] trunk

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

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

Log Message:
-----------
Revert accidental commit

Modified Paths:
--------------
    trunk/libselinux/src/setrans_client.c
    trunk/policycoreutils/setfiles/setfiles.c

Modified: trunk/libselinux/src/setrans_client.c
===================================================================
--- trunk/libselinux/src/setrans_client.c	2008-08-05 13:04:32 UTC (rev 2939)
+++ trunk/libselinux/src/setrans_client.c	2008-08-05 13:06:08 UTC (rev 2940)
@@ -13,7 +13,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <netdb.h>
-#include <fcntl.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
@@ -42,17 +42,11 @@
 {
 	struct sockaddr_un addr;
 	int fd;
-#ifdef SOCK_CLOEXEC
-	fd = socket(PF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0);
-	if (fd < 0 && errno == EINVAL)
-#endif
-	{
-		fd = socket(PF_UNIX, SOCK_STREAM, 0);
-		if (fd >= 0)
-			fcntl(fd, F_SETFD, FD_CLOEXEC);
-	}
-	if (fd < 0)
+
+	fd = socket(PF_UNIX, SOCK_STREAM, 0);
+	if (fd < 0) {
 		return -1;
+	}
 
 	memset(&addr, 0, sizeof(addr));
 	addr.sun_family = AF_UNIX;

Modified: trunk/policycoreutils/setfiles/setfiles.c
===================================================================
--- trunk/policycoreutils/setfiles/setfiles.c	2008-08-05 13:04:32 UTC (rev 2939)
+++ trunk/policycoreutils/setfiles/setfiles.c	2008-08-05 13:06:08 UTC (rev 2940)
@@ -1017,7 +1017,5 @@
 		free(excludeArray[i].directory);
 	}
 
-       if (progress)
-               printf("\n");
 	exit(errors);
 }


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