diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | Makefile.in | 4 | ||||
-rw-r--r-- | configure.in | 6 | ||||
-rw-r--r-- | includes.h | 3 | ||||
-rw-r--r-- | openbsd-compat/getopt.c | 2 | ||||
-rw-r--r-- | openbsd-compat/getopt.h | 4 |
6 files changed, 17 insertions, 9 deletions
@@ -1,5 +1,10 @@ | |||
1 | 20010917 | 1 | 20010917 |
2 | - (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds | 2 | - (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds |
3 | - (tim) [includes.h openbsd-compat/getopt.c openbsd-compat/getopt.h] | ||
4 | rename getopt() to BSDgetopt() to keep form conflicting with | ||
5 | system getopt(). | ||
6 | [Makefile.in configure.in] disable filepriv until I can add | ||
7 | missing procpriv calls. | ||
3 | 8 | ||
4 | 20010916 | 9 | 20010916 |
5 | - (djm) Workaround XFree breakage in RPM spec file | 10 | - (djm) Workaround XFree breakage in RPM spec file |
@@ -6452,4 +6457,4 @@ | |||
6452 | - Wrote replacements for strlcpy and mkdtemp | 6457 | - Wrote replacements for strlcpy and mkdtemp |
6453 | - Released 1.0pre1 | 6458 | - Released 1.0pre1 |
6454 | 6459 | ||
6455 | $Id: ChangeLog,v 1.1523 2001/09/17 05:07:23 djm Exp $ | 6460 | $Id: ChangeLog,v 1.1524 2001/09/17 21:34:33 tim Exp $ |
diff --git a/Makefile.in b/Makefile.in index 223a36608..1bdc865b7 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.184 2001/08/06 22:56:46 mouring Exp $ | 1 | # $Id: Makefile.in,v 1.185 2001/09/17 21:34:33 tim Exp $ |
2 | 2 | ||
3 | prefix=@prefix@ | 3 | prefix=@prefix@ |
4 | exec_prefix=@exec_prefix@ | 4 | exec_prefix=@exec_prefix@ |
@@ -202,7 +202,7 @@ install-files: | |||
202 | ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin | 202 | ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin |
203 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 203 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
204 | ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 204 | ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
205 | @FILEPRIV@ -f dev,filesys,driver $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/slogin | 205 | #@FILEPRIV@ -f dev,filesys,driver $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/slogin |
206 | if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ | 206 | if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ |
207 | $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ | 207 | $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ |
208 | fi | 208 | fi |
diff --git a/configure.in b/configure.in index fc0d4797e..30415d94a 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.in,v 1.308 2001/09/15 11:31:54 djm Exp $ | 1 | # $Id: configure.in,v 1.309 2001/09/17 21:34:34 tim Exp $ |
2 | 2 | ||
3 | AC_INIT(ssh.c) | 3 | AC_INIT(ssh.c) |
4 | 4 | ||
@@ -198,13 +198,13 @@ mips-sony-bsd|mips-sony-newsos4) | |||
198 | *-*-sysv4.2*) | 198 | *-*-sysv4.2*) |
199 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | 199 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
200 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | 200 | LDFLAGS="$LDFLAGS -L/usr/local/lib" |
201 | enable_suid_ssh=no | 201 | # enable_suid_ssh=no |
202 | AC_DEFINE(USE_PIPES) | 202 | AC_DEFINE(USE_PIPES) |
203 | ;; | 203 | ;; |
204 | *-*-sysv5*) | 204 | *-*-sysv5*) |
205 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | 205 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
206 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | 206 | LDFLAGS="$LDFLAGS -L/usr/local/lib" |
207 | enable_suid_ssh=no | 207 | # enable_suid_ssh=no |
208 | AC_DEFINE(USE_PIPES) | 208 | AC_DEFINE(USE_PIPES) |
209 | ;; | 209 | ;; |
210 | *-*-sysv*) | 210 | *-*-sysv*) |
diff --git a/includes.h b/includes.h index 554e9476e..c73780d26 100644 --- a/includes.h +++ b/includes.h | |||
@@ -51,6 +51,9 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
51 | #ifdef HAVE_GETOPT_H | 51 | #ifdef HAVE_GETOPT_H |
52 | # include <getopt.h> | 52 | # include <getopt.h> |
53 | #endif | 53 | #endif |
54 | #ifndef HAVE_GETOPT_OPTRESET | ||
55 | #define getopt(ac, av, o) BSDgetopt(ac, av, o) | ||
56 | #endif | ||
54 | #ifdef HAVE_BSTRING_H | 57 | #ifdef HAVE_BSTRING_H |
55 | # include <bstring.h> | 58 | # include <bstring.h> |
56 | #endif | 59 | #endif |
diff --git a/openbsd-compat/getopt.c b/openbsd-compat/getopt.c index 071e27885..9e13504a0 100644 --- a/openbsd-compat/getopt.c +++ b/openbsd-compat/getopt.c | |||
@@ -57,7 +57,7 @@ char *optarg; /* argument associated with option */ | |||
57 | * Parse argc/argv argument vector. | 57 | * Parse argc/argv argument vector. |
58 | */ | 58 | */ |
59 | int | 59 | int |
60 | getopt(nargc, nargv, ostr) | 60 | BSDgetopt(nargc, nargv, ostr) |
61 | int nargc; | 61 | int nargc; |
62 | char * const *nargv; | 62 | char * const *nargv; |
63 | const char *ostr; | 63 | const char *ostr; |
diff --git a/openbsd-compat/getopt.h b/openbsd-compat/getopt.h index d981fe434..08a4eb3e0 100644 --- a/openbsd-compat/getopt.h +++ b/openbsd-compat/getopt.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: getopt.h,v 1.2 2001/07/14 16:05:55 stevesk Exp $ */ | 1 | /* $Id: getopt.h,v 1.3 2001/09/17 21:34:34 tim Exp $ */ |
2 | 2 | ||
3 | #ifndef _GETOPT_H | 3 | #ifndef _GETOPT_H |
4 | #define _GETOPT_H | 4 | #define _GETOPT_H |
@@ -7,7 +7,7 @@ | |||
7 | 7 | ||
8 | #ifndef HAVE_GETOPT_H | 8 | #ifndef HAVE_GETOPT_H |
9 | 9 | ||
10 | int getopt(int argc, char * const *argv, const char *opts); | 10 | int BSDgetopt(int argc, char * const *argv, const char *opts); |
11 | 11 | ||
12 | #endif | 12 | #endif |
13 | 13 | ||