Resolve conflicts.
This commit is contained in:
Bill Paul
parent
4728e9f6ac
commit
9bd1654ae3
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=26208
@ -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} \
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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<MAXUSERS>;
|
||||
|
||||
typedef utmpidle utmpidlearr<MAXUSERS>;
|
||||
|
||||
const RUSERS_MAXUSERLEN = 32;
|
||||
const RUSERS_MAXLINELEN = 32;
|
||||
const RUSERS_MAXHOSTLEN = 257;
|
||||
|
||||
struct rusers_utmp {
|
||||
string ut_user<RUSERS_MAXUSERLEN>; /* aka ut_name */
|
||||
string ut_line<RUSERS_MAXLINELEN>; /* device */
|
||||
string ut_host<RUSERS_MAXHOSTLEN>; /* 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;
|
||||
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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 */
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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_
|
||||
|
||||
@ -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_
|
||||
|
||||
@ -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 <sys/cdefs.h>
|
||||
%extern int _yppasswd __P(( char * , struct x_passwd * ));
|
||||
%#define yppasswd(x,y) _yppasswd(x,y)
|
||||
#endif
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user