From owner-svn-soc-all@FreeBSD.ORG Thu Jun 20 11:40:38 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DD652239 for ; Thu, 20 Jun 2013 11:40:38 +0000 (UTC) (envelope-from dpl@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::16:124]) by mx1.freebsd.org (Postfix) with ESMTP id B5A971EC6 for ; Thu, 20 Jun 2013 11:40:38 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KBecQL093318 for ; Thu, 20 Jun 2013 11:40:38 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5KBecEu093306 for svn-soc-all@FreeBSD.org; Thu, 20 Jun 2013 11:40:38 GMT (envelope-from dpl@FreeBSD.org) Date: Thu, 20 Jun 2013 11:40:38 GMT Message-Id: <201306201140.r5KBecEu093306@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to dpl@FreeBSD.org using -f From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r253280 - soc2013/dpl/head/contrib/bzip2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jun 2013 11:40:38 -0000 Author: dpl Date: Thu Jun 20 11:40:38 2013 New Revision: 253280 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253280 Log: Switch to socketpair(2). Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c ============================================================================== --- soc2013/dpl/head/contrib/bzip2/bzip2.c Thu Jun 20 09:55:53 2013 (r253279) +++ soc2013/dpl/head/contrib/bzip2/bzip2.c Thu Jun 20 11:40:38 2013 (r253280) @@ -222,7 +222,7 @@ Int32 workFactor; #ifdef CAPSICUM -int s, s2, len; +int sv[2], len; struct sockaddr_un sock, remoteSock; char *sockPath = "/tmp/bzip2"; #endif @@ -981,7 +981,7 @@ IntNative fh; fh = open(name, O_WRONLY|O_CREAT|O_EXCL, S_IWUSR|S_IRUSR); /*# ifdef CAPSICUM*/ - /*cap_rights_limit(fh, CAP_WRITE);*/ + cap_rights_limit(fh, CAP_WRITE); /*# endif*/ if (fh == -1) return NULL; fp = fdopen(fh, mode); @@ -1245,7 +1245,7 @@ if ( srcMode != SM_I2O ){ # ifdef CAPSICUM infd = open( inName, O_RDONLY ); - /*cap_rights_limit(infd, CAP_READ);*/ + cap_rights_limit(infd, CAP_READ); inStr = fdopen ( infd, "rb" ); # else infd = NULL; @@ -1322,6 +1322,7 @@ /* Pass the limited file descriptors with a unix domain socket. */ switch( forkpid = rfork(RFPROC | RFCFDG) ) { case ( 0 ): + /* revmsg() the FDs */ if (cap_enter() < 0) { fprintf ( stderr, "%s: Couldn't enter capability mode: %s.\n", progName, strerror(errno) ); @@ -1355,9 +1356,6 @@ exit(1); default: - listen(s, 2); - len = sizeof(struct sockaddr_un); - accept(s, (struct sockaddr *) &remoteSock, &len); /* Send the two FDs */ wait(NULL); if ( -1 == unlink(sock.sun_path) && errno != ENOENT ){ @@ -2032,21 +2030,11 @@ sock.sun_family = PF_LOCAL; strncpy(sock.sun_path, sockPath, sizeof(sock.sun_path)); - if ( (s = socket(PF_LOCAL, SOCK_STREAM, 0)) == -1 ){ + if ( socketpair(PF_LOCAL, SOCK_STREAM, 0, sv) == -1 ){ fprintf ( stderr, "%s: Can't create socket: %s.\n", progName, strerror(errno) ); exit(1); } - if ( -1 == unlink(sock.sun_path) && errno != ENOENT ){ - fprintf ( stderr, "%s: Can't unlink socket: %s.\n", progName, strerror(errno) ); - exit(1); - } - - if ( (s = bind(s, (struct sockaddr *) &sock, SUN_LEN( &sock ) )) == -1 ){ - fprintf ( stderr, "%s: Can't bind socket: %s.\n", progName, strerror(errno) ); - exit(1); - } - /* XXX - Factorize code here */ /*if (srcMode == SM_I2O) {*/ /*if (opMode == OM_Z )*/