- (tim) [includes.h openbsd-compat/getopt.c openbsd-compat/getopt.h]
rename getopt() to BSDgetopt() to keep form conflicting with
system getopt().
[Makefile.in configure.in] disable filepriv until I can add
missing procpriv calls.
diff --git a/ChangeLog b/ChangeLog
index aece277..3b1f644 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
20010917
- (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds
+ - (tim) [includes.h openbsd-compat/getopt.c openbsd-compat/getopt.h]
+ rename getopt() to BSDgetopt() to keep form conflicting with
+ system getopt().
+ [Makefile.in configure.in] disable filepriv until I can add
+ missing procpriv calls.
20010916
- (djm) Workaround XFree breakage in RPM spec file
@@ -6452,4 +6457,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1523 2001/09/17 05:07:23 djm Exp $
+$Id: ChangeLog,v 1.1524 2001/09/17 21:34:33 tim Exp $
diff --git a/Makefile.in b/Makefile.in
index 223a366..1bdc865 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.184 2001/08/06 22:56:46 mouring Exp $
+# $Id: Makefile.in,v 1.185 2001/09/17 21:34:33 tim Exp $
prefix=@prefix@
exec_prefix=@exec_prefix@
@@ -202,7 +202,7 @@
ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
- @FILEPRIV@ -f dev,filesys,driver $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/slogin
+ #@FILEPRIV@ -f dev,filesys,driver $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/slogin
if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
fi
diff --git a/configure.in b/configure.in
index fc0d479..30415d9 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.308 2001/09/15 11:31:54 djm Exp $
+# $Id: configure.in,v 1.309 2001/09/17 21:34:34 tim Exp $
AC_INIT(ssh.c)
@@ -198,13 +198,13 @@
*-*-sysv4.2*)
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
- enable_suid_ssh=no
+# enable_suid_ssh=no
AC_DEFINE(USE_PIPES)
;;
*-*-sysv5*)
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
- enable_suid_ssh=no
+# enable_suid_ssh=no
AC_DEFINE(USE_PIPES)
;;
*-*-sysv*)
diff --git a/includes.h b/includes.h
index 554e947..c73780d 100644
--- a/includes.h
+++ b/includes.h
@@ -51,6 +51,9 @@
#ifdef HAVE_GETOPT_H
# include <getopt.h>
#endif
+#ifndef HAVE_GETOPT_OPTRESET
+#define getopt(ac, av, o) BSDgetopt(ac, av, o)
+#endif
#ifdef HAVE_BSTRING_H
# include <bstring.h>
#endif
diff --git a/openbsd-compat/getopt.c b/openbsd-compat/getopt.c
index 071e278..9e13504 100644
--- a/openbsd-compat/getopt.c
+++ b/openbsd-compat/getopt.c
@@ -57,7 +57,7 @@
* Parse argc/argv argument vector.
*/
int
-getopt(nargc, nargv, ostr)
+BSDgetopt(nargc, nargv, ostr)
int nargc;
char * const *nargv;
const char *ostr;
diff --git a/openbsd-compat/getopt.h b/openbsd-compat/getopt.h
index d981fe4..08a4eb3 100644
--- a/openbsd-compat/getopt.h
+++ b/openbsd-compat/getopt.h
@@ -1,4 +1,4 @@
-/* $Id: getopt.h,v 1.2 2001/07/14 16:05:55 stevesk Exp $ */
+/* $Id: getopt.h,v 1.3 2001/09/17 21:34:34 tim Exp $ */
#ifndef _GETOPT_H
#define _GETOPT_H
@@ -7,7 +7,7 @@
#ifndef HAVE_GETOPT_H
-int getopt(int argc, char * const *argv, const char *opts);
+int BSDgetopt(int argc, char * const *argv, const char *opts);
#endif