diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | openbsd-compat/dirname.h | 10 | ||||
-rw-r--r-- | sshconnect1.c | 5 |
3 files changed, 16 insertions, 6 deletions
@@ -136,6 +136,11 @@ | |||
136 | - (stevesk) more sync for session.c | 136 | - (stevesk) more sync for session.c |
137 | - (stevesk) sync servconf.h (comments) | 137 | - (stevesk) sync servconf.h (comments) |
138 | - (tim) [contrib/caldera/openssh.spec] sync with Caldera | 138 | - (tim) [contrib/caldera/openssh.spec] sync with Caldera |
139 | - (tim) [openbsd-compat/dirname.h] Remove ^M causing some compilers to | ||
140 | issue warning (line 1: tokens ignored at end of directive line) | ||
141 | - (tim) [sshconnect1.c] give the compiler something to do for success: | ||
142 | if KRB5 and AFS are not defined | ||
143 | (ERROR: "sshconnect1.c", line 1274: Syntax error before or at: }) | ||
139 | 144 | ||
140 | 20010629 | 145 | 20010629 |
141 | - (bal) Removed net_aton() since we don't use it any more | 146 | - (bal) Removed net_aton() since we don't use it any more |
@@ -5963,4 +5968,4 @@ | |||
5963 | - Wrote replacements for strlcpy and mkdtemp | 5968 | - Wrote replacements for strlcpy and mkdtemp |
5964 | - Released 1.0pre1 | 5969 | - Released 1.0pre1 |
5965 | 5970 | ||
5966 | $Id: ChangeLog,v 1.1382 2001/07/05 00:45:28 tim Exp $ | 5971 | $Id: ChangeLog,v 1.1383 2001/07/05 04:27:20 tim Exp $ |
diff --git a/openbsd-compat/dirname.h b/openbsd-compat/dirname.h index c51cff74c..1d61dd06c 100644 --- a/openbsd-compat/dirname.h +++ b/openbsd-compat/dirname.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef HAVE_DIRNAME | 1 | #ifndef HAVE_DIRNAME |
2 | 2 | ||
3 | char *dirname(const char *path); | 3 | char *dirname(const char *path); |
4 | 4 | ||
5 | #endif | 5 | #endif |
diff --git a/sshconnect1.c b/sshconnect1.c index 166fdc17f..526d149f4 100644 --- a/sshconnect1.c +++ b/sshconnect1.c | |||
@@ -1271,4 +1271,9 @@ ssh_userauth1(const char *local_user, const char *server_user, char *host, | |||
1271 | send_afs_tokens(); | 1271 | send_afs_tokens(); |
1272 | } | 1272 | } |
1273 | #endif /* AFS */ | 1273 | #endif /* AFS */ |
1274 | |||
1275 | /* give the compiler something to do for success: */ | ||
1276 | #if !defined(KRB5) && !defined(AFS) | ||
1277 | ; | ||
1278 | #endif | ||
1274 | } | 1279 | } |