[Pkg-loop-aes-commits] r1467 - in /trunk/loop-aes-utils: ./ debian/patches/52_check_privdrop_return.dpatch

[xam at users.alioth.debian.org]

Author: xam
Date: Fri Oct 19 22:15:35 2007
New Revision: 1467

URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1467
Log:
Sigh. Just exit() rather than link to xmalloc.o for die()

Modified:
    trunk/loop-aes-utils/   (props changed)
    trunk/loop-aes-utils/debian/patches/52_check_privdrop_return.dpatch

Propchange: trunk/loop-aes-utils/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Oct 19 22:15:35 2007
@@ -1,4 +1,4 @@
-02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:11448
+02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:11449
 53348a03-e5de-0310-b097-96e6f85ea926:/import/loop-aes-utils/branches/2.12-alternative:120
 53348a03-e5de-0310-b097-96e6f85ea926:/import/loop-aes-utils/branches/2.12-dpatch:196
 53348a03-e5de-0310-b097-96e6f85ea926:/import/loop-aes-utils/trunk/current:338

Modified: trunk/loop-aes-utils/debian/patches/52_check_privdrop_return.dpatch
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/patches/52_check_privdrop_return.dpatch?rev=1467&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/patches/52_check_privdrop_return.dpatch (original)
+++ trunk/loop-aes-utils/debian/patches/52_check_privdrop_return.dpatch Fri Oct 19 22:15:35 2007
@@ -5,8 +5,8 @@
 
 @DPATCH@
 diff -urNad trunk~/mount/lomount.c trunk/mount/lomount.c
---- trunk~/mount/lomount.c	2007-10-19 23:54:51.000000000 +0200
-+++ trunk/mount/lomount.c	2007-10-19 23:55:31.000000000 +0200
+--- trunk~/mount/lomount.c	2007-10-20 00:00:12.000000000 +0200
++++ trunk/mount/lomount.c	2007-10-20 00:00:47.000000000 +0200
 @@ -47,6 +47,8 @@
  #include "rmd160.h"
  #include "aes.h"
@@ -23,9 +23,9 @@
 -		setgid(getgid());
 -		setuid(getuid());
 +		if(setgid(getgid()) < 0)
-+			die(EX_FAIL, _("mount: cannot set group id: %s"), strerror(errno));
++			exit(EX_FAIL);
 +		if(setuid(getuid()) < 0)
-+			die(EX_FAIL, _("mount: cannot set user id: %s"), strerror(errno));
++			exit(EX_FAIL);
  		for(x = 3; x < 1024; x++) {
  			if(x == pfdi[0]) continue;
  			close(x);
@@ -36,9 +36,9 @@
 -		setgid(getgid());
 -		setuid(getuid());
 +		if(setgid(getgid()) < 0)
-+			die(EX_FAIL, _("mount: cannot set group id: %s"), strerror(errno));
++			exit(EX_FAIL);
 +		if(setuid(getuid()) < 0)
-+			die(EX_FAIL, _("mount: cannot set user id: %s"), strerror(errno));
++			exit(EX_FAIL);
  		for(x = 3; x < 1024; x++) {
  			close(x);
  		}