2002-01-16 04:17:24 +01:00
|
|
|
--- appl/gssftp/ftpd/ftpd.c.orig Wed Jan 9 14:26:51 2002
|
|
|
|
|
+++ appl/gssftp/ftpd/ftpd.c Thu Jan 10 19:00:13 2002
|
|
|
|
|
@@ -487,7 +487,13 @@
|
1999-10-04 16:32:28 +02:00
|
|
|
#ifndef LOG_DAEMON
|
|
|
|
|
#define LOG_DAEMON 0
|
|
|
|
|
#endif
|
|
|
|
|
- openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_DAEMON);
|
|
|
|
|
+
|
|
|
|
|
+#ifndef LOG_FTP
|
|
|
|
|
+#define FACILITY LOG_DAEMON
|
|
|
|
|
+#else
|
|
|
|
|
+#define FACILITY LOG_FTP
|
|
|
|
|
+#endif
|
|
|
|
|
+ openlog("ftpd", LOG_PID | LOG_NDELAY, FACILITY);
|
|
|
|
|
|
|
|
|
|
addrlen = sizeof (his_addr);
|
|
|
|
|
if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) {
|
2002-01-16 04:17:24 +01:00
|
|
|
@@ -2312,6 +2318,10 @@
|
|
|
|
|
if ((length = krb_mk_safe((u_char *)&cksum, out_buf, sizeof(cksum),
|
|
|
|
|
&kdata.session,&ctrl_addr, &his_addr)) == -1) {
|
2001-04-27 20:15:00 +02:00
|
|
|
secure_error("ADAT: krb_mk_safe failed");
|
|
|
|
|
+ return(0);
|
|
|
|
|
+ }
|
2002-01-16 04:17:24 +01:00
|
|
|
+ if (length >= (FTP_BUFSIZ - sizeof("ADAT=")) / 4 * 3) {
|
|
|
|
|
+ secure_error("ADAT: reply too long");
|
|
|
|
|
return(0);
|
2001-04-27 20:15:00 +02:00
|
|
|
}
|
2002-01-16 04:17:24 +01:00
|
|
|
if (length >= (FTP_BUFSIZ - sizeof("ADAT=")) / 4 * 3) {
|
