summaryrefslogtreecommitdiffstats
path: root/src/lib/krb5
diff options
context:
space:
mode:
authorKeith Vetter <keithv@fusion.com>1995-07-06 01:39:47 +0000
committerKeith Vetter <keithv@fusion.com>1995-07-06 01:39:47 +0000
commitad04b0224f8ba5209ca25ad3d94a24d0cf3dae06 (patch)
tree6ac5e2e057c1c05f099d6c4eedefc732a6aaa95b /src/lib/krb5
parentc2e72b506ff5ea2b92f026be2bfaff1851c87432 (diff)
downloadkrb5-ad04b0224f8ba5209ca25ad3d94a24d0cf3dae06.tar.gz
krb5-ad04b0224f8ba5209ca25ad3d94a24d0cf3dae06.tar.xz
krb5-ad04b0224f8ba5209ca25ad3d94a24d0cf3dae06.zip
Changes for Macintosh implementation
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6229 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5')
-rw-r--r--src/lib/krb5/ccache/file/ChangeLog6
-rw-r--r--src/lib/krb5/ccache/file/fcc_destry.c2
-rw-r--r--src/lib/krb5/ccache/file/fcc_gennew.c4
-rw-r--r--src/lib/krb5/ccache/file/fcc_maybe.c2
-rw-r--r--src/lib/krb5/krb/ChangeLog3
-rw-r--r--src/lib/krb5/krb/compat_recv.c2
-rw-r--r--src/lib/krb5/os/ChangeLog9
-rw-r--r--src/lib/krb5/os/genaddrs.c2
-rw-r--r--src/lib/krb5/os/krbfileio.c2
-rw-r--r--src/lib/krb5/os/kuserok.c2
-rw-r--r--src/lib/krb5/os/macsock.c6
-rw-r--r--src/lib/krb5/os/mk_faddr.c3
-rw-r--r--src/lib/krb5/os/read_pwd.c2
-rw-r--r--src/lib/krb5/posix/ChangeLog3
-rw-r--r--src/lib/krb5/posix/syslog.c2
-rw-r--r--src/lib/krb5/posix/vfprintf.c1
-rw-r--r--src/lib/krb5/rcache/ChangeLog3
-rw-r--r--src/lib/krb5/rcache/rc_io.c10
18 files changed, 47 insertions, 17 deletions
diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog
index c4c56e7042..90fa86e0e7 100644
--- a/src/lib/krb5/ccache/file/ChangeLog
+++ b/src/lib/krb5/ccache/file/ChangeLog
@@ -1,3 +1,9 @@
+Wed July 5 15:52:31 1995 James Mattly <mattly@fusion.com>
+ * fcc_destroy.c changed open to THREEPARAMOPEN for macintosh
+ opens
+ * fcc_gennew.c conditons for HAS_MACSOCK_H and THREEPARAMOPEN
+ * fcc_maybe.c conditons for HAS_MACSOCK_H
+
Wed Jun 14 23:54:09 1995 Theodore Y. Ts'o (tytso@dcl)
* fcc_errs.c (krb5_fcc_interpret): Add #ifdef around switch
diff --git a/src/lib/krb5/ccache/file/fcc_destry.c b/src/lib/krb5/ccache/file/fcc_destry.c
index 290f93aba6..f160c6811a 100644
--- a/src/lib/krb5/ccache/file/fcc_destry.c
+++ b/src/lib/krb5/ccache/file/fcc_destry.c
@@ -48,7 +48,7 @@ krb5_fcc_destroy(context, id)
if (OPENCLOSE(id)) {
- ret = open(((krb5_fcc_data *) id->data)->filename, O_RDWR | O_BINARY, 0);
+ ret = THREEPARAMOPEN(((krb5_fcc_data *) id->data)->filename, O_RDWR | O_BINARY, 0);
if (ret < 0) {
kret = krb5_fcc_interpret(context, errno);
goto cleanup;
diff --git a/src/lib/krb5/ccache/file/fcc_gennew.c b/src/lib/krb5/ccache/file/fcc_gennew.c
index f3d0cf3c89..13757e9d51 100644
--- a/src/lib/krb5/ccache/file/fcc_gennew.c
+++ b/src/lib/krb5/ccache/file/fcc_gennew.c
@@ -30,7 +30,7 @@
#include "k5-int.h"
#ifdef KRB5_USE_INET
-#ifndef _WINSOCKAPI_
+#if !defined(_WINSOCKAPI_) && !defined(HAVE_MACSOCK_H)
#include <netinet/in.h>
#endif
#else
@@ -100,7 +100,7 @@ krb5_fcc_generate_new (context, id)
strcpy(((krb5_fcc_data *) lid->data)->filename, scratch);
/* Make sure the file name is reserved */
- ret = open(((krb5_fcc_data *) lid->data)->filename,
+ ret = THREEPARAMOPEN(((krb5_fcc_data *) lid->data)->filename,
O_CREAT | O_EXCL | O_WRONLY | O_BINARY, 0);
if (ret == -1) {
retcode = krb5_fcc_interpret(context, errno);
diff --git a/src/lib/krb5/ccache/file/fcc_maybe.c b/src/lib/krb5/ccache/file/fcc_maybe.c
index 33e68a6208..232bb22754 100644
--- a/src/lib/krb5/ccache/file/fcc_maybe.c
+++ b/src/lib/krb5/ccache/file/fcc_maybe.c
@@ -37,7 +37,7 @@
int krb5_fcc_default_format = KRB5_FCC_DEFAULT_FVNO;
#ifdef KRB5_USE_INET
-#ifndef _WINSOCKAPI_
+#if !defined(_WINSOCKAPI_) && !defined(HAVE_MACSOCK_H)
#include <netinet/in.h>
#endif
#else
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index be02d6e7f2..7015036ce6 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,6 @@
+Wed July 5 15:52:31 1995 James Mattly <mattly@fusion.com>
+ * added condition for _MACINTOSH
+
Sun Jul 2 18:59:53 1995 Sam Hartman <hartmans@tertius.mit.edu>
* recvauth.c (krb5_recvauth): recvauth should send an error reply
diff --git a/src/lib/krb5/krb/compat_recv.c b/src/lib/krb5/krb/compat_recv.c
index b5c96d4848..46a4172a08 100644
--- a/src/lib/krb5/krb/compat_recv.c
+++ b/src/lib/krb5/krb/compat_recv.c
@@ -35,7 +35,7 @@
#define NEED_SOCKETS
#include "k5-int.h"
-#ifndef _MSDOS
+#if !defined(_MSDOS) && !defined(_MACINTOSH)
#include <kerberosIV/krb.h>
#include <kerberosIV/krb4-proto.h>
#include "com_err.h"
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 2307a994f2..2a0615a0a1 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,12 @@
+Wed July 5 15:52:31 1995 James Mattly <mattly@fusion.com>
+ * an_to_ln.c added _MACINTOSH conditions
+ * genaddrs.c added HAS_MACSOCK_H conditions
+ * krbfileio.c added THREEPARAMOPEN
+ * kuserok.c added THREEPARAMOPEN
+ * macsock.c added stub for gethostnameA
+ * mk_faddr.c added HAS_MACSOCK_H conditions
+ * read_pwd.c added _MACINTOSH condition
+ * sys_log.c added _MACINTOSH condition
Fri Jun 30 14:44:17 EDT 1995 Paul Park (pjpark@mit.edu)
* an_to_ln.c - Add profile logic to aname_to_lname. We can now
diff --git a/src/lib/krb5/os/genaddrs.c b/src/lib/krb5/os/genaddrs.c
index ab0da53c48..c5a42fd963 100644
--- a/src/lib/krb5/os/genaddrs.c
+++ b/src/lib/krb5/os/genaddrs.c
@@ -28,7 +28,7 @@
#include "k5-int.h"
#include "os-proto.h"
-#ifndef _WINSOCKAPI_
+#if !defined(_WINSOCKAPI_) && !defined(HAVE_MACSOCK_H)
#include <netinet/in.h>
#endif
diff --git a/src/lib/krb5/os/krbfileio.c b/src/lib/krb5/os/krbfileio.c
index 5cc9538013..8f94faa78f 100644
--- a/src/lib/krb5/os/krbfileio.c
+++ b/src/lib/krb5/os/krbfileio.c
@@ -61,7 +61,7 @@ krb5_create_secure_file(context, pathname)
/*
* Create the file with access restricted to the owner
*/
- fd = open(pathname, O_RDWR | O_CREAT | O_EXCL | O_BINARY, 0600);
+ fd = THREEPARAMOPEN(pathname, O_RDWR | O_CREAT | O_EXCL | O_BINARY, 0600);
#ifdef OPEN_MODE_NOT_TRUSTWORTHY
/*
diff --git a/src/lib/krb5/os/kuserok.c b/src/lib/krb5/os/kuserok.c
index 29573df15c..3fd26ef7ad 100644
--- a/src/lib/krb5/os/kuserok.c
+++ b/src/lib/krb5/os/kuserok.c
@@ -25,7 +25,7 @@
*/
#include "k5-int.h"
-#ifndef _MSDOS /* Not yet for Windows */
+#if !defined(_MSDOS) && !defined(_MACINTOSH) /* Not yet for Windows */
#include <stdio.h>
#include <pwd.h>
diff --git a/src/lib/krb5/os/macsock.c b/src/lib/krb5/os/macsock.c
index a6acde113b..ef25cd1ab2 100644
--- a/src/lib/krb5/os/macsock.c
+++ b/src/lib/krb5/os/macsock.c
@@ -532,6 +532,12 @@ getmyipaddr ()
}
+int
+gethostname(char *name, int namelen)
+{
+ return -1;
+}
+
#if 0
/* FIXME: THIS WAS A STAB AT GETHOSTNAME, which I abandoned for lack of need,
and since the required header files didn't seem to be handy.
diff --git a/src/lib/krb5/os/mk_faddr.c b/src/lib/krb5/os/mk_faddr.c
index 86cf561326..7426795ca7 100644
--- a/src/lib/krb5/os/mk_faddr.c
+++ b/src/lib/krb5/os/mk_faddr.c
@@ -30,7 +30,8 @@
#ifdef KRB5_USE_INET
#include "os-proto.h"
-#ifndef _WINSOCKAPI_
+#if !defined(_WINSOCKAPI_) && !defined(HAVE_MACSOCK_H)
+
#include <netinet/in.h>
#endif
diff --git a/src/lib/krb5/os/read_pwd.c b/src/lib/krb5/os/read_pwd.c
index 244925ba83..5aa9055f1b 100644
--- a/src/lib/krb5/os/read_pwd.c
+++ b/src/lib/krb5/os/read_pwd.c
@@ -25,7 +25,7 @@
*/
#include "k5-int.h"
-#ifndef _MSDOS
+#if !defined(_MSDOS) && !defined(_MACINTOSH)
#include <stdio.h>
#include <errno.h>
#include <signal.h>
diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog
index 3f4531b9fa..caa91ce498 100644
--- a/src/lib/krb5/posix/ChangeLog
+++ b/src/lib/krb5/posix/ChangeLog
@@ -1,3 +1,6 @@
+Wed July 5 15:52:31 1995 James Mattly <mattly@fusion.com>
+ * vfprintf.c included <stdio.h>
+
Fri Jun 9 19:34:34 1995 <tytso@rsx-11.mit.edu>
* configure.in: Remove standardized set of autoconf macros, which
diff --git a/src/lib/krb5/posix/syslog.c b/src/lib/krb5/posix/syslog.c
index c605e88bc0..1e4da05b50 100644
--- a/src/lib/krb5/posix/syslog.c
+++ b/src/lib/krb5/posix/syslog.c
@@ -33,7 +33,7 @@
* Modified to use UNIX domain IPC by Ralph Campbell
*/
-#ifndef _WINDOWS
+#if !defined(_WINDOWS) && !defined(_MACINTOSH)
#if defined(__STDC__) || defined(_WINDOWS)
#include <stdarg.h>
diff --git a/src/lib/krb5/posix/vfprintf.c b/src/lib/krb5/posix/vfprintf.c
index 9cdac95a7e..dc76b2b04a 100644
--- a/src/lib/krb5/posix/vfprintf.c
+++ b/src/lib/krb5/posix/vfprintf.c
@@ -17,7 +17,6 @@
/* based on @(#)vfprintf.c 5.2 (Berkeley) 6/27/88 */
-#include <stdio.h>
#include <varargs.h>
int
diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog
index 744bfbdd5d..e9aae54e42 100644
--- a/src/lib/krb5/rcache/ChangeLog
+++ b/src/lib/krb5/rcache/ChangeLog
@@ -1,3 +1,6 @@
+Wed July 5 15:52:31 1995 James Mattly <mattly@fusion.com>
+ * rc_io.c added HAVE_MACSOCK_H, change open to THREEPARAMOPEN
+
Fri Jun 9 19:34:38 1995 <tytso@rsx-11.mit.edu>
* configure.in: Remove standardized set of autoconf macros, which
diff --git a/src/lib/krb5/rcache/rc_io.c b/src/lib/krb5/rcache/rc_io.c
index 92540caaf4..d321eceeaa 100644
--- a/src/lib/krb5/rcache/rc_io.c
+++ b/src/lib/krb5/rcache/rc_io.c
@@ -27,7 +27,7 @@
#endif
#ifdef KRB5_USE_INET
-#ifndef _WINSOCKAPI_
+#if !defined(_WINSOCKAPI_) && !defined(HAVE_MACSOCK_H)
#include <netinet/in.h>
#endif
#else
@@ -82,7 +82,7 @@ krb5_error_code krb5_rc_io_creat (context, d, fn)
(void) strcpy(d->fn,dir);
(void) strcat(d->fn,"/");
(void) strcat(d->fn,*fn);
- d->fd = open(d->fn,O_WRONLY | O_CREAT | O_TRUNC | O_EXCL | O_BINARY,0600);
+ d->fd = THREEPARAMOPEN(d->fn,O_WRONLY | O_CREAT | O_TRUNC | O_EXCL | O_BINARY,0600);
}
else
{
@@ -96,7 +96,7 @@ krb5_error_code krb5_rc_io_creat (context, d, fn)
(void) sprintf(d->fn,"%s/krb5_RC%d",dir,UNIQUE);
c = d->fn + strlen(d->fn);
(void) strcpy(c,"aaa");
- while ((d->fd = open(d->fn,O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY,0600)) == -1)
+ while ((d->fd = THREEPARAMOPEN(d->fn,O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_BINARY,0600)) == -1)
{
if ((c[2]++) == 'z')
{
@@ -168,7 +168,7 @@ krb5_error_code krb5_rc_io_open (context, d, fn)
(void) strcat(d->fn,fn);
#ifdef NO_USERID
- d->fd = open(d->fn,O_RDWR | O_BINARY,0600);
+ d->fd = THREEPARAMOPEN(d->fn,O_RDWR | O_BINARY,0600);
#else
if ((d->fd = stat(d->fn, &statb)) != -1) {
uid_t me;
@@ -180,7 +180,7 @@ krb5_error_code krb5_rc_io_open (context, d, fn)
FREE(d->fn);
return KRB5_RC_IO_PERM;
}
- d->fd = open(d->fn,O_RDWR | O_BINARY,0600);
+ d->fd = THREEPARAMOPEN(d->fn,O_RDWR | O_BINARY,0600);
}
#endif
if (d->fd == -1) {
generated by cgit (git 2.34.1) at 2024-09-29 13:18:32 +0000