From 9bd1654ae3b200ea642b0162c3e49e16d3676e06 Mon Sep 17 00:00:00 2001 From: Bill Paul Date: Wed, 28 May 1997 04:38:30 +0000 Subject: [PATCH] Resolve conflicts. --- include/rpcsvc/Makefile | 17 ++++---- include/rpcsvc/klm_prot.x | 2 +- include/rpcsvc/nlm_prot.x | 2 +- include/rpcsvc/rex.x | 2 +- include/rpcsvc/rnusers.x | 35 +++++++++++++++- include/rpcsvc/rquota.x | 2 +- include/rpcsvc/rstat.x | 2 +- include/rpcsvc/rwall.x | 87 ++++++++++++++++++++++----------------- include/rpcsvc/sm_inter.x | 2 +- include/rpcsvc/spray.x | 2 +- include/rpcsvc/yp.x | 2 +- include/rpcsvc/yp_prot.h | 2 +- include/rpcsvc/ypclnt.h | 2 +- include/rpcsvc/yppasswd.x | 7 +++- include/rpcsvc/ypxfrd.x | 4 +- 15 files changed, 110 insertions(+), 60 deletions(-) diff --git a/include/rpcsvc/Makefile b/include/rpcsvc/Makefile index 3b1a77c5e00f..76873f30d682 100644 --- a/include/rpcsvc/Makefile +++ b/include/rpcsvc/Makefile @@ -1,24 +1,27 @@ # from: @(#)Makefile 2.3 88/08/11 4.0 RPCSRC -# $Id$ +# $Id: Makefile,v 1.12 1996/08/30 22:36:45 peter Exp $ .SUFFIXES: .x RPCCOM = rpcgen -HDRS= klm_prot.h mount.h nfs_prot.h nlm_prot.h rex.h rnusers.h \ +HDRS= key_prot.h klm_prot.h mount.h nfs_prot.h nlm_prot.h rex.h rnusers.h \ rquota.h rstat.h rwall.h sm_inter.h spray.h yppasswd.h yp.h \ - ypxfrd.h -XFILES= bootparam_prot.x klm_prot.x mount.x nfs_prot.x nlm_prot.x \ + ypxfrd.h ypupdate_prot.h nis.h nis_cache.h nis_callback.h \ + bootparam_prot.h crypt.h +XFILES= bootparam_prot.x key_prot.x klm_prot.x mount.x nfs_prot.x nlm_prot.x \ rex.x rnusers.x rquota.x rstat.x rwall.x sm_inter.x spray.x \ - yppasswd.x yp.x ypxfrd.x -HFILES= yp_prot.h ypclnt.h + yppasswd.x yp.x ypxfrd.x ypupdate_prot.x nis.x nis_cache.x nis_object.x \ + nis_callback.x crypt.x +HFILES= yp_prot.h ypclnt.h nis_db.h nis_tags.h nislib.h CLEANFILES+= ${HDRS} all: ${HDRS} +# ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ beforeinstall: - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${INSTALL} -C -m 444 \ ${HFILES:S;^;${.CURDIR}/;} \ ${XFILES:S;^;${.CURDIR}/;} \ ${HDRS} \ diff --git a/include/rpcsvc/klm_prot.x b/include/rpcsvc/klm_prot.x index d269fa7f750e..c84b9b2d98d9 100644 --- a/include/rpcsvc/klm_prot.x +++ b/include/rpcsvc/klm_prot.x @@ -40,7 +40,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)klm_prot.x 1.7 87/07/08 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: @(#)klm_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id$"; +%static char rcsid[] = "$Id: klm_prot.x,v 1.1 1994/08/04 19:01:45 wollman Exp $"; %#endif /* not lint */ #endif diff --git a/include/rpcsvc/nlm_prot.x b/include/rpcsvc/nlm_prot.x index dee9ec945bd6..04721e28e3ff 100644 --- a/include/rpcsvc/nlm_prot.x +++ b/include/rpcsvc/nlm_prot.x @@ -12,7 +12,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)nlm_prot.x 1.8 87/09/21 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: * @(#)nlm_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id$"; +%static char rcsid[] = "$Id: nlm_prot.x,v 1.1 1994/08/04 19:01:48 wollman Exp $"; %#endif /* not lint */ #endif diff --git a/include/rpcsvc/rex.x b/include/rpcsvc/rex.x index dfe42c909fcb..f027d28eef90 100644 --- a/include/rpcsvc/rex.x +++ b/include/rpcsvc/rex.x @@ -35,7 +35,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)rex.x 1.3 87/09/18 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: @(#)rex.x 2.1 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id$"; +%static char rcsid[] = "$Id: rex.x,v 1.1 1994/08/04 19:01:49 wollman Exp $"; %#endif /* not lint */ #endif diff --git a/include/rpcsvc/rnusers.x b/include/rpcsvc/rnusers.x index 72f558c79172..0ba524872bcc 100644 --- a/include/rpcsvc/rnusers.x +++ b/include/rpcsvc/rnusers.x @@ -35,7 +35,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)rnusers.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: @(#)rnusers.x 2.1 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id$"; +%static char rcsid[] = "$Id: rnusers.x,v 1.1 1994/08/04 19:01:50 wollman Exp $"; %#endif /* not lint */ #endif @@ -59,6 +59,21 @@ typedef utmp utmparr; typedef utmpidle utmpidlearr; +const RUSERS_MAXUSERLEN = 32; +const RUSERS_MAXLINELEN = 32; +const RUSERS_MAXHOSTLEN = 257; + +struct rusers_utmp { + string ut_user; /* aka ut_name */ + string ut_line; /* device */ + string ut_host; /* host user logged on from */ + int ut_type; /* type of entry */ + int ut_time; /* time entry was made */ + unsigned int ut_idle; /* minutes idle */ +}; + +typedef rusers_utmp utmp_array<>; + program RUSERSPROG { /* * Old version does not include idle information @@ -87,5 +102,21 @@ program RUSERSPROG { utmpidlearr RUSERSPROC_ALLNAMES(void) = 3; } = 2; + + /* + * Version 3 rusers procedures (from Solaris). + * (Thanks a lot Sun.) + */ + version RUSERSVERS_3 { + int + RUSERSPROC_NUM(void) = 1; + + utmp_array + RUSERSPROC_NAMES(void) = 2; + + utmp_array + RUSERSPROC_ALLNAMES(void) = 3; + } = 3; + } = 100002; - + diff --git a/include/rpcsvc/rquota.x b/include/rpcsvc/rquota.x index 1d593ddc2190..476d76bd2be1 100644 --- a/include/rpcsvc/rquota.x +++ b/include/rpcsvc/rquota.x @@ -7,7 +7,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)rquota.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: @(#)rquota.x 2.1 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id$"; +%static char rcsid[] = "$Id: rquota.x,v 1.1 1994/08/04 19:01:50 wollman Exp $"; %#endif /* not lint */ #endif diff --git a/include/rpcsvc/rstat.x b/include/rpcsvc/rstat.x index 274b1fb4e2c6..0c55005cca17 100644 --- a/include/rpcsvc/rstat.x +++ b/include/rpcsvc/rstat.x @@ -47,7 +47,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)rstat.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: @(#)rstat.x 2.2 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id$"; +%static char rcsid[] = "$Id: rstat.x,v 1.1 1994/08/04 19:01:51 wollman Exp $"; %#endif /* not lint */ #endif /* def RPC_HDR */ diff --git a/include/rpcsvc/rwall.x b/include/rpcsvc/rwall.x index c3d5a605360d..6c26c1f18f3e 100644 --- a/include/rpcsvc/rwall.x +++ b/include/rpcsvc/rwall.x @@ -1,46 +1,57 @@ -/* - * Copyright (c) 1993 Christopher G. Demetriou - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ +%/* +% * Sun RPC is a product of Sun Microsystems, Inc. and is provided for +% * unrestricted use provided that this legend is included on all tape +% * media and as a part of the software program in whole or part. Users +% * may copy or modify Sun RPC without charge, but are not authorized +% * to license or distribute it to anyone else except as part of a product or +% * program developed by the user or with the express written consent of +% * Sun Microsystems, Inc. +% * +% * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE +% * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR +% * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. +% * +% * Sun RPC is provided with no support and without any obligation on the +% * part of Sun Microsystems, Inc. to assist in its use, correction, +% * modification or enhancement. +% * +% * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE +% * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC +% * OR ANY PART THEREOF. +% * +% * In no event will Sun Microsystems, Inc. be liable for any lost revenue +% * or profits or other special, indirect and consequential damages, even if +% * Sun has been advised of the possibility of such damages. +% * +% * Sun Microsystems, Inc. +% * 2550 Garcia Avenue +% * Mountain View, California 94043 +% */ -/* - * rpc protocol definition for (remote) wall protocol - * - * this has to be compatible with sun's definition - */ +%/* +% * Copyright (c) 1984, 1990 by Sun Microsystems, Inc. +% */ +% +%/* from @(#)rwall.x 1.6 91/03/11 TIRPC 1.0 */ -#ifndef RPC_HDR -%#ifndef lint -%static char rcsid[] = "$Id$"; -%#endif /* not lint */ +#ifdef RPC_HDR +% +%#ifndef _rpcsvc_rwall_h +%#define _rpcsvc_rwall_h +% +%typedef char *wrapstring; +% #endif program WALLPROG { version WALLVERS { - void WALLPROC_WALL(string) = 2; + void + WALLPROC_WALL(wrapstring) = 2; + } = 1; } = 100008; + +#ifdef RPC_HDR +% +%#endif /* ! _rpcsvc_rwall_h */ +#endif diff --git a/include/rpcsvc/sm_inter.x b/include/rpcsvc/sm_inter.x index b29529e6e42d..49a93044f8fd 100644 --- a/include/rpcsvc/sm_inter.x +++ b/include/rpcsvc/sm_inter.x @@ -37,7 +37,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)sm_inter.x 1.7 87/06/24 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: @(#)sm_inter.x 2.2 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id$"; +%static char rcsid[] = "$Id: sm_inter.x,v 1.1 1994/08/04 19:01:53 wollman Exp $"; %#endif /* not lint */ #endif diff --git a/include/rpcsvc/spray.x b/include/rpcsvc/spray.x index ecce9b8b914f..5ae7a4d1780d 100644 --- a/include/rpcsvc/spray.x +++ b/include/rpcsvc/spray.x @@ -36,7 +36,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)spray.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: @(#)spray.x 2.1 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id$"; +%static char rcsid[] = "$Id: spray.x,v 1.1 1994/08/04 19:01:54 wollman Exp $"; %#endif /* not lint */ #endif diff --git a/include/rpcsvc/yp.x b/include/rpcsvc/yp.x index 692d0ebe7fe7..ce5bcf264f9b 100644 --- a/include/rpcsvc/yp.x +++ b/include/rpcsvc/yp.x @@ -34,7 +34,7 @@ #ifndef RPC_HDR %#ifndef lint %/*static char sccsid[] = "from: @(#)yp.x 2.1 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id$"; +%static char rcsid[] = "$Id: yp.x,v 1.5 1996/02/26 02:22:53 wpaul Exp $"; %#endif /* not lint */ #endif diff --git a/include/rpcsvc/yp_prot.h b/include/rpcsvc/yp_prot.h index a518e64298e0..df6ba75c64c1 100644 --- a/include/rpcsvc/yp_prot.h +++ b/include/rpcsvc/yp_prot.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: yp_prot.h,v 1.7 1997/05/07 02:27:17 eivind Exp $ + * $Id: yp_prot.h,v 1.4 1996/12/30 14:01:08 peter Exp $ */ #ifndef _RPCSVC_YP_PROT_H_ diff --git a/include/rpcsvc/ypclnt.h b/include/rpcsvc/ypclnt.h index 5278e574747d..a0de83857296 100644 --- a/include/rpcsvc/ypclnt.h +++ b/include/rpcsvc/ypclnt.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ypclnt.h,v 1.7 1997/05/07 02:27:18 eivind Exp $ + * $Id: ypclnt.h,v 1.4 1996/12/30 14:01:12 peter Exp $ */ #ifndef _RPCSVC_YPCLNT_H_ diff --git a/include/rpcsvc/yppasswd.x b/include/rpcsvc/yppasswd.x index b304fdac6569..c1505b31a19f 100644 --- a/include/rpcsvc/yppasswd.x +++ b/include/rpcsvc/yppasswd.x @@ -36,7 +36,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)yppasswd.x 1.1 87/04/13 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: @(#)yppasswd.x 2.1 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id$"; +%static char rcsid[] = "$Id: yppasswd.x,v 1.1 1994/08/04 19:01:57 wollman Exp $"; %#endif /* not lint */ #endif @@ -67,3 +67,8 @@ struct yppasswd { }; +#ifdef RPC_HDR +%#include +%extern int _yppasswd __P(( char * , struct x_passwd * )); +%#define yppasswd(x,y) _yppasswd(x,y) +#endif diff --git a/include/rpcsvc/ypxfrd.x b/include/rpcsvc/ypxfrd.x index f9aba45bf3b0..f51a1b94649c 100644 --- a/include/rpcsvc/ypxfrd.x +++ b/include/rpcsvc/ypxfrd.x @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: ypxfrd.x,v 1.2 1996/07/04 02:08:17 wpaul Exp $ */ /* @@ -68,7 +68,7 @@ #ifndef RPC_HDR %#ifndef lint -%static const char rcsid[] = "$Id$"; +%static const char rcsid[] = "$Id: ypxfrd.x,v 1.2 1996/07/04 02:08:17 wpaul Exp $"; %#endif /* not lint */ #endif