[Pkg-loop-aes-commits] r1466 - 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:26 2007
New Revision: 1466

URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1466
Log:
Fix 52_check_privdrop_return to include sundries.h for EX_FAIL

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:26 2007
@@ -1,4 +1,4 @@
-02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:11447
+02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:11448
 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=1466&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:26 2007
@@ -4,10 +4,19 @@
 ## DP: Check return value of set{u,g}uid in loop-AES code
 
 @DPATCH@
-diff --git a/mount/lomount.c b/mount/lomount.c
---- a/mount/lomount.c
-+++ b/mount/lomount.c
-@@ -444,8 +444,10 @@ static char *do_GPG_pipe(char *pass)
+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
+@@ -47,6 +47,8 @@
+ #include "rmd160.h"
+ #include "aes.h"
+ 
++#include "sundries.h"
++
+ #if !defined(BLKGETSIZE64)
+ # define BLKGETSIZE64 _IOR(0x12,114,size_t)
+ #endif
+@@ -444,8 +446,10 @@
  		a[x++] = str;
  		a[x++] = "--decrypt";
  		a[x] = 0;
@@ -20,7 +29,7 @@
  		for(x = 3; x < 1024; x++) {
  			if(x == pfdi[0]) continue;
  			close(x);
-@@ -782,8 +784,10 @@ static int loop_fork_mkfs_command(char *
+@@ -782,8 +786,10 @@
  		a[x++] = device;
  		a[x] = 0;
  		e[0] = 0;