[2773] in Kerberos-V5-bugs
pending/460: BSD/OS 3.0 vs krb5-1.0pl1
daemon@ATHENA.MIT.EDU (Brian Kantor)
Wed Aug 13 19:27:08 1997
Resent-From: gnats@rt-11.MIT.EDU (GNATS Management)
Resent-To: gnats-admin@rt-11.MIT.EDU
Resent-Reply-To: krb5-bugs@MIT.EDU, Brian Kantor <brian@warlock.ucsd.edu>
Date: Wed, 13 Aug 1997 16:23:56 -0700 (PDT)
From: Brian Kantor <brian@warlock.ucsd.edu>
To: krb5-bugs@MIT.EDU
Cc: brian@warlock.ucsd.edu
>Number: 460
>Category: pending
>Synopsis: BSD/OS 3.0 vs krb5-1.0pl1
>Confidential: yes
>Severity: serious
>Priority: medium
>Responsible: gnats-admin
>State: open
>Class: sw-bug
>Submitter-Id: unknown
>Arrival-Date: Wed Aug 13 19:25:00 EDT 1997
>Last-Modified:
>Originator:
>Organization:
>Release:
>Environment:
>Description:
>How-To-Repeat:
>Fix:
>Audit-Trail:
>Unformatted:
I've had to make a number of minor changes to the pl1 sources to get it
to compile and link on BSD/OS 3.0. The majority of these are due to the
fact that BSDI includes the 'rpc' and 'xdr' libraries in their standard
C library, so one gets multiple definitions of subroutines. Feh.
Note that not all of the kerberos xdr and rpc calls are in BSD/OS 3.0.
I've ifdef'd out the duplicates in the two files xdr.c and xdr_alloc.c;
the remainder of the xdr*.c files were unneeded. I suppose one could
ifdef all of them out but I just removed them.
Have fun.
- Brian
diff -csr dist/src/configure src/configure
*** dist/src/configure Mon Apr 14 21:26:04 1997
--- src/configure Thu May 22 10:13:48 1997
***************
*** 9,15 ****
# Defaults:
ac_help=
! ac_default_prefix=/usr/local
# Any additions from configure.in:
ac_help="$ac_help
--with-cc=COMPILER select compiler to use"
--- 9,15 ----
# Defaults:
ac_help=
! ac_default_prefix=/usr/kerberos
# Any additions from configure.in:
ac_help="$ac_help
--with-cc=COMPILER select compiler to use"
diff -csr dist/src/kadmin/server/kadm_rpc_svc.c src/kadmin/server/kadm_rpc_svc.c
*** dist/src/kadmin/server/kadm_rpc_svc.c Mon Jul 22 13:28:53 1996
--- src/kadmin/server/kadm_rpc_svc.c Wed Aug 13 14:44:33 1997
***************
*** 72,78 ****
#endif
#include <stdio.h>
! #include <rpc/rpc.h>
#include <syslog.h>
#include <memory.h>
#include <kadm5/kadm_rpc.h>
--- 72,78 ----
#endif
#include <stdio.h>
! #include "rpc/rpc.h"
#include <syslog.h>
#include <memory.h>
#include <kadm5/kadm_rpc.h>
diff -csr dist/src/kadmin/server/ovsec_kadmd.c src/kadmin/server/ovsec_kadmd.c
*** dist/src/kadmin/server/ovsec_kadmd.c Tue Nov 19 14:09:47 1996
--- src/kadmin/server/ovsec_kadmd.c Wed Aug 13 14:44:57 1997
***************
*** 21,29 ****
#include <netinet/in.h>
#include <arpa/inet.h> /* inet_ntoa */
#include <netdb.h>
! #include <rpc/rpc.h>
#include <gssapi/gssapi_krb5.h>
! #include <rpc/auth_gssapi.h>
#include <kadm5/admin.h>
#include <kadm5/kadm_rpc.h>
#include <string.h>
--- 21,29 ----
#include <netinet/in.h>
#include <arpa/inet.h> /* inet_ntoa */
#include <netdb.h>
! #include "rpc/rpc.h"
#include <gssapi/gssapi_krb5.h>
! #include "rpc/auth_gssapi.h"
#include <kadm5/admin.h>
#include <kadm5/kadm_rpc.h>
#include <string.h>
diff -csr dist/src/kadmin/server/server_stubs.c src/kadmin/server/server_stubs.c
*** dist/src/kadmin/server/server_stubs.c Mon Jul 22 13:29:13 1996
--- src/kadmin/server/server_stubs.c Wed Aug 13 14:43:04 1997
***************
*** 12,18 ****
#include <gssapi/gssapi_krb5.h> /* for gss_nt_krb5_name */
#include <krb5.h>
#include <kadm5/admin.h>
! #include <kadm5/kadm_rpc.h>
#include <kadm5/server_internal.h>
#include <kadm5/server_acl.h>
#include <syslog.h>
--- 12,18 ----
#include <gssapi/gssapi_krb5.h> /* for gss_nt_krb5_name */
#include <krb5.h>
#include <kadm5/admin.h>
! #include "kadm5/kadm_rpc.h"
#include <kadm5/server_internal.h>
#include <kadm5/server_acl.h>
#include <syslog.h>
diff -csr dist/src/lib/krb5/krb/recvauth.c src/lib/krb5/krb/recvauth.c
*** dist/src/lib/krb5/krb/recvauth.c Thu Nov 21 11:00:06 1996
--- src/lib/krb5/krb/recvauth.c Tue May 27 15:03:24 1997
***************
*** 87,93 ****
*/
if ((retval = krb5_read_message(context, fd, &inbuf)))
return(retval);
! if (strcmp(inbuf.data, appl_version)) {
krb5_xfree(inbuf.data);
if (!problem)
problem = KRB5_SENDAUTH_BADAPPLVERS;
--- 87,93 ----
*/
if ((retval = krb5_read_message(context, fd, &inbuf)))
return(retval);
! if (appl_version && strcmp(inbuf.data, appl_version)) {
krb5_xfree(inbuf.data);
if (!problem)
problem = KRB5_SENDAUTH_BADAPPLVERS;
diff -csr dist/src/lib/krb5/rcache/rc_io.c src/lib/krb5/rcache/rc_io.c
*** dist/src/lib/krb5/rcache/rc_io.c Tue Apr 8 09:07:39 1997
--- src/lib/krb5/rcache/rc_io.c Thu May 29 11:40:49 1997
***************
*** 145,163 ****
default:
retval = KRB5_RC_IO_UNKNOWN; goto fail;
}
! }
! if ((retval = krb5_rc_io_write(context, d, (krb5_pointer)&rc_vno, sizeof(rc_vno))) ||
(retval = krb5_rc_io_sync(context, d)))
{
fail:
(void) unlink(d->fn);
no_unlink:
- FREE(d->fn);
- d->fn = NULL;
(void) close(d->fd);
return retval;
! }
return 0;
}
--- 146,167 ----
default:
retval = KRB5_RC_IO_UNKNOWN; goto fail;
+ }
}
!
! if ((retval = krb5_rc_io_write(context, d, (krb5_pointer)&rc_vno, sizeof(rc_vno))) ||
(retval = krb5_rc_io_sync(context, d)))
{
fail:
(void) unlink(d->fn);
+
no_unlink:
(void) close(d->fd);
+ FREE(d->fn);
+ d->fn = NULL;
return retval;
! }
!
return 0;
}
***************
*** 172,177 ****
--- 176,187 ----
struct stat statb;
#endif
+ if (d->fd > 0)
+ {
+ (void) close(d->fd);
+ d->fd = -1;
+ }
+
GETDIR;
if (!(d->fn = malloc(strlen(fn) + dirlen + 1)))
return KRB5_RC_IO_MALLOC;
***************
*** 332,337 ****
--- 342,353 ----
krb5_context context;
krb5_rc_iostuff *d;
{
+ if (d->fd > 0)
+ {
+ (void)close(d->fd);
+ d->fd = -1;
+ }
+
if (unlink(d->fn) == -1)
switch(errno)
{
diff -csr dist/src/lib/rpc/auth_any.c src/lib/rpc/auth_any.c
*** dist/src/lib/rpc/auth_any.c Mon Jul 22 13:39:37 1996
--- src/lib/rpc/auth_any.c Wed Aug 13 14:47:02 1997
***************
*** 5,13 ****
*/
#include <stdio.h>
! #include <rpc/types.h>
! #include <rpc/xdr.h>
! #include <rpc/auth.h>
int authany_wrap(auth, xdrs, xfunc, xwhere)
AUTH *auth;
--- 5,13 ----
*/
#include <stdio.h>
! #include "rpc/types.h"
! #include "rpc/xdr.h"
! #include "rpc/auth.h"
int authany_wrap(auth, xdrs, xfunc, xwhere)
AUTH *auth;
diff -csr dist/src/lib/rpc/auth_gssapi.c src/lib/rpc/auth_gssapi.c
*** dist/src/lib/rpc/auth_gssapi.c Tue Nov 12 13:30:25 1996
--- src/lib/rpc/auth_gssapi.c Wed Aug 13 14:47:16 1997
***************
*** 19,26 ****
#include <gssapi/gssapi_krb5.h>
#endif
! #include <rpc/rpc.h>
! #include <rpc/auth_gssapi.h>
#ifdef __CODECENTER__
#define DEBUG_GSSAPI 1
--- 19,26 ----
#include <gssapi/gssapi_krb5.h>
#endif
! #include "rpc/rpc.h"
! #include "rpc/auth_gssapi.h"
#ifdef __CODECENTER__
#define DEBUG_GSSAPI 1
diff -csr dist/src/lib/rpc/auth_gssapi_misc.c src/lib/rpc/auth_gssapi_misc.c
*** dist/src/lib/rpc/auth_gssapi_misc.c Tue Aug 13 17:01:37 1996
--- src/lib/rpc/auth_gssapi_misc.c Wed Aug 13 14:47:45 1997
***************
*** 105,115 ****
static char *rcsid = "$Header: /afs/athena.mit.edu/astaff/project/krbdev/.cvsroot/src/lib/rpc/auth_gssapi_misc.c,v 1.15 1996/08/14 00:01:37 tlyu Exp $";
#endif
! #include <rpc/rpc.h>
#include <stdio.h>
#include <gssapi/gssapi.h>
! #include <rpc/auth_gssapi.h>
#ifdef __CODECENTER__
#define DEBUG_GSSAPI 1
--- 105,115 ----
static char *rcsid = "$Header: /afs/athena.mit.edu/astaff/project/krbdev/.cvsroot/src/lib/rpc/auth_gssapi_misc.c,v 1.15 1996/08/14 00:01:37 tlyu Exp $";
#endif
! #include "rpc/rpc.h"
#include <stdio.h>
#include <gssapi/gssapi.h>
! #include "rpc/auth_gssapi.h"
#ifdef __CODECENTER__
#define DEBUG_GSSAPI 1
diff -csr dist/src/lib/rpc/auth_none.c src/lib/rpc/auth_none.c
*** dist/src/lib/rpc/auth_none.c Mon Jul 22 13:39:46 1996
--- src/lib/rpc/auth_none.c Wed Aug 13 14:48:02 1997
***************
*** 39,47 ****
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
! #include <rpc/types.h>
! #include <rpc/xdr.h>
! #include <rpc/auth.h>
#include <stdlib.h>
#define MAX_MARSHEL_SIZE 20
--- 39,47 ----
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
! #include "rpc/types.h"
! #include "rpc/xdr.h"
! #include "rpc/auth.h"
#include <stdlib.h>
#define MAX_MARSHEL_SIZE 20
diff -csr dist/src/lib/rpc/auth_unix.c src/lib/rpc/auth_unix.c
*** dist/src/lib/rpc/auth_unix.c Mon Jul 22 13:39:49 1996
--- src/lib/rpc/auth_unix.c Wed Aug 13 14:48:15 1997
***************
*** 45,54 ****
#include <stdio.h>
! #include <rpc/types.h>
! #include <rpc/xdr.h>
! #include <rpc/auth.h>
! #include <rpc/auth_unix.h>
/*
--- 45,54 ----
#include <stdio.h>
! #include "rpc/types.h"
! #include "rpc/xdr.h"
! #include "rpc/auth.h"
! #include "rpc/auth_unix.h"
/*
diff -csr dist/src/lib/rpc/authunix_prot.c src/lib/rpc/authunix_prot.c
*** dist/src/lib/rpc/authunix_prot.c Mon Jul 22 13:39:52 1996
--- src/lib/rpc/authunix_prot.c Wed Aug 13 14:48:26 1997
***************
*** 39,48 ****
*/
! #include <rpc/types.h>
! #include <rpc/xdr.h>
! #include <rpc/auth.h>
! #include <rpc/auth_unix.h>
/*
* XDR for unix authentication parameters.
--- 39,48 ----
*/
! #include "rpc/types.h"
! #include "rpc/xdr.h"
! #include "rpc/auth.h"
! #include "rpc/auth_unix.h"
/*
* XDR for unix authentication parameters.
diff -csr dist/src/lib/rpc/clnt_generic.c src/lib/rpc/clnt_generic.c
*** dist/src/lib/rpc/clnt_generic.c Fri Nov 22 13:08:46 1996
--- src/lib/rpc/clnt_generic.c Wed Aug 13 15:19:00 1997
***************
*** 33,41 ****
/*
* Copyright (C) 1987, Sun Microsystems, Inc.
*/
! #include <rpc/rpc.h>
! #include <sys/socket.h>
! #include <sys/errno.h>
#include <netdb.h>
/*
--- 33,41 ----
/*
* Copyright (C) 1987, Sun Microsystems, Inc.
*/
! #include "rpc/rpc.h"
! #include "sys/socket.h"
! #include "sys/errno.h"
#include <netdb.h>
/*
diff -csr dist/src/lib/rpc/clnt_perror.c src/lib/rpc/clnt_perror.c
*** dist/src/lib/rpc/clnt_perror.c Sat Jul 27 17:08:27 1996
--- src/lib/rpc/clnt_perror.c Wed Aug 13 14:48:53 1997
***************
*** 41,49 ****
#include <string.h>
#include <errno.h>
! #include <rpc/types.h>
! #include <rpc/auth.h>
! #include <rpc/clnt.h>
#ifdef NEED_SYS_ERRLIST
extern char *sys_errlist[];
--- 41,49 ----
#include <string.h>
#include <errno.h>
! #include "rpc/types.h"
! #include "rpc/auth.h"
! #include "rpc/clnt.h"
#ifdef NEED_SYS_ERRLIST
extern char *sys_errlist[];
diff -csr dist/src/lib/rpc/clnt_raw.c src/lib/rpc/clnt_raw.c
*** dist/src/lib/rpc/clnt_raw.c Mon Jul 22 13:40:03 1996
--- src/lib/rpc/clnt_raw.c Wed Aug 13 14:48:58 1997
***************
*** 42,48 ****
* any interference from the kernal.
*/
! #include <rpc/rpc.h>
#define MCALL_MSG_SIZE 24
--- 42,48 ----
* any interference from the kernal.
*/
! #include "rpc/rpc.h"
#define MCALL_MSG_SIZE 24
diff -csr dist/src/lib/rpc/clnt_simple.c src/lib/rpc/clnt_simple.c
*** dist/src/lib/rpc/clnt_simple.c Fri Nov 22 13:08:46 1996
--- src/lib/rpc/clnt_simple.c Wed Aug 13 14:49:04 1997
***************
*** 39,45 ****
*/
#include <stdio.h>
! #include <rpc/rpc.h>
#include <sys/socket.h>
#include <netdb.h>
#include <string.h>
--- 39,45 ----
*/
#include <stdio.h>
! #include "rpc/rpc.h"
#include <sys/socket.h>
#include <netdb.h>
#include <string.h>
diff -csr dist/src/lib/rpc/clnt_tcp.c src/lib/rpc/clnt_tcp.c
*** dist/src/lib/rpc/clnt_tcp.c Wed Jul 31 13:58:52 1996
--- src/lib/rpc/clnt_tcp.c Wed Aug 13 14:49:11 1997
***************
*** 51,61 ****
*/
#include <stdio.h>
! #include <rpc/rpc.h>
#include <sys/socket.h>
#include <netdb.h>
#include <errno.h>
! #include <rpc/pmap_clnt.h>
#define MCALL_MSG_SIZE 24
--- 51,61 ----
*/
#include <stdio.h>
! #include "rpc/rpc.h"
#include <sys/socket.h>
#include <netdb.h>
#include <errno.h>
! #include "rpc/pmap_clnt.h"
#define MCALL_MSG_SIZE 24
diff -csr dist/src/lib/rpc/clnt_udp.c src/lib/rpc/clnt_udp.c
*** dist/src/lib/rpc/clnt_udp.c Tue Oct 22 17:18:32 1996
--- src/lib/rpc/clnt_udp.c Wed Aug 13 14:49:34 1997
***************
*** 38,44 ****
*/
#include <stdio.h>
! #include <rpc/rpc.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#if defined(sun)
--- 38,44 ----
*/
#include <stdio.h>
! #include "rpc/rpc.h"
#include <sys/socket.h>
#include <sys/ioctl.h>
#if defined(sun)
***************
*** 46,52 ****
#endif
#include <netdb.h>
#include <errno.h>
! #include <rpc/pmap_clnt.h>
extern int errno;
--- 46,52 ----
#endif
#include <netdb.h>
#include <errno.h>
! #include "rpc/pmap_clnt.h"
extern int errno;
Only in src/lib/rpc: config.cache
Only in src/lib/rpc: config.status
diff -csr dist/src/lib/rpc/get_myaddress.c src/lib/rpc/get_myaddress.c
*** dist/src/lib/rpc/get_myaddress.c Fri Nov 22 14:36:48 1996
--- src/lib/rpc/get_myaddress.c Wed Aug 13 14:49:47 1997
***************
*** 39,46 ****
*/
#ifdef GSSAPI_KRB5
! #include <rpc/types.h>
! #include <rpc/pmap_prot.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <krb5.h>
--- 39,46 ----
*/
#ifdef GSSAPI_KRB5
! #include "rpc/types.h"
! #include "rpc/pmap_prot.h"
#include <sys/socket.h>
#include <netinet/in.h>
#include <krb5.h>
***************
*** 78,85 ****
}
#else /* !GSSAPI_KRB5 */
! #include <rpc/types.h>
! #include <rpc/pmap_prot.h>
#include <sys/socket.h>
#if defined(sun)
#include <sys/sockio.h>
--- 78,85 ----
}
#else /* !GSSAPI_KRB5 */
! #include "rpc/types.h"
! #include "rpc/pmap_prot.h"
#include <sys/socket.h>
#if defined(sun)
#include <sys/sockio.h>
diff -csr dist/src/lib/rpc/getrpcent.c src/lib/rpc/getrpcent.c
*** dist/src/lib/rpc/getrpcent.c Fri Aug 30 23:11:41 1996
--- src/lib/rpc/getrpcent.c Wed Aug 13 14:49:55 1997
***************
*** 39,45 ****
#include <stdio.h>
#include <sys/types.h>
#include <netdb.h>
! #include <rpc/rpc.h>
#include <string.h>
#include <sys/socket.h>
--- 39,45 ----
#include <stdio.h>
#include <sys/types.h>
#include <netdb.h>
! #include "rpc/rpc.h"
#include <string.h>
#include <sys/socket.h>
diff -csr dist/src/lib/rpc/getrpcport.c src/lib/rpc/getrpcport.c
*** dist/src/lib/rpc/getrpcport.c Fri Nov 22 13:08:47 1996
--- src/lib/rpc/getrpcport.c Wed Aug 13 14:50:00 1997
***************
*** 36,42 ****
*/
#include <stdio.h>
! #include <rpc/rpc.h>
#include <netdb.h>
#include <sys/socket.h>
--- 36,42 ----
*/
#include <stdio.h>
! #include "rpc/rpc.h"
#include <netdb.h>
#include <sys/socket.h>
diff -csr dist/src/lib/rpc/pmap_clnt.c src/lib/rpc/pmap_clnt.c
*** dist/src/lib/rpc/pmap_clnt.c Mon Jul 22 13:40:21 1996
--- src/lib/rpc/pmap_clnt.c Wed Aug 13 14:50:11 1997
***************
*** 38,46 ****
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
! #include <rpc/rpc.h>
! #include <rpc/pmap_prot.h>
! #include <rpc/pmap_clnt.h>
static struct timeval timeout = { 5, 0 };
static struct timeval tottimeout = { 60, 0 };
--- 38,46 ----
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
! #include "rpc/rpc.h"
! #include "rpc/pmap_prot.h"
! #include "rpc/pmap_clnt.h"
static struct timeval timeout = { 5, 0 };
static struct timeval tottimeout = { 60, 0 };
diff -csr dist/src/lib/rpc/pmap_getmaps.c src/lib/rpc/pmap_getmaps.c
*** dist/src/lib/rpc/pmap_getmaps.c Wed Jul 31 13:59:06 1996
--- src/lib/rpc/pmap_getmaps.c Wed Aug 13 14:50:24 1997
***************
*** 39,47 ****
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
! #include <rpc/rpc.h>
! #include <rpc/pmap_prot.h>
! #include <rpc/pmap_clnt.h>
#include <sys/socket.h>
#include <netdb.h>
#include <stdio.h>
--- 39,47 ----
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
! #include "rpc/rpc.h"
! #include "rpc/pmap_prot.h"
! #include "rpc/pmap_clnt.h"
#include <sys/socket.h>
#include <netdb.h>
#include <stdio.h>
diff -csr dist/src/lib/rpc/pmap_getport.c src/lib/rpc/pmap_getport.c
*** dist/src/lib/rpc/pmap_getport.c Mon Jul 22 13:40:27 1996
--- src/lib/rpc/pmap_getport.c Wed Aug 13 14:50:37 1997
***************
*** 38,46 ****
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
! #include <rpc/rpc.h>
! #include <rpc/pmap_prot.h>
! #include <rpc/pmap_clnt.h>
#include <sys/socket.h>
#ifdef OSF1
#include <net/route.h>
--- 38,46 ----
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
! #include "rpc/rpc.h"
! #include "rpc/pmap_prot.h"
! #include "rpc/pmap_clnt.h"
#include <sys/socket.h>
#ifdef OSF1
#include <net/route.h>
diff -csr dist/src/lib/rpc/pmap_prot.c src/lib/rpc/pmap_prot.c
*** dist/src/lib/rpc/pmap_prot.c Mon Jul 22 13:40:29 1996
--- src/lib/rpc/pmap_prot.c Wed Aug 13 14:50:48 1997
***************
*** 38,46 ****
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
! #include <rpc/types.h>
! #include <rpc/xdr.h>
! #include <rpc/pmap_prot.h>
bool_t
--- 38,46 ----
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
! #include "rpc/types.h"
! #include "rpc/xdr.h"
! #include "rpc/pmap_prot.h"
bool_t
diff -csr dist/src/lib/rpc/pmap_prot2.c src/lib/rpc/pmap_prot2.c
*** dist/src/lib/rpc/pmap_prot2.c Mon Jul 22 13:40:33 1996
--- src/lib/rpc/pmap_prot2.c Wed Aug 13 14:51:08 1997
***************
*** 38,46 ****
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
! #include <rpc/types.h>
! #include <rpc/xdr.h>
! #include <rpc/pmap_prot.h>
/*
--- 38,46 ----
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
! #include "rpc/types.h"
! #include "rpc/xdr.h"
! #include "rpc/pmap_prot.h"
/*
diff -csr dist/src/lib/rpc/pmap_rmt.c src/lib/rpc/pmap_rmt.c
*** dist/src/lib/rpc/pmap_rmt.c Tue Oct 22 17:18:35 1996
--- src/lib/rpc/pmap_rmt.c Wed Aug 13 14:51:21 1997
***************
*** 39,48 ****
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
! #include <rpc/rpc.h>
! #include <rpc/pmap_prot.h>
! #include <rpc/pmap_clnt.h>
! #include <rpc/pmap_rmt.h>
#include <sys/socket.h>
#ifdef sun
#include <sys/sockio.h>
--- 39,48 ----
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
! #include "rpc/rpc.h"
! #include "rpc/pmap_prot.h"
! #include "rpc/pmap_clnt.h"
! #include "rpc/pmap_rmt.h"
#include <sys/socket.h>
#ifdef sun
#include <sys/sockio.h>
diff -csr dist/src/lib/rpc/rpc_callmsg.c src/lib/rpc/rpc_callmsg.c
*** dist/src/lib/rpc/rpc_callmsg.c Mon Jul 22 13:40:40 1996
--- src/lib/rpc/rpc_callmsg.c Wed Aug 13 14:51:27 1997
***************
*** 40,46 ****
#include <sys/param.h>
! #include <rpc/rpc.h>
/*
* XDR a call message
--- 40,46 ----
#include <sys/param.h>
! #include "rpc/rpc.h"
/*
* XDR a call message
diff -csr dist/src/lib/rpc/rpc_commondata.c src/lib/rpc/rpc_commondata.c
*** dist/src/lib/rpc/rpc_commondata.c Mon Jul 22 13:40:42 1996
--- src/lib/rpc/rpc_commondata.c Wed Aug 13 14:51:33 1997
***************
*** 27,33 ****
* 2550 Garcia Avenue
* Mountain View, California 94043
*/
! #include <rpc/rpc.h>
/*
* This file should only contain common data (global data) that is exported
* by public interfaces
--- 27,33 ----
* 2550 Garcia Avenue
* Mountain View, California 94043
*/
! #include "rpc/rpc.h"
/*
* This file should only contain common data (global data) that is exported
* by public interfaces
diff -csr dist/src/lib/rpc/rpc_prot.c src/lib/rpc/rpc_prot.c
*** dist/src/lib/rpc/rpc_prot.c Mon Jul 22 13:40:48 1996
--- src/lib/rpc/rpc_prot.c Wed Aug 13 15:50:09 1997
***************
*** 46,55 ****
#include <sys/param.h>
! #include <rpc/rpc.h>
/* * * * * * * * * * * * * * XDR Authentication * * * * * * * * * * * */
/*
* XDR an opaque authentication struct
* (see auth.h)
--- 46,57 ----
#include <sys/param.h>
! #include "rpc/rpc.h"
/* * * * * * * * * * * * * * XDR Authentication * * * * * * * * * * * */
+ #ifndef bsdi
+
/*
* XDR an opaque authentication struct
* (see auth.h)
***************
*** 176,181 ****
--- 178,185 ----
return (xdr_u_int32(xdrs, &(cmsg->rm_call.cb_vers)));
return (FALSE);
}
+
+ #endif /* bsdi */
/* ************************** Client utility routine ************* */
diff -csr dist/src/lib/rpc/svc.c src/lib/rpc/svc.c
*** dist/src/lib/rpc/svc.c Mon Jul 22 13:40:50 1996
--- src/lib/rpc/svc.c Wed Aug 13 14:51:53 1997
***************
*** 42,49 ****
*/
#include <sys/errno.h>
! #include <rpc/rpc.h>
! #include <rpc/pmap_clnt.h>
#include <stdio.h>
extern int errno;
--- 42,49 ----
*/
#include <sys/errno.h>
! #include "rpc/rpc.h"
! #include "rpc/pmap_clnt.h"
#include <stdio.h>
extern int errno;
diff -csr dist/src/lib/rpc/svc_auth.c src/lib/rpc/svc_auth.c
*** dist/src/lib/rpc/svc_auth.c Mon Jul 22 13:40:54 1996
--- src/lib/rpc/svc_auth.c Wed Aug 13 14:51:58 1997
***************
*** 37,43 ****
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
! #include <rpc/rpc.h>
/*
* Server side authenticators are called from authenticate by
--- 37,43 ----
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
! #include "rpc/rpc.h"
/*
* Server side authenticators are called from authenticate by
diff -csr dist/src/lib/rpc/svc_auth_any.c src/lib/rpc/svc_auth_any.c
*** dist/src/lib/rpc/svc_auth_any.c Mon Jul 22 13:40:58 1996
--- src/lib/rpc/svc_auth_any.c Wed Aug 13 14:52:04 1997
***************
*** 7,13 ****
*/
#include <stdio.h>
! #include <rpc/rpc.h>
extern int authany_wrap();
--- 7,13 ----
*/
#include <stdio.h>
! #include "rpc/rpc.h"
extern int authany_wrap();
diff -csr dist/src/lib/rpc/svc_auth_gssapi.c src/lib/rpc/svc_auth_gssapi.c
*** dist/src/lib/rpc/svc_auth_gssapi.c Wed Oct 16 13:16:10 1996
--- src/lib/rpc/svc_auth_gssapi.c Wed Aug 13 14:52:20 1997
***************
*** 194,204 ****
#include <stdio.h>
#include <string.h>
! #include <rpc/rpc.h>
#include <sys/stat.h>
#include <gssapi/gssapi_generic.h>
! #include <rpc/auth_gssapi.h>
#ifdef GSS_BACKWARD_HACK
#include <gssapi/gssapi_krb5.h>
--- 194,204 ----
#include <stdio.h>
#include <string.h>
! #include "rpc/rpc.h"
#include <sys/stat.h>
#include <gssapi/gssapi_generic.h>
! #include "rpc/auth_gssapi.h"
#ifdef GSS_BACKWARD_HACK
#include <gssapi/gssapi_krb5.h>
diff -csr dist/src/lib/rpc/svc_auth_unix.c src/lib/rpc/svc_auth_unix.c
*** dist/src/lib/rpc/svc_auth_unix.c Mon Jul 22 13:41:03 1996
--- src/lib/rpc/svc_auth_unix.c Wed Aug 13 14:52:26 1997
***************
*** 43,49 ****
*/
#include <stdio.h>
! #include <rpc/rpc.h>
/*
* Unix longhand authenticator
--- 43,49 ----
*/
#include <stdio.h>
! #include "rpc/rpc.h"
/*
* Unix longhand authenticator
diff -csr dist/src/lib/rpc/svc_raw.c src/lib/rpc/svc_raw.c
*** dist/src/lib/rpc/svc_raw.c Mon Jul 22 13:41:04 1996
--- src/lib/rpc/svc_raw.c Wed Aug 13 14:52:33 1997
***************
*** 40,46 ****
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
! #include <rpc/rpc.h>
/*
--- 40,46 ----
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
! #include "rpc/rpc.h"
/*
diff -csr dist/src/lib/rpc/svc_run.c src/lib/rpc/svc_run.c
*** dist/src/lib/rpc/svc_run.c Mon Jul 22 13:41:06 1996
--- src/lib/rpc/svc_run.c Wed Aug 13 14:52:39 1997
***************
*** 36,42 ****
* This is the rpc server side idle loop
* Wait for input, call server program.
*/
! #include <rpc/rpc.h>
#include <sys/errno.h>
void
--- 36,42 ----
* This is the rpc server side idle loop
* Wait for input, call server program.
*/
! #include "rpc/rpc.h"
#include <sys/errno.h>
void
diff -csr dist/src/lib/rpc/svc_simple.c src/lib/rpc/svc_simple.c
*** dist/src/lib/rpc/svc_simple.c Wed Jul 31 13:59:11 1996
--- src/lib/rpc/svc_simple.c Wed Aug 13 14:52:45 1997
***************
*** 39,45 ****
*/
#include <stdio.h>
! #include <rpc/rpc.h>
#include <sys/socket.h>
#include <netdb.h>
--- 39,45 ----
*/
#include <stdio.h>
! #include "rpc/rpc.h"
#include <sys/socket.h>
#include <netdb.h>
diff -csr dist/src/lib/rpc/svc_tcp.c src/lib/rpc/svc_tcp.c
*** dist/src/lib/rpc/svc_tcp.c Mon Jul 22 13:41:10 1996
--- src/lib/rpc/svc_tcp.c Wed Aug 13 14:52:50 1997
***************
*** 42,48 ****
*/
#include <stdio.h>
! #include <rpc/rpc.h>
#include <sys/socket.h>
#include <errno.h>
#include <stdlib.h>
--- 42,48 ----
*/
#include <stdio.h>
! #include "rpc/rpc.h"
#include <sys/socket.h>
#include <errno.h>
#include <stdlib.h>
diff -csr dist/src/lib/rpc/svc_udp.c src/lib/rpc/svc_udp.c
*** dist/src/lib/rpc/svc_udp.c Mon Jul 22 13:41:12 1996
--- src/lib/rpc/svc_udp.c Wed Aug 13 14:52:54 1997
***************
*** 40,46 ****
*/
#include <stdio.h>
! #include <rpc/rpc.h>
#include <sys/socket.h>
#include <errno.h>
--- 40,46 ----
*/
#include <stdio.h>
! #include "rpc/rpc.h"
#include <sys/socket.h>
#include <errno.h>
Only in src/lib/rpc: types.h
Only in src/lib/rpc/unit-test: Makefile
Only in src/lib/rpc/unit-test: client
diff -csr dist/src/lib/rpc/unit-test/client.c src/lib/rpc/unit-test/client.c
*** dist/src/lib/rpc/unit-test/client.c Tue Nov 12 13:29:54 1996
--- src/lib/rpc/unit-test/client.c Wed Aug 13 15:35:32 1997
***************
*** 83,92 ****
#endif
#include <stdio.h>
! #include <rpc/rpc.h>
#include <gssapi/gssapi.h>
! #include <rpc/rpc.h>
! #include <rpc/auth_gssapi.h>
#include "rpc_test.h"
#define BIG_BUF 4096
--- 83,92 ----
#endif
#include <stdio.h>
! #include "rpc/rpc.h"
#include <gssapi/gssapi.h>
! #include "rpc/rpc.h"
! #include "rpc/auth_gssapi.h"
#include "rpc_test.h"
#define BIG_BUF 4096
Only in src/lib/rpc/unit-test: config.status
Only in src/lib/rpc/unit-test: server
diff -csr dist/src/lib/rpc/unit-test/server.c src/lib/rpc/unit-test/server.c
*** dist/src/lib/rpc/unit-test/server.c Thu Nov 14 19:27:49 1996
--- src/lib/rpc/unit-test/server.c Wed Aug 13 15:35:57 1997
***************
*** 12,22 ****
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
! #include <rpc/rpc.h>
#include <arpa/inet.h> /* inet_ntoa */
#include <gssapi/gssapi.h>
#include <gssapi/gssapi_generic.h>
! #include <rpc/auth_gssapi.h>
#include <sys/param.h> /* MAXHOSTNAMELEN */
#include "rpc_test.h"
--- 12,22 ----
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
! #include "rpc/rpc.h"
#include <arpa/inet.h> /* inet_ntoa */
#include <gssapi/gssapi.h>
#include <gssapi/gssapi_generic.h>
! #include "rpc/auth_gssapi.h"
#include <sys/param.h> /* MAXHOSTNAMELEN */
#include "rpc_test.h"
Only in src/lib/rpc: xdr
diff -csr dist/src/lib/rpc/xdr.c src/lib/rpc/xdr.c
*** dist/src/lib/rpc/xdr.c Tue Jul 23 08:26:11 1996
--- src/lib/rpc/xdr.c Wed Aug 13 15:45:48 1997
***************
*** 44,51 ****
#include <stdio.h>
#include <string.h>
! #include <rpc/types.h>
! #include <rpc/xdr.h>
/*
* constants specific to the xdr "protocol"
--- 44,51 ----
#include <stdio.h>
#include <string.h>
! #include "rpc/types.h"
! #include "rpc/xdr.h"
/*
* constants specific to the xdr "protocol"
***************
*** 59,64 ****
--- 59,66 ----
*/
static char xdr_zero[BYTES_PER_XDR_UNIT] = { 0, 0, 0, 0 };
+ #ifndef bsdi
+
/*
* Free a data structure using XDR
* Not a filter, but a convenient utility nonetheless
***************
*** 492,497 ****
--- 494,501 ----
return (xdr_bytes(xdrs, &np->n_bytes, &np->n_len, MAX_NETOBJ_SZ));
}
+ #endif /* !bsdi */
+
bool_t
xdr_int32(xdrs, ip)
XDR *xdrs;
***************
*** 537,542 ****
--- 541,548 ----
}
}
+ #ifndef bsdi
+
/*
* XDR a descriminated union
* Support routine for discriminated unions.
***************
*** 671,673 ****
--- 677,681 ----
}
return (FALSE);
}
+
+ #endif /* !bsdi */
diff -csr dist/src/lib/rpc/xdr.h src/lib/rpc/xdr.h
*** dist/src/lib/rpc/xdr.h Tue Aug 13 17:01:53 1996
--- src/lib/rpc/xdr.h Wed Aug 13 15:45:59 1997
***************
*** 143,184 ****
--- 143,192 ----
*/
#define XDR_GETLONG(xdrs, longp) \
(*(xdrs)->x_ops->x_getlong)(xdrs, longp)
+
#define xdr_getlong(xdrs, longp) \
(*(xdrs)->x_ops->x_getlong)(xdrs, longp)
#define XDR_PUTLONG(xdrs, longp) \
(*(xdrs)->x_ops->x_putlong)(xdrs, longp)
+
#define xdr_putlong(xdrs, longp) \
(*(xdrs)->x_ops->x_putlong)(xdrs, longp)
#define XDR_GETBYTES(xdrs, addr, len) \
(*(xdrs)->x_ops->x_getbytes)(xdrs, addr, len)
+
#define xdr_getbytes(xdrs, addr, len) \
(*(xdrs)->x_ops->x_getbytes)(xdrs, addr, len)
#define XDR_PUTBYTES(xdrs, addr, len) \
(*(xdrs)->x_ops->x_putbytes)(xdrs, addr, len)
+
#define xdr_putbytes(xdrs, addr, len) \
(*(xdrs)->x_ops->x_putbytes)(xdrs, addr, len)
#define XDR_GETPOS(xdrs) \
(*(xdrs)->x_ops->x_getpostn)(xdrs)
+
#define xdr_getpos(xdrs) \
(*(xdrs)->x_ops->x_getpostn)(xdrs)
#define XDR_SETPOS(xdrs, pos) \
(*(xdrs)->x_ops->x_setpostn)(xdrs, pos)
+
#define xdr_setpos(xdrs, pos) \
(*(xdrs)->x_ops->x_setpostn)(xdrs, pos)
#define XDR_INLINE(xdrs, len) \
(*(xdrs)->x_ops->x_inline)(xdrs, len)
+
#define xdr_inline(xdrs, len) \
(*(xdrs)->x_ops->x_inline)(xdrs, len)
#define XDR_DESTROY(xdrs) \
if ((xdrs)->x_ops->x_destroy) \
(*(xdrs)->x_ops->x_destroy)(xdrs)
+
#define xdr_destroy(xdrs) \
if ((xdrs)->x_ops->x_destroy) \
(*(xdrs)->x_ops->x_destroy)(xdrs)
***************
*** 233,278 ****
--- 241,307 ----
* These are the "generic" xdr routines.
*/
extern bool_t xdr_void();
+
extern bool_t xdr_int
PROTOTYPE((XDR *, int *));
+
extern bool_t xdr_u_int
PROTOTYPE((XDR *, unsigned int *));
+
extern bool_t xdr_long
PROTOTYPE((XDR *, long *));
+
extern bool_t xdr_u_long
PROTOTYPE((XDR *, unsigned long *));
+
extern bool_t xdr_short
PROTOTYPE((XDR *, short *));
+
extern bool_t xdr_u_short
PROTOTYPE((XDR *, unsigned short *));
+
extern bool_t xdr_bool
PROTOTYPE((XDR *, bool_t *));
+
extern bool_t xdr_enum
PROTOTYPE((XDR *, enum_t *));
+
extern bool_t xdr_array
PROTOTYPE((XDR *, caddr_t *, unsigned int*, unsigned int, unsigned int, xdrproc_t));
+
extern bool_t xdr_bytes
PROTOTYPE((XDR *, char **, unsigned int *, unsigned int));
+
extern bool_t xdr_opaque
PROTOTYPE((XDR *, caddr_t, unsigned int));
+
extern bool_t xdr_string
PROTOTYPE((XDR *, char **, unsigned int));
+
extern bool_t xdr_union
PROTOTYPE((XDR *, enum_t *, char *, struct xdr_discrim *, xdrproc_t));
+
extern bool_t xdr_char
PROTOTYPE((XDR *, char *));
+
extern bool_t xdr_u_char
PROTOTYPE((XDR *, char *));
+
extern bool_t xdr_vector
PROTOTYPE((XDR *, char *, unsigned int, unsigned int, xdrproc_t));
+
extern bool_t xdr_float
PROTOTYPE((XDR *, float *));
+
extern bool_t xdr_double
PROTOTYPE((XDR *, double *));
+
extern bool_t xdr_reference
PROTOTYPE((XDR *, caddr_t *, unsigned int, xdrproc_t));
+
extern bool_t xdr_pointer
PROTOTYPE((XDR *, char **, unsigned int, xdrproc_t));
+
extern bool_t xdr_wrapstring
PROTOTYPE((XDR *, char **));
***************
*** 286,296 ****
--- 315,327 ----
char *n_bytes;
};
typedef struct netobj netobj;
+
extern bool_t xdr_netobj
PROTOTYPE((XDR *, struct netobj *));
extern bool_t xdr_int32
PROTOTYPE((XDR *, rpc_int32 *));
+
extern bool_t xdr_u_int32
PROTOTYPE((XDR *, rpc_u_int32 *));
diff -csr dist/src/lib/rpc/xdr_alloc.c src/lib/rpc/xdr_alloc.c
*** dist/src/lib/rpc/xdr_alloc.c Mon Jul 22 13:41:21 1996
--- src/lib/rpc/xdr_alloc.c Wed Aug 13 14:53:14 1997
***************
*** 74,81 ****
static char *rcsid = "$Header: /afs/athena.mit.edu/astaff/project/krbdev/.cvsroot/src/lib/rpc/xdr_alloc.c,v 1.6 1996/07/22 20:41:21 marc Exp $";
#endif
! #include <rpc/types.h>
! #include <rpc/xdr.h>
#include <dyn.h>
static bool_t xdralloc_putlong();
--- 74,81 ----
static char *rcsid = "$Header: /afs/athena.mit.edu/astaff/project/krbdev/.cvsroot/src/lib/rpc/xdr_alloc.c,v 1.6 1996/07/22 20:41:21 marc Exp $";
#endif
! #include "rpc/types.h"
! #include "rpc/xdr.h"
#include <dyn.h>
static bool_t xdralloc_putlong();
Only in dist/src/lib/rpc: xdr_array.c
Only in dist/src/lib/rpc: xdr_float.c
Only in dist/src/lib/rpc: xdr_mem.c
Only in dist/src/lib/rpc: xdr_rec.c
Only in dist/src/lib/rpc: xdr_reference.c
Only in dist/src/lib/rpc: xdr_stdio.c
