Fix some harmless compiler warnings on NetBSD current (since this

package is built with -Wall)

7 files changed, 122 insertions, 1 deletions

diff --git a/security/fressh/distinfo b/security/fressh/distinfo
index b0e5467af81..b39f7a7d2c0 100644
--- a/security/fressh/distinfo
+++ b/security/fressh/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2003/09/21 08:35:52 jmc Exp $
+$NetBSD: distinfo,v 1.5 2003/10/28 00:14:11 kristerw Exp $
 
 SHA1 (fressh-0.8.1.tar.bz2) = 4dd0a6d4240337b4726a6a68b17878a45974cf82
 Size (fressh-0.8.1.tar.bz2) = 110390 bytes
@@ -7,3 +7,9 @@ SHA1 (patch-ab) = 3cb31fda120a57fa3ff0aaaabba1cbb5923bd686
 SHA1 (patch-ac) = 71477043d47a8e85c7dd0bc1e41b33f18be2a268
 SHA1 (patch-ad) = db398df2db517e49c5df4c04e863ddc2b99052ce
 SHA1 (patch-ae) = d4fe3fc48edf751e9c79a843dee80bef53fa301e
+SHA1 (patch-af) = a62d7421315f4bf70558224dcb4b4b4a7fbaadd1
+SHA1 (patch-ag) = eb02a24bc9ed6a299f40722bfb87d0aefd22ab34
+SHA1 (patch-ah) = 5a4aefc5fdad1c6a0517a7351af461aaa53462a3
+SHA1 (patch-ai) = 0e3233da83fae4a12c2aca91d9cd7c606310eff6
+SHA1 (patch-aj) = 379a1bb374244e6a0672a27e2f4fffc437ac8b3a
+SHA1 (patch-ak) = aa86ae8e33b3189ce720a8c800bb2cbc5e5f33f9
diff --git a/security/fressh/patches/patch-af b/security/fressh/patches/patch-af
new file mode 100644
index 00000000000..87c89ffb46d
--- /dev/null
+++ b/security/fressh/patches/patch-af
@@ -0,0 +1,10 @@
+$NetBSD: patch-af,v 1.1 2003/10/28 00:14:11 kristerw Exp $
+
+--- ssh_global.h.orig	Tue Oct 28 00:44:16 2003
++++ ssh_global.h	Tue Oct 28 00:44:31 2003
+@@ -23,4 +23,4 @@
+ extern ssh_context_t g_context;
+ extern struct ssh_cipher g_cipher;
+ 
+-#endif _SSH_GLOBAL_H
++#endif /* _SSH_GLOBAL_H */
diff --git a/security/fressh/patches/patch-ag b/security/fressh/patches/patch-ag
new file mode 100644
index 00000000000..3e8c35cf885
--- /dev/null
+++ b/security/fressh/patches/patch-ag
@@ -0,0 +1,40 @@
+$NetBSD: patch-ag,v 1.1 2003/10/28 00:14:11 kristerw Exp $
+
+--- sshd_main.c.orig	Tue Oct 28 00:45:01 2003
++++ sshd_main.c	Tue Oct 28 00:45:34 2003
+@@ -352,7 +352,7 @@
+ 		if(!strcasecmp(option, "hostkey")) {
+ 			if(context->opts.hostkey == NULL) {
+ 				strncpy(hostkey, optval, sizeof(hostkey) - 1);
+-				hostkey[sizeof(hostkey) - 1] = NULL;
++				hostkey[sizeof(hostkey) - 1] = 0;
+ 				context->opts.hostkey = hostkey;
+ 			}
+ 			known++;
+@@ -361,7 +361,7 @@
+ 		if(!strcasecmp(option, "listenaddress")) {
+ 			if(context->opts.address == NULL) {
+ 				strncpy(address, optval, sizeof(address) - 1);
+-				address[sizeof(address) - 1] = NULL;
++				address[sizeof(address) - 1] = 0;
+ 				context->opts.address = address;
+ 			}
+ 			known++;
+@@ -370,7 +370,7 @@
+ 		if(!strcasecmp(option, "port")) {
+ 			if(context->opts.port == NULL) {
+ 				strncpy(port, optval, sizeof(port) -1);
+-				port[sizeof(port) - 1] = NULL;
++				port[sizeof(port) - 1] = 0;
+ 				context->opts.port = port;
+ 			}
+ 			known++;
+@@ -379,7 +379,7 @@
+ 		if(!strcasecmp(option, "pidfile")) {
+ 			if(context->opts.pidfile == NULL) {
+ 				strncpy(pidfile, optval, sizeof(pidfile) -1);
+-				pidfile[sizeof(pidfile) - 1] = NULL;
++				pidfile[sizeof(pidfile) - 1] = 0;
+ 				context->opts.pidfile = pidfile;
+ 			}
+ 			known++;
diff --git a/security/fressh/patches/patch-ah b/security/fressh/patches/patch-ah
new file mode 100644
index 00000000000..690ce367449
--- /dev/null
+++ b/security/fressh/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2003/10/28 00:14:11 kristerw Exp $
+
+--- ssh_buffer.c.orig	Tue Oct 28 00:50:00 2003
++++ ssh_buffer.c	Tue Oct 28 00:50:17 2003
+@@ -716,7 +716,7 @@
+  * of the buffer.
+  */
+ int 
+-buf_put_rsa_publickey(struct ssh_buf * buf, const ssh_RSA * key)
++buf_put_rsa_publickey(struct ssh_buf * buf, ssh_RSA * key)
+ {
+ 	struct ssh_mpint mpi;
+ 	if (buf_put_int32(buf, bignum_num_bits(ssh_rsa_npart(key))) != 0) {
diff --git a/security/fressh/patches/patch-ai b/security/fressh/patches/patch-ai
new file mode 100644
index 00000000000..eb720c6ff30
--- /dev/null
+++ b/security/fressh/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2003/10/28 00:14:11 kristerw Exp $
+
+--- ssh_buffer.h.orig	Tue Oct 28 00:50:26 2003
++++ ssh_buffer.h	Tue Oct 28 00:50:48 2003
+@@ -130,7 +130,7 @@
+ int buf_put_asciiz(struct ssh_buf *buf, const char *astring);
+ int buf_put_bignum(struct ssh_buf *buf, const ssh_BIGNUM *num);
+ int buf_put_mpint(struct ssh_buf *, struct ssh_mpint *);
+-int buf_put_rsa_publickey(struct ssh_buf *buf, const ssh_RSA *key);
++int buf_put_rsa_publickey(struct ssh_buf *buf, ssh_RSA *key);
+ 
+ /* Read from filedescriptor d into buf. if size==-1 read until EOF or EOB */
+ int buf_readfile(struct ssh_buf *buf, int d, int size);
diff --git a/security/fressh/patches/patch-aj b/security/fressh/patches/patch-aj
new file mode 100644
index 00000000000..7de849a7853
--- /dev/null
+++ b/security/fressh/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2003/10/28 00:14:11 kristerw Exp $
+
+--- ssh_sys_bsd44+.c.orig	Tue Oct 28 00:53:17 2003
++++ ssh_sys_bsd44+.c	Tue Oct 28 00:55:52 2003
+@@ -830,7 +830,7 @@
+ 	if (pwent == NULL)
+ 		return -1;
+ 
+-	if (pwent->pw_passwd[0] == NULL) {
++	if (pwent->pw_passwd[0] == 0) {
+ 		ret = 0;
+ 		goto out;
+ 	}
diff --git a/security/fressh/patches/patch-ak b/security/fressh/patches/patch-ak
new file mode 100644
index 00000000000..6730d54604b
--- /dev/null
+++ b/security/fressh/patches/patch-ak
@@ -0,0 +1,26 @@
+$NetBSD: patch-ak,v 1.1 2003/10/28 00:14:11 kristerw Exp $
+
+--- transport/ssh_deattack.c.orig	Tue Oct 28 00:51:29 2003
++++ transport/ssh_deattack.c	Tue Oct 28 00:52:01 2003
+@@ -132,8 +132,8 @@
+     n = l;
+     h = (u_int32_t *) malloc(n * HASH_ENTRYSIZE);
+     if (h == NULL) {
+-      SSH_ERROR("Unable to allocate memory for CRC compensation
+- 		attack detector: %s\n", strerror(errno));
++      SSH_ERROR("Unable to allocate memory for CRC compensation "
++ 		"attack detector: %s\n", strerror(errno));
+       return -1;
+     }
+   } else
+@@ -144,8 +144,8 @@
+       h = (u_int32_t *) realloc(h, n * HASH_ENTRYSIZE);
+ 
+       if (h == NULL) {
+-        SSH_ERROR("Unable to allocate memory for CRC compensation
+-                   attack detector: %s\n", strerror(errno));
++        SSH_ERROR("Unable to allocate memory for CRC compensation "
++                  "attack detector: %s\n", strerror(errno));
+         return -1;                                  
+       }                     
+     }