Package: dsniff / 2.4b1+debian-29

36_implicit_declarations.patch Patch series | download
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
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
Description: fix implicit declarations compiler warning
 * switch to C99 uint64_t, remove now unnecessary xdr_u_int64_t function
 * include missing string.h for memset
Author: Lukas Schwaighofer <lukas@schwaighofer.name>

--- a/filesnarf.c
+++ b/filesnarf.c
@@ -55,30 +55,6 @@
 	exit(1);
 }
 
-/* XXX - for nfs_prot_xdr.c */
-bool_t
-xdr_u_int64_t(XDR *xdrs, u_int64_t *nump)
-{
-	int i = 1;
-	u_char *p = (u_char *)nump;
-
-	if (*(char *)&i == 1) {		/* endian haack. */
-		if (xdr_u_long(xdrs, (u_long *)(p + 4)))
-			return (xdr_u_long(xdrs, (u_long *)p));
-	}
-	else {
-		if (xdr_u_long(xdrs, (u_long *)p))
-			return (xdr_u_long(xdrs, (u_long *)(p + 4)));
-	}
-	return (FALSE);
-}
-
-bool_t
-xdr_int64_t(XDR *xdrs, int64_t *nump)
-{
-	return (xdr_u_int64_t(xdrs, (u_int64_t *)nump));
-}
-
 static void
 fh_map_init(void)
 {
--- a/nfs_prot.x
+++ b/nfs_prot.x
@@ -190,7 +190,7 @@
 /*
  * Basic data types
  */
-typedef u_int64_t	uint64;
+typedef uint64_t	uint64;
 typedef int64_t		int64;
 typedef unsigned int	uint32;
 typedef int		int32;
--- a/sshcrypto.c
+++ b/sshcrypto.c
@@ -20,6 +20,7 @@
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "sshcrypto.h"