[1976] in Kerberos-V5-bugs
Re: beta6 strstr() portability fix
daemon@ATHENA.MIT.EDU (epeisach@MIT.EDU)
Sun Jun 9 22:12:50 1996
From: epeisach@MIT.EDU
Date: Sun, 9 Jun 1996 22:12:37 -0400
To: Dave McGuire <mcguire@rocinante.digex.net>
Cc: krb5-bugs@MIT.EDU
Thank you for your report. You are correct that a change to configure
would be the easiest and most portable fix which I am including below.
ezra
Index: ChangeLog
===================================================================
RCS file: /mit/krb5/.cvsroot/src/admin/edit/ChangeLog,v
retrieving revision 5.71
diff -c -r5.71 ChangeLog
*** ChangeLog 1996/06/08 14:42:25 5.71
--- ChangeLog 1996/06/10 02:08:04
***************
*** 1,3 ****
--- 1,11 ----
+ Sun Jun 9 22:04:50 1996 Ezra Peisach <epeisach@kangaroo.mit.edu>
+
+ * util.c (strstr): Replace crusty OS specific ifdef with configure
+ generated one.
+
+ * configure.in: Change AC_HAVE_FUNCS to AC_CHECK_FUNCS (newer
+ naming convention). Check for strstr.
+
Sat Jun 8 09:54:38 1996 Ezra Peisach <epeisach@kangaroo.mit.edu>
* configure.in: Remove kdb4 library usage.
Index: configure.in
===================================================================
RCS file: /mit/krb5/.cvsroot/src/admin/edit/configure.in,v
retrieving revision 1.26
diff -c -r1.26 configure.in
*** configure.in 1996/06/08 14:42:28 1.26
--- configure.in 1996/06/10 02:11:05
***************
*** 4,10 ****
AC_PROG_YACC
AC_CONST
AC_HEADER_STDC
! AC_HAVE_FUNCS(getcwd)
SS_RULES
USE_KADM_LIBRARY
USE_KDB5_LIBRARY
--- 4,10 ----
AC_PROG_YACC
AC_CONST
AC_HEADER_STDC
! AC_CHECK_FUNCS(getcwd strstr)
SS_RULES
USE_KADM_LIBRARY
USE_KDB5_LIBRARY
Index: util.c
===================================================================
RCS file: /mit/krb5/.cvsroot/src/admin/edit/util.c,v
retrieving revision 5.4
diff -c -r5.4 util.c
*** util.c 1995/07/27 08:40:53 5.4
--- util.c 1996/06/10 02:07:10
***************
*** 33,39 ****
#include "k5-int.h"
#include "./kdb5_edit.h"
! #if defined(sysvimp) || ( defined(mips) && defined(SYSTYPE_BSD43)) || (defined(vax) && !defined(ultrix))
char *
strstr(s1, s2)
char *s1;
--- 33,39 ----
#include "k5-int.h"
#include "./kdb5_edit.h"
! #if !defined(HAVE_STRSTR)
char *
strstr(s1, s2)
char *s1;
