Undo MACINTOSH changes to path in these files - theye were correct. The

Makefile.in alread specifies the right locations to include so that
,krb5/...> is not required for unix

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6769 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index d541e3f2767b1bc632bcd787a7d2569f6b3b1d60..35a20d2106c93580382ee7a2fe8a7f14b89a476f 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 12 13:05:51 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+       * k5seal.c, k5unseal.c, accept_sec_context.c: Undo MACINTOSH
+               change for paths. The old ones were correct.
+
 Wed Sep  6 12:00:00 1995  James Mattly  <mattly@fusion.com>
 
        * gssapi_krb5.h:  changed a path bearing include for MACINTOSH

diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index b4287b20f5db3757f2d589ff243143cdeab23529..55b0eb6b7b3887b7d542520162a81b5aa44dcfab 100644 (file)
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -21,11 +21,7 @@
  */
 
 #include "gssapiP_krb5.h"
-#ifndef _MACINTOSH
-#include <krb5/rsa-md5.h>
-#else
 #include "rsa-md5.h"
-#endif
 #include <memory.h>
 
 OM_uint32

diff --git a/src/lib/gssapi/krb5/k5seal.c b/src/lib/gssapi/krb5/k5seal.c
index cbf4ae70070022f547964e7daa629c14e007580a..38770173e261e28b2c962f43717f143663e8b3e5 100644 (file)
--- a/src/lib/gssapi/krb5/k5seal.c
+++ b/src/lib/gssapi/krb5/k5seal.c
@@ -21,11 +21,7 @@
  */
 
 #include "gssapiP_krb5.h"
-#ifndef _MACINTOSH
-#include <krb5/rsa-md5.h>
-#else
 #include "rsa-md5.h"
-#endif
 
 static krb5_error_code
 make_seal_token(context, enc_ed, seq_ed, seqnum, direction, text, token,

diff --git a/src/lib/gssapi/krb5/k5unseal.c b/src/lib/gssapi/krb5/k5unseal.c
index 350bcb8afdf065d731b39e395689a6eb72be342f..a50c4cb21ef10fdaf141ae71da51bdd164857f14 100644 (file)
--- a/src/lib/gssapi/krb5/k5unseal.c
+++ b/src/lib/gssapi/krb5/k5unseal.c
@@ -22,11 +22,7 @@
 
 #include "gssapiP_krb5.h"
 #include <memory.h>
-#ifndef _MACINTOSH
-#include <krb5/rsa-md5.h>
-#else
 #include "rsa-md5.h"
-#endif
 
 /* message_buffer is an input if SIGN, output if SEAL, and ignored if DEL_CTX
    conf_state is only valid if SEAL.