Attachment 23446 Details for Bug 60230

[patch] The ftpd fix from heimdal 0.6.3

heimdal-0.6.2-ftp.patch (text/plain), 19.42 KB, created by Vladimir Nadvornik on 2004-09-15 00:25:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Nadvornik

Created: 2004-09-15 00:25:33 UTC

Size: 19.42 KB

patch

obsolete

>--- appl/ftp/ftp/ftp.c
>+++ appl/ftp/ftp/ftp.c
>@@ -1741,8 +1741,11 @@
>     snprintf (buf, sizeof (buf), "%c%c%c", IAC, IP, IAC);
>     if (send (fileno (cout), buf, 3, MSG_OOB) != 3)
> 	warn ("abort");
>-    fprintf (cout, "%cABOR\r\n", DM);
>-    fflush (cout);
>+    fprintf (cout, "%c", DM);
>+    sec_fprintf(cout, "ABOR");
>+    sec_fflush (cout);
>+    fprintf (cout, "\r\n");
>+    fflush(cout);
>     FD_ZERO (&mask);
>     if (fileno (cin) >= FD_SETSIZE)
> 	errx (1, "fd too large");
>--- appl/ftp/ftpd/extern.h
>+++ appl/ftp/ftpd/extern.h
>@@ -48,7 +48,6 @@
> 
> #include <stdio.h>
> #include <stdarg.h>
>-#include <setjmp.h>
> #ifdef HAVE_PWD_H
> #include <pwd.h>
> #endif
>@@ -129,10 +128,8 @@
> extern	int guest;
> extern	int logging;
> extern	int type;
>-extern	int oobflag;
> extern off_t file_size;
> extern off_t byte_count;
>-extern jmp_buf urgcatch;
> 
> extern	int form;
> extern	int debug;
>@@ -142,7 +139,6 @@
> extern	char hostname[], remotehost[];
> extern	char proctitle[];
> extern	int usedefault;
>-extern  int transflag;
> extern  char tmpline[];
> 
> #endif /* _EXTERN_H_ */
>--- appl/ftp/ftpd/ftpcmd.y
>+++ appl/ftp/ftpd/ftpcmd.y
>@@ -47,10 +47,13 @@
> 
> off_t	restart_point;
> 
>+static	int hasyyerrored;
>+
>+
> static	int cmd_type;
> static	int cmd_form;
> static	int cmd_bytesz;
>-char	cbuf[2048];
>+char	cbuf[64*1024];
> char	*fromname;
> 
> struct tab {
>@@ -303,15 +306,6 @@
> 		}
> 	| sTAT CRLF
> 		{
>-		    if(oobflag){
>-			if (file_size != (off_t) -1)
>-			    reply(213, "Status: %lu of %lu bytes transferred",
>-				  (unsigned long)byte_count, 
>-				  (unsigned long)file_size);
>-			else
>-			    reply(213, "Status: %lu bytes transferred", 
>-				  (unsigned long)byte_count);
>-		    }else
> 			statcmd();
> 	}
> 	| DELE SP pathname CRLF check_login_no_guest
>@@ -337,13 +331,7 @@
> 		}
> 	| ABOR CRLF
> 		{
>-			if(oobflag){
>-				reply(426, "Transfer aborted. Data connection closed.");
>-				reply(226, "Abort successful");
>-				oobflag = 0;
>-				longjmp(urgcatch, 1);
>-			}else
>-				reply(225, "ABOR command successful.");
>+			reply(225, "ABOR command successful.");
> 		}
> 	| CWD CRLF check_login
> 		{
>@@ -914,8 +902,6 @@
> 
> %%
> 
>-extern jmp_buf errcatch;
>-
> #define	CMD	0	/* beginning of command */
> #define	ARGS	1	/* expect miscellaneous arguments */
> #define	STR1	2	/* expect SP followed by STRING */
>@@ -1034,15 +1020,13 @@
> 	char *cs;
> 
> 	cs = s;
>-/* tmpline may contain saved command from urgent mode interruption */
>+
>+	/* might still be data within the security MIC/CONF/ENC */
> 	if(ftp_command){
>-	  strlcpy(s, ftp_command, n);
>-	  if (debug)
>-	    syslog(LOG_DEBUG, "command: %s", s);
>-#ifdef XXX
>-	  fprintf(stderr, "%s\n", s);
>-#endif
>-	  return s;
>+	    strlcpy(s, ftp_command, n);
>+	    if (debug)
>+		syslog(LOG_DEBUG, "command: %s", s);
>+	    return s;
> 	}
> 	while ((c = getc(stdin)) != EOF) {
> 		c &= 0377;
>@@ -1127,6 +1111,8 @@
> 		switch (state) {
> 
> 		case CMD:
>+			hasyyerrored = 0;
>+
> 			signal(SIGALRM, toolong);
> 			alarm((unsigned) ftpd_timeout);
> 			if (ftpd_getline(cbuf, sizeof(cbuf)-1) == NULL) {
>@@ -1135,7 +1121,7 @@
> 			}
> 			alarm(0);
> #ifdef HAVE_SETPROCTITLE
>-			if (strncasecmp(cbuf, "PASS", 4) != NULL)
>+			if (strncasecmp(cbuf, "PASS", 4) != 0)
> 				setproctitle("%s: %s", proctitle, cbuf);
> #endif /* HAVE_SETPROCTITLE */
> 			if ((cp = strchr(cbuf, '\r'))) {
>@@ -1154,8 +1140,8 @@
> 			if (p != 0) {
> 				if (p->implemented == 0) {
> 					nack(p->name);
>-					longjmp(errcatch,0);
>-					/* NOTREACHED */
>+					hasyyerrored = 1;
>+					break;
> 				}
> 				state = p->state;
> 				yylval.s = p->name;
>@@ -1180,8 +1166,8 @@
> 				if (p->implemented == 0) {
> 					state = CMD;
> 					nack(p->name);
>-					longjmp(errcatch,0);
>-					/* NOTREACHED */
>+					hasyyerrored = 1;
>+					break;
> 				}
> 				state = p->state;
> 				yylval.s = p->name;
>@@ -1329,12 +1315,27 @@
> 		default:
> 			fatal("Unknown state in scanner.");
> 		}
>-		yyerror((char *) 0);
>+		yyerror(NULL);
> 		state = CMD;
>-		longjmp(errcatch,0);
>+		return (0);
> 	}
> }
> 
>+/* ARGSUSED */
>+void
>+yyerror(char *s)
>+{
>+	char *cp;
>+
>+	if (hasyyerrored)
>+	    return;
>+
>+	if ((cp = strchr(cbuf,'\n')))
>+		*cp = '\0';
>+	reply(500, "'%s': command not understood.", cbuf);
>+	hasyyerrored = 1;
>+}
>+
> static char *
> copy(char *s)
> {
>--- appl/ftp/ftpd/ftpd.8
>+++ appl/ftp/ftpd/ftpd.8
>@@ -48,6 +48,7 @@
> .Op Fl T Ar maxtimeout
> .Op Fl t Ar timeout
> .Op Fl -gss-bindings
>+.Op Fl I | Fl -no-insecure-oob
> .Op Fl u Ar default umask
> .Op Fl B | Fl -builtin-ls
> .Op Fl -good-chars= Ns Ar string
>@@ -150,6 +151,13 @@
> .Fl -good-chars= Ns Ar string
> .Xc
> allowed anonymous upload filename chars
>+.It Xo
>+.Fl I
>+.Fl -no-insecure-oob
>+.Xc
>+don't allow insecure out of band.
>+Heimdal ftp client before 0.7 doesn't support secure oob, so turning
>+on this options makes them no longer work.
> .El
> .Pp
> The file
>--- appl/ftp/ftpd/ftpd.c
>+++ appl/ftp/ftpd/ftpd.c
>@@ -61,8 +61,6 @@
> struct  sockaddr *pasv_addr = (struct sockaddr *)&pasv_addr_ss;
> 
> int	data;
>-jmp_buf	errcatch, urgcatch;
>-int	oobflag;
> int	logged_in;
> struct	passwd *pw;
> int	debug = 0;
>@@ -78,7 +76,9 @@
> int	mode;
> int	usedefault = 1;		/* for data transfers */
> int	pdata = -1;		/* for passive mode */
>-int	transflag;
>+int	allow_insecure_oob = 1;
>+static int transflag;
>+static int urgflag;
> off_t	file_size;
> off_t	byte_count;
> #if !defined(CMASK) || CMASK == 0
>@@ -134,6 +134,7 @@
> 
> static void	 ack (char *);
> static void	 myoob (int);
>+static int	 handleoobcmd(void);
> static int	 checkuser (char *, char *);
> static int	 checkaccess (char *);
> static FILE	*dataconn (const char *, off_t, const char *);
>@@ -223,6 +224,7 @@
>     { NULL, 'v', arg_flag, &debug, "enable debugging" },
>     { "builtin-ls", 'B', arg_flag, &use_builtin_ls, "use built-in ls to list files" },
>     { "good-chars", 0, arg_string, &good_chars, "allowed anonymous upload filename chars" },
>+    { "insecure-oob", 'I', arg_negative_flag, &allow_insecure_oob, "don't allow insecure OOB ABOR/STAT" },
> #ifdef KRB5    
>     { "gss-bindings", 0,  arg_flag, &ftp_do_gss_bindings, "Require GSS-API bindings", NULL},
> #endif
>@@ -429,7 +431,6 @@
> #endif
> 	  );
> 
>-    setjmp(errcatch);
>     for (;;)
> 	yyparse();
>     /* NOTREACHED */
>@@ -1364,15 +1365,13 @@
> 	static char *buf;
> 	static size_t bufsize;
> 
>-	transflag++;
>-	if (setjmp(urgcatch)) {
>-		transflag = 0;
>-		return;
>-	}
>+	transflag = 1;
> 	switch (type) {
> 
> 	case TYPE_A:
> 	    while ((c = getc(instr)) != EOF) {
>+		if (urgflag && handleoobcmd())
>+		    return;
> 		byte_count++;
> 		if(c == '\n')
> 		    sec_putc('\r', outstr);
>@@ -1380,6 +1379,7 @@
> 	    }
> 	    sec_fflush(outstr);
> 	    transflag = 0;
>+	    urgflag = 0;
> 	    if (ferror(instr))
> 		goto file_err;
> 	    if (ferror(outstr))
>@@ -1389,6 +1389,7 @@
> 		
> 	case TYPE_I:
> 	case TYPE_L:
>+#if 0 /* XXX handle urg flag */
> #if defined(HAVE_MMAP) && !defined(NO_MMAP)
> #ifndef MAP_FAILED
> #define MAP_FAILED (-1)
>@@ -1412,10 +1413,12 @@
> 			sec_fflush(outstr);
> 			byte_count = cnt;
> 			transflag = 0;
>+			urgflag = 0;
> 		    }
> 		}
> 	    }
> #endif
>+#endif
> 	if(transflag) {
> 	    struct stat st;
> 
>@@ -1425,14 +1428,19 @@
> 				fstat(filefd, &st) >= 0 ? &st : NULL);
> 	    if (buf == NULL) {
> 		transflag = 0;
>+		urgflag = 0;
> 		perror_reply(451, "Local resource failure: malloc");
> 		return;
> 	    }
> 	    while ((cnt = read(filefd, buf, bufsize)) > 0 &&
>-		   sec_write(netfd, buf, cnt) == cnt)
>+		   sec_write(netfd, buf, cnt) == cnt) {
> 		byte_count += cnt;
>+		if (urgflag && handleoobcmd())
>+		    return;
>+	    }
> 	    sec_fflush(outstr); /* to end an encrypted stream */
> 	    transflag = 0;
>+	    urgflag = 0;
> 	    if (cnt != 0) {
> 		if (cnt < 0)
> 		    goto file_err;
>@@ -1443,17 +1451,20 @@
> 	return;
> 	default:
> 	    transflag = 0;
>+	    urgflag = 0;
> 	    reply(550, "Unimplemented TYPE %d in send_data", type);
> 	    return;
> 	}
> 
> data_err:
> 	transflag = 0;
>+	urgflag = 0;
> 	perror_reply(426, "Data connection");
> 	return;
> 
> file_err:
> 	transflag = 0;
>+	urgflag = 0;
> 	perror_reply(551, "Error on input file");
> }
> 
>@@ -1471,16 +1482,13 @@
>     static size_t bufsize;
>     struct stat st;
> 
>-    transflag++;
>-    if (setjmp(urgcatch)) {
>-	transflag = 0;
>-	return (-1);
>-    }
>+    transflag = 1;
> 
>     buf = alloc_buffer (buf, &bufsize,
> 			fstat(fileno(outstr), &st) >= 0 ? &st : NULL);
>     if (buf == NULL) {
> 	transflag = 0;
>+	urgflag = 0;
> 	perror_reply(451, "Local resource failure: malloc");
> 	return -1;
>     }
>@@ -1493,15 +1501,19 @@
> 	    if (write(fileno(outstr), buf, cnt) != cnt)
> 		goto file_err;
> 	    byte_count += cnt;
>+	    if (urgflag && handleoobcmd())
>+		return (-1);
> 	}
> 	if (cnt < 0)
> 	    goto data_err;
> 	transflag = 0;
>+	urgflag = 0;
> 	return (0);
> 
>     case TYPE_E:
> 	reply(553, "TYPE E not implemented.");
> 	transflag = 0;
>+	urgflag = 0;
> 	return (-1);
> 
>     case TYPE_A:
>@@ -1511,6 +1523,8 @@
> 	while ((cnt = sec_read(fileno(instr),
> 				buf + cr_flag, 
> 				bufsize - cr_flag)) > 0){
>+	    if (urgflag && handleoobcmd())
>+		return (-1);
> 	    byte_count += cnt;
> 	    cnt += cr_flag;
> 	    cr_flag = 0;
>@@ -1542,6 +1556,7 @@
> 	if (ferror(outstr))
> 	    goto file_err;
> 	transflag = 0;
>+	urgflag = 0;
> 	if (bare_lfs) {
> 	    lreply(226, "WARNING! %d bare linefeeds received in ASCII mode\r\n"
> 		   "    File may not have transferred correctly.\r\n",
>@@ -1552,16 +1567,19 @@
>     default:
> 	reply(550, "Unimplemented TYPE %d in receive_data", type);
> 	transflag = 0;
>+	urgflag = 0;
> 	return (-1);
>     }
> 	
> data_err:
>     transflag = 0;
>+    urgflag = 0;
>     perror_reply(426, "Data Connection");
>     return (-1);
> 	
> file_err:
>     transflag = 0;
>+    urgflag = 0;
>     perror_reply(452, "Error writing file");
>     return (-1);
> }
>@@ -1731,17 +1749,6 @@
> 	reply(502, "%s command not implemented.", s);
> }
> 
>-/* ARGSUSED */
>-void
>-yyerror(char *s)
>-{
>-	char *cp;
>-
>-	if ((cp = strchr(cbuf,'\n')))
>-		*cp = '\0';
>-	reply(500, "'%s': command not understood.", cbuf);
>-}
>-
> void
> do_delete(char *name)
> {
>@@ -1880,6 +1887,7 @@
> dologout(int status)
> {
>     transflag = 0;
>+    urgflag = 0;
>     if (logged_in) {
> 	seteuid((uid_t)0);
> 	ftpd_logwtmp(ttyline, "", "");
>@@ -1897,51 +1905,72 @@
> 
> void abor(void)
> {
>+    if (!transflag)
>+	return;
>+    reply(426, "Transfer aborted. Data connection closed.");
>+    reply(226, "Abort successful");
>+    transflag = 0;
> }
> 
> static void
> myoob(int signo)
> {
>-#if 0
>+    urgflag = 1;
>+}
>+
>+static char *
>+mec_space(char *p)
>+{
>+    while(isspace(*(unsigned char *)p))
>+	  p++;
>+    return p;
>+}
>+
>+static int
>+handleoobcmd(void)
>+{
> 	char *cp;
>-#endif
> 
> 	/* only process if transfer occurring */
> 	if (!transflag)
>-		return;
>+		return 0;
> 
>-	/* This is all XXX */
>-	oobflag = 1;
>-	/* if the command resulted in a new command, 
>-	   parse that as well */
>-	do{
>-	    yyparse();
>-	} while(ftp_command);
>-	oobflag = 0;
>+	urgflag = 0;
> 
>-#if 0 
> 	cp = tmpline;
>-	if (ftpd_getline(cp, 7) == NULL) {
>+	if (ftpd_getline(cp, sizeof(tmpline)) == NULL) {
> 		reply(221, "You could at least say goodbye.");
> 		dologout(0);
> 	}
>-	upper(cp);
>-	if (strcmp(cp, "ABOR\r\n") == 0) {
>-		tmpline[0] = '\0';
>-		reply(426, "Transfer aborted. Data connection closed.");
>-		reply(226, "Abort successful");
>-		longjmp(urgcatch, 1);
>+
>+	if (strncasecmp("MIC", cp, 3) == 0) {
>+	    mec(mec_space(cp + 3), prot_safe);
>+	} else if (strncasecmp("CONF", cp, 4) == 0) {
>+	    mec(mec_space(cp + 4), prot_confidential);
>+	} else if (strncasecmp("ENC", cp, 3) == 0) {
>+	    mec(mec_space(cp + 3), prot_private);
>+	} else if (!allow_insecure_oob) {
>+	    reply(533, "Command protection level denied "
>+		  "for paranoid reasons.");
>+	    goto out;
> 	}
>-	if (strcmp(cp, "STAT\r\n") == 0) {
>+
>+	if (secure_command())
>+	    cp = ftp_command;
>+
>+	if (strcasecmp(cp, "ABOR\r\n") == 0) {
>+		abor();
>+	} else if (strcasecmp(cp, "STAT\r\n") == 0) {
> 		if (file_size != (off_t) -1)
> 			reply(213, "Status: %ld of %ld bytes transferred",
> 			      (long)byte_count,
> 			      (long)file_size);
> 		else
>-			reply(213, "Status: %ld bytes transferred"
>+			reply(213, "Status: %ld bytes transferred",
> 			      (long)byte_count);
> 	}
>-#endif
>+out:
>+	return (transflag == 0);
> }
> 
> /*
>@@ -2184,139 +2213,136 @@
> void
> send_file_list(char *whichf)
> {
>-  struct stat st;
>-  DIR *dirp = NULL;
>-  struct dirent *dir;
>-  FILE *dout = NULL;
>-  char **dirlist, *dirname;
>-  int simple = 0;
>-  int freeglob = 0;
>-  glob_t gl;
>-  char buf[MaxPathLen];
>+    struct stat st;
>+    DIR *dirp = NULL;
>+    struct dirent *dir;
>+    FILE *dout = NULL;
>+    char **dirlist, *dirname;
>+    int simple = 0;
>+    int freeglob = 0;
>+    glob_t gl;
>+    char buf[MaxPathLen];
> 
>-  if (strpbrk(whichf, "~{[*?") != NULL) {
>-    int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE|
>+    if (strpbrk(whichf, "~{[*?") != NULL) {
>+	int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE|
> #ifdef GLOB_MAXPATH
>-	GLOB_MAXPATH
>+	    GLOB_MAXPATH
> #else
>-	GLOB_LIMIT
>+	    GLOB_LIMIT
> #endif
>-	;
>-
>-    memset(&gl, 0, sizeof(gl));
>-    freeglob = 1;
>-    if (glob(whichf, flags, 0, &gl)) {
>-      reply(550, "not found");
>-      goto out;
>-    } else if (gl.gl_pathc == 0) {
>-      errno = ENOENT;
>-      perror_reply(550, whichf);
>-      goto out;
>-    }
>-    dirlist = gl.gl_pathv;
>-  } else {
>-    onefile[0] = whichf;
>-    dirlist = onefile;
>-    simple = 1;
>-  }
>+	    ;
> 
>-  if (setjmp(urgcatch)) {
>-    transflag = 0;
>-    goto out;
>-  }
>-  while ((dirname = *dirlist++)) {
>-    if (stat(dirname, &st) < 0) {
>-      /*
>-       * If user typed "ls -l", etc, and the client
>-       * used NLST, do what the user meant.
>-       */
>-      if (dirname[0] == '-' && *dirlist == NULL &&
>-	  transflag == 0) {
>-	  list_file(dirname);
>-	  goto out;
>-      }
>-      perror_reply(550, whichf);
>-      if (dout != NULL) {
>-	fclose(dout);
>-	transflag = 0;
>-	data = -1;
>-	pdata = -1;
>-      }
>-      goto out;
>+	memset(&gl, 0, sizeof(gl));
>+	freeglob = 1;
>+	if (glob(whichf, flags, 0, &gl)) {
>+	    reply(550, "not found");
>+	    goto out;
>+	} else if (gl.gl_pathc == 0) {
>+	    errno = ENOENT;
>+	    perror_reply(550, whichf);
>+	    goto out;
>+	}
>+	dirlist = gl.gl_pathv;
>+    } else {
>+	onefile[0] = whichf;
>+	dirlist = onefile;
>+	simple = 1;
>     }
> 
>-    if (S_ISREG(st.st_mode)) {
>-      if (dout == NULL) {
>-	dout = dataconn("file list", (off_t)-1, "w");
>-	if (dout == NULL)
>-	  goto out;
>-	transflag++;
>-      }
>-      snprintf(buf, sizeof(buf), "%s%s\n", dirname,
>-	      type == TYPE_A ? "\r" : "");
>-      sec_write(fileno(dout), buf, strlen(buf));
>-      byte_count += strlen(dirname) + 1;
>-      continue;
>-    } else if (!S_ISDIR(st.st_mode))
>-      continue;
>-
>-    if ((dirp = opendir(dirname)) == NULL)
>-      continue;
>-
>-    while ((dir = readdir(dirp)) != NULL) {
>-      char nbuf[MaxPathLen];
>-
>-      if (!strcmp(dir->d_name, "."))
>-	continue;
>-      if (!strcmp(dir->d_name, ".."))
>-	continue;
>-
>-      snprintf(nbuf, sizeof(nbuf), "%s/%s", dirname, dir->d_name);
>-
>-      /*
>-       * We have to do a stat to insure it's
>-       * not a directory or special file.
>-       */
>-      if (simple || (stat(nbuf, &st) == 0 &&
>-		     S_ISREG(st.st_mode))) {
>-	if (dout == NULL) {
>-	  dout = dataconn("file list", (off_t)-1, "w");
>-	  if (dout == NULL)
>+    while ((dirname = *dirlist++)) {
>+
>+	if (urgflag && handleoobcmd())
>+	    goto out;
>+
>+	if (stat(dirname, &st) < 0) {
>+	    /*
>+	     * If user typed "ls -l", etc, and the client
>+	     * used NLST, do what the user meant.
>+	     */
>+	    if (dirname[0] == '-' && *dirlist == NULL &&
>+		transflag == 0) {
>+		list_file(dirname);
>+		goto out;
>+	    }
>+	    perror_reply(550, whichf);
> 	    goto out;
>-	  transflag++;
> 	}
>-	if(strncmp(nbuf, "./", 2) == 0)
>-	  snprintf(buf, sizeof(buf), "%s%s\n", nbuf +2,
>-		   type == TYPE_A ? "\r" : "");
>-	else
>-	  snprintf(buf, sizeof(buf), "%s%s\n", nbuf,
>-		   type == TYPE_A ? "\r" : "");
>-	sec_write(fileno(dout), buf, strlen(buf));
>-	byte_count += strlen(nbuf) + 1;
>-      }
>+
>+	if (S_ISREG(st.st_mode)) {
>+	    if (dout == NULL) {
>+		dout = dataconn("file list", (off_t)-1, "w");
>+		if (dout == NULL)
>+		    goto out;
>+		transflag = 1;
>+	    }
>+	    snprintf(buf, sizeof(buf), "%s%s\n", dirname,
>+		     type == TYPE_A ? "\r" : "");
>+	    sec_write(fileno(dout), buf, strlen(buf));
>+	    byte_count += strlen(dirname) + 1;
>+	    continue;
>+	} else if (!S_ISDIR(st.st_mode))
>+	    continue;
>+
>+	if ((dirp = opendir(dirname)) == NULL)
>+	    continue;
>+
>+	while ((dir = readdir(dirp)) != NULL) {
>+	    char nbuf[MaxPathLen];
>+
>+	    if (urgflag && handleoobcmd())
>+		goto out;
>+
>+	    if (!strcmp(dir->d_name, "."))
>+		continue;
>+	    if (!strcmp(dir->d_name, ".."))
>+		continue;
>+
>+	    snprintf(nbuf, sizeof(nbuf), "%s/%s", dirname, dir->d_name);
>+
>+	    /*
>+	     * We have to do a stat to insure it's
>+	     * not a directory or special file.
>+	     */
>+	    if (simple || (stat(nbuf, &st) == 0 &&
>+			   S_ISREG(st.st_mode))) {
>+		if (dout == NULL) {
>+		    dout = dataconn("file list", (off_t)-1, "w");
>+		    if (dout == NULL)
>+			goto out;
>+		    transflag = 1;
>+		}
>+		if(strncmp(nbuf, "./", 2) == 0)
>+		    snprintf(buf, sizeof(buf), "%s%s\n", nbuf +2,
>+			     type == TYPE_A ? "\r" : "");
>+		else
>+		    snprintf(buf, sizeof(buf), "%s%s\n", nbuf,
>+			     type == TYPE_A ? "\r" : "");
>+		sec_write(fileno(dout), buf, strlen(buf));
>+		byte_count += strlen(nbuf) + 1;
>+	    }
>+	}
>+	closedir(dirp);
>     }
>-    closedir(dirp);
>-  }
>-  if (dout == NULL)
>-    reply(550, "No files found.");
>-  else if (ferror(dout) != 0)
>-    perror_reply(550, "Data connection");
>-  else
>-    reply(226, "Transfer complete.");
>-
>-  transflag = 0;
>-  if (dout != NULL){
>-    sec_write(fileno(dout), buf, 0); /* XXX flush */
>-	    
>-    fclose(dout);
>-  }
>-  data = -1;
>-  pdata = -1;
>+    if (dout == NULL)
>+	reply(550, "No files found.");
>+    else if (ferror(dout) != 0)
>+	perror_reply(550, "Data connection");
>+    else
>+	reply(226, "Transfer complete.");
>+
> out:
>-  if (freeglob) {
>-    freeglob = 0;
>-    globfree(&gl);
>-  }
>+    transflag = 0;
>+    if (dout != NULL){
>+	sec_write(fileno(dout), buf, 0); /* XXX flush */
>+	    
>+	fclose(dout);
>+    }
>+    data = -1;
>+    pdata = -1;
>+    if (freeglob) {
>+	freeglob = 0;
>+	globfree(&gl);
>+    }
> }
> 
> 
>--- appl/ftp/ftpd/ftpd.cat8
>+++ appl/ftp/ftpd/ftpd.cat8
>@@ -6,8 +6,8 @@
> 
> SSYYNNOOPPSSIISS
>      ffttppdd [--aa _a_u_t_h_m_o_d_e] [--ddiillvvUU] [--gg _u_m_a_s_k] [--pp _p_o_r_t] [--TT _m_a_x_t_i_m_e_o_u_t] [--tt
>-     _t_i_m_e_o_u_t] [----ggssss--bbiinnddiinnggss] [--uu _d_e_f_a_u_l_t _u_m_a_s_k] [--BB | ----bbuuiillttiinn--llss]
>-     [----ggoooodd--cchhaarrss==_s_t_r_i_n_g]
>+     _t_i_m_e_o_u_t] [----ggssss--bbiinnddiinnggss] [--II | ----nnoo--iinnsseeccuurree--oooobb] [--uu _d_e_f_a_u_l_t _u_m_a_s_k] [--BB
>+     | ----bbuuiillttiinn--llss] [----ggoooodd--cchhaarrss==_s_t_r_i_n_g]
> 
> DDEESSCCRRIIPPTTIIOONN
>      FFttppdd is the Internet File Transfer Protocol server process.  The server
>@@ -82,6 +82,11 @@
>      ----ggoooodd--cchhaarrss==_s_t_r_i_n_g
>              allowed anonymous upload filename chars
> 
>+     --II ----nnoo--iinnsseeccuurree--oooobb
>+             don't allow insecure out of band.  Heimdal ftp client before 0.7
>+             doesn't support secure oob, so turning on this options makes them
>+             no longer work.
>+
>      The file _/_e_t_c_/_n_o_l_o_g_i_n can be used to disable ftp access.  If the file ex-
>      ists, ffttppdd displays it and exits.  If the file _/_e_t_c_/_f_t_p_w_e_l_c_o_m_e exists,
>      ffttppdd prints it before issuing the ``ready'' message.  If the file
>--- appl/ftp/ftpd/ftpd_locl.h
>+++ appl/ftp/ftpd/ftpd_locl.h
>@@ -111,7 +111,6 @@
> #ifdef HAVE_PWD_H
> #include <pwd.h>
> #endif
>-#include <setjmp.h>
> #include <signal.h>
> #include <stdio.h>
> #include <stdlib.h>

Actions: View | Diff

Attachments on bug 60230: 23446 | 23541 | 23542