summaryrefslogtreecommitdiff
path: root/security/cfs/patches/patch-ah
blob: b779c1b47eb44f9cbe454f598db132352fe8b30d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
$NetBSD: patch-ah,v 1.3 2012/10/26 20:24:19 joerg Exp $

--- cfs_fh.c.orig	2012-10-26 13:15:56.000000000 +0000
+++ cfs_fh.c
@@ -289,7 +289,7 @@ doencrypt(k,s,l,salt,vect)
      cfskey *k;
      char *s;
      int l;
-     int salt;
+     u_long salt;
      char *vect;
 {
 	int i,j,smsize;
@@ -311,7 +311,7 @@ dodecrypt(k,s,l,salt,vect)
      cfskey *k;
      char *s;
      int l;
-     int salt;
+     u_long salt;
      char *vect;
 {
 	int i,j,smsize;
@@ -547,7 +547,9 @@ fhtofd(f,mode)
 		openfd=NULL;
 	}
 
+#if 0
 	if (mode==0) { mode=CFS_WRITE; }
+#endif
 	/* Phil Karn's hack for R/O file systems */
 	if ((fd=open(f->name,mode,0))<0 && errno == EROFS) {
 		mode = CFS_READ;        /* Force read and try again */
@@ -618,7 +620,7 @@ closeout(f)
 	}
 }
 
-closeall()
+void closeall(void)
 {
 	if (openfd!=NULL) {
 		if (curfd>=0)