diff options
author | Ken Raeburn <raeburn@mit.edu> | 1999-09-21 22:56:49 +0000 |
---|---|---|
committer | Ken Raeburn <raeburn@mit.edu> | 1999-09-21 22:56:49 +0000 |
commit | 0265426b5d113a7d7927a7ed82cfcdb9125b34c6 (patch) | |
tree | 3ffe29d2d682297a339defd2a3f8a971651411b4 /src | |
parent | dee22503c823cf8b2768856ab8d622603b16925e (diff) | |
download | krb5-0265426b5d113a7d7927a7ed82cfcdb9125b34c6.tar.gz krb5-0265426b5d113a7d7927a7ed82cfcdb9125b34c6.tar.xz krb5-0265426b5d113a7d7927a7ed82cfcdb9125b34c6.zip |
Don't fclose(NULL). Don't declare string functions that are macros
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11836 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r-- | src/appl/gssftp/ftp/ChangeLog | 5 | ||||
-rw-r--r-- | src/appl/gssftp/ftp/ftp.c | 7 | ||||
-rw-r--r-- | src/appl/gssftp/ftpd/ChangeLog | 7 | ||||
-rw-r--r-- | src/appl/gssftp/ftpd/ftpd.c | 6 |
4 files changed, 23 insertions, 2 deletions
diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog index 893c318d57..64a6890d58 100644 --- a/src/appl/gssftp/ftp/ChangeLog +++ b/src/appl/gssftp/ftp/ChangeLog @@ -1,3 +1,8 @@ +1999-09-21 Ken Raeburn <raeburn@mit.edu> + + * ftp.c (getreply): Don't declare strpbrk or strstr functions if + they're defined as macros. + 1999-08-27 Tom Yu <tlyu@mit.edu> * ftp.c: Diable krb5-mech2 for now. diff --git a/src/appl/gssftp/ftp/ftp.c b/src/appl/gssftp/ftp/ftp.c index bccd2facc2..24049eabe6 100644 --- a/src/appl/gssftp/ftp/ftp.c +++ b/src/appl/gssftp/ftp/ftp.c @@ -541,7 +541,12 @@ getreply(expecteof) sigtype cmdabort(); char ibuf[FTP_BUFSIZ], obuf[FTP_BUFSIZ]; int safe = 0; - extern char *strpbrk(), *strstr(); +#ifndef strpbrk + extern char *strpbrk(); +#endif +#ifndef strstr + extern char *strstr(); +#endif ibuf[0] = '\0'; if (reply_parse) reply_ptr = reply_buf; diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog index c84e770288..3d5aa408ed 100644 --- a/src/appl/gssftp/ftpd/ChangeLog +++ b/src/appl/gssftp/ftpd/ChangeLog @@ -1,3 +1,10 @@ +1999-09-21 Ken Raeburn <raeburn@mit.edu> + + * ftpd.c (checkuser): Only call fclose on file handle if it's not + NULL. + (send_file_list): Don't declare strpbrk function if it's defined + as a macro. + Thu Mar 25 23:13:56 1999 Tom Yu <tlyu@mit.edu> * ftpd.c (login): Check that the luid is not the uid we want to diff --git a/src/appl/gssftp/ftpd/ftpd.c b/src/appl/gssftp/ftpd/ftpd.c index d4987affcf..52be05fb6b 100644 --- a/src/appl/gssftp/ftpd/ftpd.c +++ b/src/appl/gssftp/ftpd/ftpd.c @@ -840,8 +840,8 @@ checkuser(name) } } } + (void) fclose(fd); } - (void) fclose(fd); return (0); } @@ -2018,7 +2018,9 @@ void myoob() { char *cp, *cs; +#ifndef strpbrk extern char *strpbrk(); +#endif /* only process if transfer occurring */ if (!transflag) @@ -2486,7 +2488,9 @@ send_file_list(whichfiles) FILE *dout = NULL; register char **dirlist, *dirname; int simple = 0; +#ifndef strpbrk char *strpbrk(); +#endif int ret = 0; if (strpbrk(whichfiles, "~{[*?") != NULL) { |