diff options
54 files changed, 359 insertions, 415 deletions
diff --git a/usr/src/cmd/keyserv/chkey.c b/usr/src/cmd/keyserv/chkey.c index b07a9457b0..1662749211 100644 --- a/usr/src/cmd/keyserv/chkey.c +++ b/usr/src/cmd/keyserv/chkey.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -1380,7 +1380,7 @@ addmechtolist(char *mechtype) } -void +int main(int argc, char **argv) { int c, mcount; @@ -1595,5 +1595,5 @@ main(int argc, char **argv) } else keylogin_des(); } - exit(0); + return (0); } diff --git a/usr/src/cmd/keyserv/chkey_common.c b/usr/src/cmd/keyserv/chkey_common.c index 1ee359b37e..cbe007a7df 100644 --- a/usr/src/cmd/keyserv/chkey_common.c +++ b/usr/src/cmd/keyserv/chkey_common.c @@ -232,6 +232,7 @@ no_switch_policy(struct __nsw_switchconfig *conf) return (conf == NULL || conf->lookups == NULL); } +int is_switch_policy(struct __nsw_switchconfig *conf, char *target) { return (conf && @@ -413,6 +414,7 @@ keylogin(char *netname, char *secret) * * write unencrypted secret key into root key file */ +void write_rootkey(char *secret) { char sbuf[HEXKEYBYTES+2]; diff --git a/usr/src/cmd/keyserv/detach.c b/usr/src/cmd/keyserv/detach.c index a5f75789bf..2ade5fd293 100644 --- a/usr/src/cmd/keyserv/detach.c +++ b/usr/src/cmd/keyserv/detach.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 1998 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -45,7 +45,8 @@ /* * detach from tty */ -detachfromtty() +void +detachfromtty(void) { int tt; diff --git a/usr/src/cmd/keyserv/domainname.c b/usr/src/cmd/keyserv/domainname.c index 1ebc8ef56e..21cff97bd3 100644 --- a/usr/src/cmd/keyserv/domainname.c +++ b/usr/src/cmd/keyserv/domainname.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -47,9 +47,8 @@ char domainname[256]; -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { int myerrno = 0; errno = 0; @@ -69,6 +68,5 @@ main(argc, argv) printf("%s\n", domainname); } } - exit(myerrno); - /* NOTREACHED */ + return (myerrno); } diff --git a/usr/src/cmd/keyserv/keylogin.c b/usr/src/cmd/keyserv/keylogin.c index 2b704a1a31..2b1adbf206 100644 --- a/usr/src/cmd/keyserv/keylogin.c +++ b/usr/src/cmd/keyserv/keylogin.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 1998 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -315,9 +315,8 @@ usage(cmd) } -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { char secret[4096]; char fullname[MAXNETNAMELEN + 1]; @@ -401,5 +400,5 @@ main(argc, argv) } else exit(oldkeylogin(fullname, pass)); - exit(0); + return (0); } diff --git a/usr/src/cmd/keyserv/keylogout.c b/usr/src/cmd/keyserv/keylogout.c index 6daa139eb7..f2456512ce 100644 --- a/usr/src/cmd/keyserv/keylogout.c +++ b/usr/src/cmd/keyserv/keylogout.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 1997 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -53,9 +53,8 @@ extern int key_removesecret_g(); /* for revoking kernel NFS credentials */ struct nfs_revauth_args nra; -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { static char secret[HEXKEYBYTES + 1]; int err = 0; @@ -91,6 +90,5 @@ main(argc, argv) err = 1; } - exit(err); - /* NOTREACHED */ + return (err); } diff --git a/usr/src/cmd/keyserv/keyserv.c b/usr/src/cmd/keyserv/keyserv.c index 90eecf4f30..0adc9e5140 100644 --- a/usr/src/cmd/keyserv/keyserv.c +++ b/usr/src/cmd/keyserv/keyserv.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -156,9 +156,8 @@ static int default_cache = 1; int *cache_size; char **cache_options; -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { int sflag = 0, s1flag = 0, s2flag = 0, nflag = 0, dflag = 0, eflag = 0; char *options, *value; @@ -169,7 +168,7 @@ main(argc, argv) int mode = RPC_SVC_MT_AUTO; int maxrecsz = RPC_MAXDATASIZE; - int detachfromtty(); + void detachfromtty(void); int setmodulus(); int pk_nodefaultkeys(); int svc_create_local_service(); @@ -539,7 +538,7 @@ getotherrootkeys(char *name) * from standard input. * Returns 1 on success. */ -static +static int getrootkey(master, prompt) des_block *master; int prompt; diff --git a/usr/src/cmd/keyserv/newkey.c b/usr/src/cmd/keyserv/newkey.c index e746705d32..93861cc0af 100644 --- a/usr/src/cmd/keyserv/newkey.c +++ b/usr/src/cmd/keyserv/newkey.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -82,10 +82,10 @@ static char YPDBPATH[] = "/var/yp"; static char PKMAP[] = "publickey.byname"; static char UPDATEFILE[] = "updaters"; static char PKFILE[] = "/etc/publickey"; +static void usage(void); -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { char name[MAXNETNAMELEN + 1]; char public[HEXKEYBYTES + 1]; @@ -259,13 +259,13 @@ main(argc, argv) } exit(1); } - exit(0); - /* NOTREACHED */ + return (0); } /* * Set the entry in the public key file */ +int setpublicmap(name, public, secret, database, nis_princ, pw) int database; char *name; @@ -322,7 +322,8 @@ setpublicmap(name, public, secret, database, nis_princ, pw) return (1); } -usage() +void +usage(void) { (void) fprintf(stderr, "usage:\t%s -u username [-s ldap | nisplus | nis | files]\n", diff --git a/usr/src/cmd/keyserv/setkey.c b/usr/src/cmd/keyserv/setkey.c index 0b493f82b6..39ac5dfaef 100644 --- a/usr/src/cmd/keyserv/setkey.c +++ b/usr/src/cmd/keyserv/setkey.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 1998 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -631,6 +631,7 @@ storeotherrootkeys(FILE *fp, char *netname, char *passwd, char *osecret) /* * prohibit the nobody key on this machine k (the -d flag) */ +int pk_nodefaultkeys() { nodefaultkeys = 1; @@ -686,6 +687,7 @@ pk_clear3(uid_t uid) /* * Set the modulus for all our Diffie-Hellman operations */ +int setmodulus(modx) char *modx; { @@ -1157,7 +1159,7 @@ pk_netget3(uid_t uid, mechtype *net, key_netstarg3 *ret) /* * Try to find the common key in the cache */ -static +static int readcache(pub, sec, deskey, hash) char *pub; char *sec; @@ -1178,7 +1180,7 @@ readcache(pub, sec, deskey, hash) /* * cache result of expensive multiple precision exponential operation */ -static +static int writecache(pub, sec, deskey, hash) char *pub; char *sec; @@ -1204,7 +1206,7 @@ writecache(pub, sec, deskey, hash) * Choose middle 64 bits of the common key to use as our des key, possibly * overwriting the lower order bits by setting parity. */ -static +static int extractdeskey(ck, deskey) MINT *ck; des_block *deskey; @@ -1698,7 +1700,7 @@ pk_get_conv_key(uid, pubkey, result) /* * Remove common keys from the cache. */ -static +static int removecache(sec) char *sec; { @@ -1727,6 +1729,7 @@ removecache(sec) /* * Store the secretkey for this uid */ +int storesecretkey(uid, key) uid_t uid; keybuf key; @@ -1767,13 +1770,14 @@ storesecretkey(uid, key) return (1); } -static +static int hexdigit(val) int val; { return ("0123456789abcdef"[val]); } +int bin2hex(bin, hex, size) unsigned char *bin; unsigned char *hex; @@ -1788,7 +1792,7 @@ bin2hex(bin, hex, size) return (0); } -static +static int hexval(dig) char dig; { @@ -1803,6 +1807,7 @@ hexval(dig) } } +int hex2bin(hex, bin, size) unsigned char *hex; unsigned char *bin; diff --git a/usr/src/cmd/rpcsvc/nis/bin/nisadm.c b/usr/src/cmd/rpcsvc/nis/bin/nisadm.c index 8c481d4a5f..941068443f 100644 --- a/usr/src/cmd/rpcsvc/nis/bin/nisadm.c +++ b/usr/src/cmd/rpcsvc/nis/bin/nisadm.c @@ -20,10 +20,8 @@ * CDDL HEADER END */ /* - * nisadm.c - * - * Copyright (c) 1988-1992 Sun Microsystems Inc - * All Rights Reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -143,11 +141,10 @@ getname(buf, len) /* * Convert two hex digits to one unsigned char byte. */ -static u_char -getbyte(bp) - u_char *bp; +static uchar_t +getbyte(uchar_t *bp) { - u_char nyb, val; + uchar_t nyb, val; nyb = LOWER(*bp); if (nyb >= 'a') @@ -184,13 +181,8 @@ getbyte(bp) * in the 'type' variable. All of it's queries go to stdin. */ nis_object * -nis_get_object(name, group, owner, rights, ttl, type) - char *name; - char *group; - char *owner; - u_long rights; - u_long ttl; - zotypes type; +nis_get_object(char *name, char *group, char *owner, + ulong_t rights, ulong_t ttl, zotypes type) { /* * These variables define a string buffer array that is used @@ -205,7 +197,7 @@ nis_get_object(name, group, owner, rights, ttl, type) char *t; /* temporary */ nis_object *obj, tmp; int np, i, j; - u_long flags; + ulong_t flags; obj_defaults *ob_data = __get_obj_defaults(); link_obj *li; directory_obj *di; @@ -222,9 +214,9 @@ nis_get_object(name, group, owner, rights, ttl, type) if (!name) return (NULL); } - s = (char *) nis_leaf_of(name); + s = (char *)nis_leaf_of(name); if (s) - strcpy(bp, s); + strcpy(bp, s); else strcpy(bp, "<none>"); @@ -475,7 +467,7 @@ nis_get_object(name, group, owner, rights, ttl, type) for (i = 0; i < np; i++) { entry_col *ec; - u_char *val; + uchar_t *val; int len; ec = &(ob_data->ecols[i]); @@ -498,8 +490,8 @@ nis_get_object(name, group, owner, rights, ttl, type) } ec->ec_flags = flags; printf("\tValue : "); - val = (u_char *)ask(&bp, &bl); - len = strlen((char *) val)+1; + val = (uchar_t *)ask(&bp, &bl); + len = strlen((char *)val)+1; if (flags & EN_BINARY) { for (j = 0; j < len; j += 2) *(val + (j>>1)) = @@ -520,7 +512,7 @@ nis_get_object(name, group, owner, rights, ttl, type) tmp.zo_data.objdata_u.po_data.po_data_val = bp; for (j = 0; j < i; j++) { xask(tmpval); - *(bp+j) = getbyte(tmpval); + *(bp+j) = getbyte((uchar_t *)tmpval); } break; @@ -655,8 +647,8 @@ get_obj(name, type, f) * Attempt to actually create the directories for a particular * dir object. */ -make_directory(obj) - nis_object *obj; +static void +make_directory(nis_object *obj) { directory_obj *da; nis_server *srvs; @@ -676,8 +668,8 @@ make_directory(obj) * Attempt to actually remove the directories for a particular * dir object. */ -remove_dir(obj) - nis_object *obj; +static void +remove_dir(nis_object *obj) { directory_obj *da; nis_server *srvs; @@ -717,15 +709,15 @@ make_name(name, domain) /* * Main code for the nisadm command */ -main(argc, argv) - int argc; - char *argv[]; + +int +main(int argc, char *argv[]) { enum op_todo op = PRINT; /* Operation to perform */ zotypes obj_type = 0; /* Object "type" to use */ ib_request req; /* Request to use */ int stats = FALSE; /* Print statistics */ - u_long flags = 0, /* Lookup flags */ + ulong_t flags = 0, /* Lookup flags */ err = 0; /* errors encountered */ int interact = FALSE, /* Interactive input */ prettyprint = FALSE; /* Print in ASCII text */ @@ -1068,5 +1060,5 @@ main(argc, argv) if (! prettyprint) xdr_destroy(&out_xdrs); - exit(err); + return (err); } diff --git a/usr/src/cmd/rpcsvc/nis/bin/nisctl.c b/usr/src/cmd/rpcsvc/nis/bin/nisctl.c index 1c541a0437..8fd5d096e5 100644 --- a/usr/src/cmd/rpcsvc/nis/bin/nisctl.c +++ b/usr/src/cmd/rpcsvc/nis/bin/nisctl.c @@ -20,10 +20,8 @@ * CDDL HEADER END */ /* - * nisctl.c - * - * Copyright (c) 1988-1992 Sun Microsystems Inc - * All Rights Reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -45,6 +43,7 @@ extern char *optarg; nis_tag mytags[64]; +static void usage(s) char *s; { @@ -61,9 +60,8 @@ usage(s) exit(1); } -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { int c; int i; @@ -218,5 +216,5 @@ main(argc, argv) nis_freetags(res, i); } nis_freeservlist(srvs); - exit(0); + return (0); } diff --git a/usr/src/cmd/rpcsvc/nis/bin/nisping.c b/usr/src/cmd/rpcsvc/nis/bin/nisping.c index dab6f7ff4b..1877af146d 100644 --- a/usr/src/cmd/rpcsvc/nis/bin/nisping.c +++ b/usr/src/cmd/rpcsvc/nis/bin/nisping.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -41,7 +41,7 @@ #include <rpcsvc/nis.h> #include <sys/time.h> -extern void __nis_pingproc(nis_server *, nis_name, u_long); +extern void __nis_pingproc(nis_server *, nis_name, ulong_t); extern bool_t xdr_nis_name(); extern bool_t xdr_cp_result(); @@ -92,8 +92,8 @@ nis_checkpnt(srv, name) tv.tv_sec = 10; tv.tv_usec = 0; - status = clnt_call(clnt, NIS_CHECKPOINT, xdr_nis_name, (char *) &name, - xdr_cp_result, (char *) &res, tv); + status = clnt_call(clnt, NIS_CHECKPOINT, xdr_nis_name, (char *)&name, + xdr_cp_result, (char *)&res, tv); if (status != RPC_SUCCESS) { printf("nisping: RPC error on server %s, error %s\n", srv->name, clnt_sperrno(status)); @@ -113,7 +113,7 @@ static nis_error nis_cptime(srv, name, utime) nis_server *srv; nis_name name; - u_long *utime; + ulong_t *utime; { CLIENT *clnt; enum clnt_stat status; @@ -131,8 +131,8 @@ nis_cptime(srv, name, utime) /* Only wait 10 seconds */ tv.tv_sec = 10; tv.tv_usec = 0; - status = clnt_call(clnt, NIS_CPTIME, xdr_nis_name, (char *) &name, - xdr_u_long, (char *) utime, tv); + status = clnt_call(clnt, NIS_CPTIME, xdr_nis_name, (char *)&name, + xdr_u_long, (char *)utime, tv); res = (status != RPC_SUCCESS) ? NIS_RPCERROR : NIS_SUCCESS; clnt_destroy(clnt); return (res); @@ -164,10 +164,8 @@ match_host(char *host, char *target) extern int optind; extern char *optarg; - -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { nis_server *srvs; nis_object *obj; @@ -175,7 +173,7 @@ main(argc, argv) int i, ns, force = 0, uponly = 0; int checkpoint_all = 0; int chkpnt = 0; - u_long updtm, reptm; + ulong_t updtm, reptm; nis_error status; nis_name domain; char dname[1024], obj_desc[1024]; @@ -351,5 +349,5 @@ main(argc, argv) exit(PING_NONE); if (successes < tries) exit(PING_SOME); - exit(PING_SUCCESS); + return (PING_SUCCESS); } diff --git a/usr/src/cmd/rpcsvc/nis/bin/nisshowcache.c b/usr/src/cmd/rpcsvc/nis/bin/nisshowcache.c index f73c65ef9e..6ceaed9b27 100644 --- a/usr/src/cmd/rpcsvc/nis/bin/nisshowcache.c +++ b/usr/src/cmd/rpcsvc/nis/bin/nisshowcache.c @@ -20,10 +20,8 @@ * CDDL HEADER END */ /* - * nisshowcache.c - * - * Copyright (c) 1988-1995 Sun Microsystems, Inc. - * All Rights Reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -50,7 +48,7 @@ union semun { int val; struct semid_ds *buf; - ushort *array; + ushort_t *array; }; #endif /* _sys_sem_h */ @@ -67,7 +65,7 @@ usage(char *name) /* dump the context cache on the system */ -void +int main(int argc, char *argv[]) { extern int __nis_debuglevel; @@ -118,7 +116,7 @@ main(int argc, char *argv[]) __nis_CachePrint(); - exit(0); + return (0); } @@ -148,8 +146,8 @@ static void __nis_print_sems(int sem_writer, int sem_reader) { int i; - ushort w_array[NIS_W_NSEMS]; - ushort r_array[NIS_R_NSEMS]; + ushort_t w_array[NIS_W_NSEMS]; + ushort_t r_array[NIS_R_NSEMS]; union semun semarg; diff --git a/usr/src/cmd/rpcsvc/nis/bin/nisstat.c b/usr/src/cmd/rpcsvc/nis/bin/nisstat.c index 87b352b69b..694b8788ff 100644 --- a/usr/src/cmd/rpcsvc/nis/bin/nisstat.c +++ b/usr/src/cmd/rpcsvc/nis/bin/nisstat.c @@ -20,10 +20,8 @@ * CDDL HEADER END */ /* - * nisstat.c - * - * Copyright (c) 1988-1992 Sun Microsystems Inc - * All Rights Reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -143,9 +141,8 @@ match_host(char *host, char *target) return (0); } -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { nis_server *servers; nis_error status; @@ -254,5 +251,5 @@ main(argc, argv) } } nis_freeresult(lres); - exit(0); + return (0); } diff --git a/usr/src/cmd/rpcsvc/nis/bin/nisupdkeys.c b/usr/src/cmd/rpcsvc/nis/bin/nisupdkeys.c index 73543d706b..80f0af7907 100644 --- a/usr/src/cmd/rpcsvc/nis/bin/nisupdkeys.c +++ b/usr/src/cmd/rpcsvc/nis/bin/nisupdkeys.c @@ -20,10 +20,8 @@ * CDDL HEADER END */ /* - * nisupdkeys.c - * - * Copyright (c) 1988-1995 Sun Microsystems, Inc. - * All Rights Reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -370,9 +368,8 @@ updaddrdata(h, ns, srvs) #define CLR_KEYS 1 #define UPD_ADDR 2 -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { char dname[NIS_MAXNAMELEN]; char *server = NULL; diff --git a/usr/src/cmd/rpcsvc/nis/cachemgr/cachemgr.c b/usr/src/cmd/rpcsvc/nis/cachemgr/cachemgr.c index efc5804303..3d77e903fb 100644 --- a/usr/src/cmd/rpcsvc/nis/cachemgr/cachemgr.c +++ b/usr/src/cmd/rpcsvc/nis/cachemgr/cachemgr.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -97,6 +97,7 @@ static void usage(name) exit(1); } +int main(int argc, char **argv) { int c; @@ -262,7 +263,7 @@ main(int argc, char **argv) do_timers(); my_svc_run(); syslog(LOG_ERR, "svc_run() returned"); - exit(1); + return (1); } static void set_file_ownership(char *file) @@ -418,29 +419,37 @@ create_ti_server() void * nis_cache_add_entry_2() { + static void *result; if (mgr_verbose) syslog(LOG_INFO, "nis_cache_add_entry"); + return (&result); } void * nis_cache_remove_entry_2() { + static void *result; if (mgr_verbose) syslog(LOG_INFO, "nis_cache_remove_entry"); + return (&result); } void * nis_cache_read_coldstart_2() { + static void *result; if (mgr_verbose) syslog(LOG_INFO, "nis_cache_read_coldstart"); + return (&result); } void * nis_cache_refresh_entry_2() { + static void *result; if (mgr_verbose) syslog(LOG_INFO, "nis_cache_refresh_entry"); + return (&result); } nis_error * diff --git a/usr/src/cmd/rpcsvc/nis/rpc.nisd/Makefile b/usr/src/cmd/rpcsvc/nis/rpc.nisd/Makefile index ff21cc810f..9573df097c 100644 --- a/usr/src/cmd/rpcsvc/nis/rpc.nisd/Makefile +++ b/usr/src/cmd/rpcsvc/nis/rpc.nisd/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -51,10 +51,6 @@ SRCS= \ OBJS= $(SRV_OBJS) $(INIT_OBJS) PROG= nisinit rpc.nisd nislog nisldapmaptest -# XX64 rpc.nisd nislog nisldapmaptest all require C++ -__GNUC:sh= echo \\043 -$(__GNUC)PROG= nisinit - DERIVED_FILES= nis_svc.h CLEANFILES += $(DERIVED_FILES) diff --git a/usr/src/cmd/rpcsvc/nis/rpc.nisd/nis_db.c b/usr/src/cmd/rpcsvc/nis/rpc.nisd/nis_db.c index 29bf6defab..8a01d0eafa 100644 --- a/usr/src/cmd/rpcsvc/nis/rpc.nisd/nis_db.c +++ b/usr/src/cmd/rpcsvc/nis/rpc.nisd/nis_db.c @@ -20,8 +20,8 @@ * CDDL HEADER END */ /* - * Copyright (c) 1990-2001 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -74,6 +74,7 @@ int storeDone(__nisdb_retry_t *storeRetry, extern db_result *__db_add_entry_nosync(char *, int, nis_attr *, entry_obj *); extern db_result *__db_remove_entry_nosync(char *, int, nis_attr *); extern db_result *__db_add_entry_nolog(char *, int, nis_attr *, entry_obj *); +static int clear_checkpoint_list_nolock(void); typedef struct table_list_entry { char *table; @@ -2929,7 +2930,7 @@ checkpoint_table(char *name) * Remove all items from checkpoint list. List must be locked by caller. */ static int -clear_checkpoint_list_nolock() +clear_checkpoint_list_nolock(void) { ping_item *cp, *nxt; diff --git a/usr/src/cmd/rpcsvc/nis/rpc.nisd/nis_log_common.c b/usr/src/cmd/rpcsvc/nis/rpc.nisd/nis_log_common.c index 001f4ec599..c72ea903f9 100644 --- a/usr/src/cmd/rpcsvc/nis/rpc.nisd/nis_log_common.c +++ b/usr/src/cmd/rpcsvc/nis/rpc.nisd/nis_log_common.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -66,7 +66,7 @@ static int pagesize = 0; int in_checkpoint = FALSE; int need_checkpoint = 0; extern NIS_HASH_TABLE old_stamp_list; -extern void add_updatetime(); +static void add_updatetime(); #define invalid_directory (__nis_get_tsd()->invalid_directory) static log_upd *last_upd_p; /* tmp ptr used during delta updates */ diff --git a/usr/src/cmd/rpcsvc/nis/rpc.nisd/nis_main.c b/usr/src/cmd/rpcsvc/nis/rpc.nisd/nis_main.c index 49c2170331..4a41a1dfcc 100644 --- a/usr/src/cmd/rpcsvc/nis/rpc.nisd/nis_main.c +++ b/usr/src/cmd/rpcsvc/nis/rpc.nisd/nis_main.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 1990-2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -681,10 +681,8 @@ set_rpc_gss_svc_names() } } -void -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { int status = 0, i, c; nis_object *rootobj; @@ -1317,8 +1315,7 @@ main(argc, argv) } rpcb_unset(NIS_PROG, NIS_VERSION, NULL); - if (emulate_yp) - { + if (emulate_yp) { rpcb_unset(YPPROG, YPVERS, NULL); rpcb_unset(YPPROG, YPVERS_ORIG, NULL); } @@ -1376,6 +1373,8 @@ main(argc, argv) svc_run(); /* Not reached */ } + + return (0); } int diff --git a/usr/src/cmd/rpcsvc/nis/rpc.nisd/nis_subr_proc.c b/usr/src/cmd/rpcsvc/nis/rpc.nisd/nis_subr_proc.c index fe37b2de17..9948942d96 100644 --- a/usr/src/cmd/rpcsvc/nis/rpc.nisd/nis_subr_proc.c +++ b/usr/src/cmd/rpcsvc/nis/rpc.nisd/nis_subr_proc.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -72,7 +72,7 @@ extern void __nis_destroy_callback(); extern nis_result *nis_iblist_svc(), *nis_lookup_svc(); extern CLIENT *__nis_get_server(directory_obj *, int); extern fd_result *__fd_res(nis_name, nis_error, directory_obj*); -extern nis_result *__nis_remote_lookup(ib_request *req, u_long flags, +extern nis_result *__nis_remote_lookup(ib_request *req, ulong_t flags, int list_op, void *cbdata, int (*cback)()); extern fd_result *__nis_finddirectory_remote(nis_bound_directory **binding, char *dname); @@ -87,7 +87,7 @@ extern FILE *cons; fd_result *dup_fdres(fd_result *, fd_result *); static nis_error apply_update(log_entry *); -static struct directory_item { +struct directory_item { NIS_HASH_ITEM dl_item; /* Generic ITEM tag */ nis_object *dl_obj; /* Directory object */ ulong_t dl_expires; /* Expiration time */ @@ -385,7 +385,7 @@ void add_pingitem_with_name(buf, dir, ptime, tbl) char *buf; nis_object *dir; - u_long ptime; + ulong_t ptime; NIS_HASH_TABLE *tbl; { ping_item *pp; @@ -462,7 +462,7 @@ add_pingitem_with_name(buf, dir, ptime, tbl) void add_pingitem(dir, ptime, tbl) nis_object *dir; - u_long ptime; + ulong_t ptime; NIS_HASH_TABLE *tbl; { char buf[1024]; @@ -485,7 +485,7 @@ add_pingitem(dir, ptime, tbl) struct reset_dl_expires_args { nis_name master; - u_long expiry; + ulong_t expiry; }; static bool_t @@ -2942,7 +2942,7 @@ ping_replicas(pung) nis_result * __nis_local_lookup(req, flags, list_op, cbdata, cback) ib_request *req; /* name parameters */ - u_long flags; /* user flags */ + ulong_t flags; /* user flags */ int list_op; /* list semantics */ void *cbdata; /* Callback data */ int (*cback)(); /* Callback (for list calls) */ @@ -3025,7 +3025,7 @@ __nis_local_lookup(req, flags, list_op, cbdata, cback) int we_serve(srv, flags) directory_obj *srv; - u_long flags; + ulong_t flags; { nis_server *servers; int ns, i; @@ -3061,7 +3061,7 @@ we_serve(srv, flags) nis_result * __nis_core_lookup(req, flags, list_op, cbdata, cback) ib_request *req; /* name parameters */ - u_long flags; /* user flags */ + ulong_t flags; /* user flags */ int list_op; /* list semantics */ void *cbdata; /* Callback data */ int (*cback)(); /* Callback (for list calls) */ diff --git a/usr/src/cmd/rpcsvc/nis/rpc.nisd/nisinit.c b/usr/src/cmd/rpcsvc/nis/rpc.nisd/nisinit.c index e292596653..d960fa7968 100644 --- a/usr/src/cmd/rpcsvc/nis/rpc.nisd/nisinit.c +++ b/usr/src/cmd/rpcsvc/nis/rpc.nisd/nisinit.c @@ -20,10 +20,8 @@ * CDDL HEADER END */ /* - * nisinit.c - * - * Copyright (c) 1991-1999 by Sun Microsystems, Inc. - * All Rights Reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -242,10 +240,8 @@ usage(s) enum make_op {MAKE_NONE, MAKE_ROOT, MAKE_PARENT, MAKE_CLIENT }; enum obj_src {SRC_NONE, SRC_BCAST, SRC_MCAST, SRC_CSTART, SRC_HNAME }; -void -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { enum clnt_stat dummy; /* rc for rpc_broadcast() */ int c; /* Option character */ @@ -742,5 +738,5 @@ main(argc, argv) usage(argv[0]); } printf("All done.\n"); - exit(0); + return (0); } diff --git a/usr/src/cmd/rpcsvc/nis/rpc.nisd/nislog.c b/usr/src/cmd/rpcsvc/nis/rpc.nisd/nislog.c index 3a0f8c125e..1072443d35 100644 --- a/usr/src/cmd/rpcsvc/nis/rpc.nisd/nislog.c +++ b/usr/src/cmd/rpcsvc/nis/rpc.nisd/nislog.c @@ -18,8 +18,9 @@ * information: Portions Copyright [yyyy] [name of copyright owner] * * CDDL HEADER END - * - * Copyright 2001 Sun Microsystems, Inc. All rights reserved. + */ +/* + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -133,8 +134,8 @@ buserr_exit() exit(0); } -usage(s) - char *s; +void +usage(char *s) { if ((strcmp(s, "loghead") == 0) || (strcmp(s, "logtail") == 0)) fprintf(stderr, "usage: nislog %s [-v] num\n", s); @@ -145,9 +146,8 @@ usage(s) char *directories[128]; -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { log_upd *cur; char **dir; @@ -171,7 +171,7 @@ main(argc, argv) * arguments a bit, any other name and we default to * "nislog" behaviour. */ - cmd = (char *) strrchr(argv[0], '/'); + cmd = (char *)strrchr(argv[0], '/'); if (! cmd) cmd = argv[0]; if ((strcmp(cmd, "logtail") == 0) || @@ -286,5 +286,5 @@ main(argc, argv) } dir++; } while (*dir != NULL); - exit(0); + return (0); } diff --git a/usr/src/cmd/rpcsvc/nis/rpc.nisd/resolv_server/main.c b/usr/src/cmd/rpcsvc/nis/rpc.nisd/resolv_server/main.c index 36931ee5cf..cee55cd9a1 100644 --- a/usr/src/cmd/rpcsvc/nis/rpc.nisd/resolv_server/main.c +++ b/usr/src/cmd/rpcsvc/nis/rpc.nisd/resolv_server/main.c @@ -20,8 +20,8 @@ * CDDL HEADER END */ /* - * Copyright (c) 1993-2000 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -139,6 +139,7 @@ void_close(void *use_fdp, int fd) return (0); } +int main(int argc, char *argv[]) { int i; diff --git a/usr/src/cmd/rpcsvc/nis/rpc.nisd/resolv_server/nres_search.c b/usr/src/cmd/rpcsvc/nis/rpc.nisd/resolv_server/nres_search.c index 8c0bc2005b..ad131da544 100644 --- a/usr/src/cmd/rpcsvc/nis/rpc.nisd/resolv_server/nres_search.c +++ b/usr/src/cmd/rpcsvc/nis/rpc.nisd/resolv_server/nres_search.c @@ -20,8 +20,8 @@ * CDDL HEADER END */ /* - * Copyright (c) 1993,1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -47,6 +47,7 @@ static void nres_querydomain(char *, char *, char *); static char *nres_hostalias(char *); +int nres_search(struct nres *block) { register char *cp, *domain; diff --git a/usr/src/cmd/rpcsvc/nis/rpc.nisd/resolv_server/nres_send.c b/usr/src/cmd/rpcsvc/nis/rpc.nisd/resolv_server/nres_send.c index 98a4a5a3e9..1d0882b618 100644 --- a/usr/src/cmd/rpcsvc/nis/rpc.nisd/resolv_server/nres_send.c +++ b/usr/src/cmd/rpcsvc/nis/rpc.nisd/resolv_server/nres_send.c @@ -20,8 +20,8 @@ * CDDL HEADER END */ /* - * Copyright (c) 1993-1999 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -49,7 +49,7 @@ #include "nres.h" #include "prnt.h" - +int nres_xmit(struct nres *tnr) { char *buf; diff --git a/usr/src/cmd/rpcsvc/nis/rpc.nisd/yp_ns_proc.c b/usr/src/cmd/rpcsvc/nis/rpc.nisd/yp_ns_proc.c index 4a80c02d16..f2fbff4fb4 100644 --- a/usr/src/cmd/rpcsvc/nis/rpc.nisd/yp_ns_proc.c +++ b/usr/src/cmd/rpcsvc/nis/rpc.nisd/yp_ns_proc.c @@ -79,6 +79,10 @@ extern nis_object *nis_return_list(nis_object *, extern nis_object *nis_censor_object(nis_object *, table_col *, nis_name); +static void cook_err_resp(struct ypresp_val *resp, long stat); +static void cook_err_keyresp(struct ypresp_key_val *keyresp, long stat); +static int get_keyndx(table_obj *t_obj, char *col_val); + extern int resolv_flag; extern int resolv_pid; extern CLIENT *resolv_client; @@ -512,7 +516,7 @@ ypproc_match_svc(req, rqstp) * produced. */ if (strcmp(column, DEFAULTKEY) == 0) { - if (get_keyndx(dbres->obj->TA_data, column) < 0) { + if (get_keyndx(&(dbres->obj->TA_data), column) < 0) { syslog(LOG_INFO, "%s is not explicitly supported in YP " "compatibility mode. Unsupported NIS+ tables " @@ -1636,20 +1640,16 @@ upcase(s) * Following cook_* routines are very flimsy, and should be kept static. */ -static -cook_err_resp(resp, stat) - struct ypresp_val *resp; - long stat; +static void +cook_err_resp(struct ypresp_val *resp, long stat) { resp->status = stat; resp->valdat.dptr = NULL; resp->valdat.dsize = 0; } -static -cook_err_keyresp(keyresp, stat) - struct ypresp_key_val *keyresp; - long stat; +static void +cook_err_keyresp(struct ypresp_key_val *keyresp, long stat) { keyresp->status = stat; keyresp->keydat.dptr = NULL; @@ -2041,9 +2041,7 @@ cook_an_ngroup(e, val, vallen) * indexing is 0 thro n and returns -1 on failure. */ static int -get_keyndx(t_obj, col_val) - table_obj *t_obj; - char *col_val; +get_keyndx(table_obj *t_obj, char *col_val) { int i; diff --git a/usr/src/cmd/rpcsvc/nis/rpc.nispasswdd/rpc.nispasswdd.c b/usr/src/cmd/rpcsvc/nis/rpc.nispasswdd/rpc.nispasswdd.c index 92f950d0ab..81c3cd9297 100644 --- a/usr/src/cmd/rpcsvc/nis/rpc.nispasswdd/rpc.nispasswdd.c +++ b/usr/src/cmd/rpcsvc/nis/rpc.nispasswdd/rpc.nispasswdd.c @@ -20,8 +20,8 @@ * CDDL HEADER END */ /* - * Copyright (c) 1994-2001 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -62,11 +62,8 @@ static void nispasswd_prog(struct svc_req *rqstp, register SVCXPRT *transp); static void yppasswd_prog(struct svc_req *rqstp, register SVCXPRT *transp); static void set_rpc_gss_svc_names(void); - -void -main(argc, argv) -int argc; -char **argv; +int +main(int argc, char *argv[]) { pid_t pid; int i; @@ -240,9 +237,8 @@ char **argv; __msgout("starting rpc.nispasswdd ..."); svc_run(); __msgout("svc_run returned"); - exit(1); - /* NOTREACHED */ + return (1); } static void diff --git a/usr/src/cmd/rpcsvc/nis/utils/Makefile b/usr/src/cmd/rpcsvc/nis/utils/Makefile index d04ff89a44..8eb93fdecc 100644 --- a/usr/src/cmd/rpcsvc/nis/utils/Makefile +++ b/usr/src/cmd/rpcsvc/nis/utils/Makefile @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -72,10 +72,6 @@ RESTORE_OBJS= nisrestore.o nis_log_common.o nis_mt.o nis_cleanup.o BKRSTPROG= $(BACKUP_PROG) $(RESTORE_PROG) -# XX64 nisrestore and nisbackup require C++ -__GNUC:sh= echo \\043 -$(__GNUC)BKRSTPROG= - DERIVED_FILES= ../rpc.nisd/nis_svc.h include ../../../Makefile.cmd diff --git a/usr/src/cmd/rpcsvc/nis/utils/nisaddcred/nisaddcred.c b/usr/src/cmd/rpcsvc/nis/utils/nisaddcred/nisaddcred.c index 110fde9654..ba2c2d0bd1 100644 --- a/usr/src/cmd/rpcsvc/nis/utils/nisaddcred/nisaddcred.c +++ b/usr/src/cmd/rpcsvc/nis/utils/nisaddcred/nisaddcred.c @@ -20,10 +20,8 @@ * CDDL HEADER END */ /* - * nisaddcred.c - * - * Copyright 1988-2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -493,10 +491,8 @@ init_entry() return (&obj); } -void -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { char *princ = NULL; char *nisprinc = NULL; @@ -660,7 +656,7 @@ main(argc, argv) perform_add(flavor, domain, nisprinc, princ); } else perform_remove(domain, nisprinc); - exit(0); + return (0); } /* diff --git a/usr/src/cmd/rpcsvc/nis/utils/nisaddent.c b/usr/src/cmd/rpcsvc/nis/utils/nisaddent.c index da972cd52f..4a883db8b0 100644 --- a/usr/src/cmd/rpcsvc/nis/utils/nisaddent.c +++ b/usr/src/cmd/rpcsvc/nis/utils/nisaddent.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 1988-2002 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -4914,9 +4914,8 @@ cleanup() } -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { char *defstr = 0, *ttype, *tname = 0, *ypdomain = 0, *ypmap = 0, *etcfile = 0; @@ -5222,5 +5221,5 @@ main(argc, argv) printf("%d entries removed\n", nent_del); } - exit(exit_val); + return (exit_val); } diff --git a/usr/src/cmd/rpcsvc/nis/utils/nisauthconf.c b/usr/src/cmd/rpcsvc/nis/utils/nisauthconf.c index 08f759eba0..1d71780e9f 100644 --- a/usr/src/cmd/rpcsvc/nis/utils/nisauthconf.c +++ b/usr/src/cmd/rpcsvc/nis/utils/nisauthconf.c @@ -20,15 +20,17 @@ * CDDL HEADER END */ /* + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + +#pragma ident "%Z%%M% %I% %E% SMI" + +/* * nisauthconf.c * * Configure NIS+ to use RPCSEC_GSS - * - * Copyright (c) 1997,1998 Sun Microsystems, Inc. - * All Rights Reserved. - * */ -#pragma ident "%Z%%M% %I% %E% SMI" #include <stdio.h> #include <stdlib.h> @@ -107,7 +109,7 @@ listmechs() if ((mechlist = __nis_get_mechanisms(FALSE)) == NULL) { mechlist = (mechanism_t **) malloc(sizeof (mechanism_t *) * 2); - mechlist[0] = (mechanism_t *) malloc(sizeof (mechanism_t)); + mechlist[0] = malloc(sizeof (mechanism_t)); mechlist[1] = NULL; mechlist[0]->mechname = NULL; @@ -153,7 +155,7 @@ usage(char *cmd) } -void +int main(int argc, char **argv) { int c, i, dolistmechs = 0; @@ -220,4 +222,5 @@ main(int argc, char **argv) } } (void) fclose(f); + return (0); } diff --git a/usr/src/cmd/rpcsvc/nis/utils/niscat.c b/usr/src/cmd/rpcsvc/nis/utils/niscat.c index ca46db0d77..5f9600d2bb 100644 --- a/usr/src/cmd/rpcsvc/nis/utils/niscat.c +++ b/usr/src/cmd/rpcsvc/nis/utils/niscat.c @@ -20,9 +20,7 @@ * CDDL HEADER END */ /* - * niscat.c - * - * Copyright 1988-2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -110,9 +108,8 @@ usage() exit(1); } -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { int c; unsigned flags = 0; @@ -280,5 +277,5 @@ main(argc, argv) nis_freeresult(tres); } - exit(error); + return (error); } diff --git a/usr/src/cmd/rpcsvc/nis/utils/nischmod.c b/usr/src/cmd/rpcsvc/nis/utils/nischmod.c index 823d9e1d77..8ab1e1d67c 100644 --- a/usr/src/cmd/rpcsvc/nis/utils/nischmod.c +++ b/usr/src/cmd/rpcsvc/nis/utils/nischmod.c @@ -20,9 +20,7 @@ * CDDL HEADER END */ /* - * nischmod.c - * - * Copyright 1988-2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -129,9 +127,8 @@ change_entry(name, ent, udata) } -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { int c; char **plist, **p; @@ -335,5 +332,5 @@ main(argc, argv) nis_freeresult(ores); } - exit(error); + return (error); } diff --git a/usr/src/cmd/rpcsvc/nis/utils/nisdefaults.c b/usr/src/cmd/rpcsvc/nis/utils/nisdefaults.c index bc90747d1b..0a89387944 100644 --- a/usr/src/cmd/rpcsvc/nis/utils/nisdefaults.c +++ b/usr/src/cmd/rpcsvc/nis/utils/nisdefaults.c @@ -20,22 +20,15 @@ * CDDL HEADER END */ /* - * nisdefaults.c - * - * Copyright (c) 1988-1992 Sun Microsystems Inc - * All Rights Reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" /* - * nisdefaults.c - * * A simple utility to tell you what the defaults are that will be * plugged into object creation. - * - * Copyright (c) 1992 Sun Microsystems Inc. - * All rights reserved. */ #include <stdio.h> @@ -44,6 +37,7 @@ extern int key_secretkey_is_set_g(); +static void usage(cmd) char *cmd; { @@ -66,13 +60,12 @@ extern char *optarg; extern nis_object nis_default_obj; -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { nis_name *result; int c; - u_long secs, days, hrs, mins; + ulong_t secs, days, hrs, mins; int i, verbose = 1, pa = 1, /* print everything */ ph = 0, /* print host */ @@ -199,5 +192,5 @@ main(argc, argv) } else printf("**NONE**\n"); } - exit(0); + return (0); } diff --git a/usr/src/cmd/rpcsvc/nis/utils/niserror.c b/usr/src/cmd/rpcsvc/nis/utils/niserror.c index 3eb1089ff4..17f6aee833 100644 --- a/usr/src/cmd/rpcsvc/nis/utils/niserror.c +++ b/usr/src/cmd/rpcsvc/nis/utils/niserror.c @@ -20,10 +20,8 @@ * CDDL HEADER END */ /* - * niserror.c - * - * Copyright (c) 1988-1992 Sun Microsystems Inc - * All Rights Reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -39,15 +37,15 @@ #include <ctype.h> #include <rpcsvc/nis.h> +static void usage() { fprintf(stderr, "usage: niserror error-num\n"); exit(1); } -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { nis_error err; @@ -59,5 +57,5 @@ main(argc, argv) err = (nis_error) atoi(argv[1]); printf("%s\n", nis_sperrno(err)); - exit(0); + return (0); } diff --git a/usr/src/cmd/rpcsvc/nis/utils/nisgrep.c b/usr/src/cmd/rpcsvc/nis/utils/nisgrep.c index b9d1dd0e41..ccf1764327 100644 --- a/usr/src/cmd/rpcsvc/nis/utils/nisgrep.c +++ b/usr/src/cmd/rpcsvc/nis/utils/nisgrep.c @@ -20,10 +20,8 @@ * CDDL HEADER END */ /* - * nisgrep.c - * - * Copyright (c) 1988-1992 Sun Microsystems Inc - * All Rights Reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -57,7 +55,7 @@ extern char *nisname_index(); struct pl_data { unsigned flags; char ta_sep; - u_long nmatch; + ulong_t nmatch; regex_t *re_dfa; int *dfa_set; /* dfa_set[i] set if re_dfa[i] is valid */ }; @@ -173,10 +171,8 @@ usage() exit(EXIT_ERROR); } -re_error(pattern, code, expr) - char *pattern; - int code; - regex_t *expr; +static void +re_error(char *pattern, int code, regex_t *expr) { char buf[80]; @@ -187,13 +183,12 @@ re_error(pattern, code, expr) pattern, buf); } -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { int c; int st; - u_long allres = 0, master = 0; + ulong_t allres = 0, master = 0; unsigned flags = 0; char *p; int npat, ncol, i, j; @@ -370,7 +365,7 @@ main(argc, argv) printf("%d\n", pld.nmatch); if (pld.nmatch) - exit(EXIT_MATCH); + return (EXIT_MATCH); else - exit(EXIT_NOMATCH); + return (EXIT_NOMATCH); } diff --git a/usr/src/cmd/rpcsvc/nis/utils/nisgrpadm.c b/usr/src/cmd/rpcsvc/nis/utils/nisgrpadm.c index f64bfe3b95..e4d8f7f5f0 100644 --- a/usr/src/cmd/rpcsvc/nis/utils/nisgrpadm.c +++ b/usr/src/cmd/rpcsvc/nis/utils/nisgrpadm.c @@ -20,10 +20,8 @@ * CDDL HEADER END */ /* - * nisgrpadm.c - * - * Copyright (c) 1988-1992 Sun Microsystems Inc - * All Rights Reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -50,7 +48,7 @@ extern bool_t nis_verifycred(); enum op_types {NONE, DELETE, CREATE, ADD, REMOVE, LIST, TEST}; -static u_long master = 0; +static ulong_t master = 0; bool_t nis_verifydomain(n) @@ -108,7 +106,7 @@ bool_t verify_principal(name) nis_name name; { - u_long flags; + ulong_t flags; if (name[0] == '-') name++; @@ -124,9 +122,9 @@ verify_principal(name) * Only if a random NIS+ server does not know about this, do we * force a connection to the Master server to avoid overloading it. */ - flags = (u_long)(USE_DGRAM | FOLLOW_LINKS | FOLLOW_PATH); + flags = (ulong_t)(USE_DGRAM | FOLLOW_LINKS | FOLLOW_PATH); return (nis_verifycred(name, flags) ? TRUE : - nis_verifycred(name, (u_long)(flags | MASTER_ONLY))); + nis_verifycred(name, (ulong_t)(flags | MASTER_ONLY))); } void @@ -141,9 +139,8 @@ usage() exit(1); } -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { char *defstr = 0; enum op_types op = NONE; @@ -436,7 +433,7 @@ main(argc, argv) } if (ostatus == NIS_SUCCESS) - exit(pstatus); + return (pstatus); else - exit(ostatus); + return (ostatus); } diff --git a/usr/src/cmd/rpcsvc/nis/utils/nisln.c b/usr/src/cmd/rpcsvc/nis/utils/nisln.c index 718a91af70..bf4c6a847c 100644 --- a/usr/src/cmd/rpcsvc/nis/utils/nisln.c +++ b/usr/src/cmd/rpcsvc/nis/utils/nisln.c @@ -20,9 +20,7 @@ * CDDL HEADER END */ /* - * nisln.c - * - * Copyright 1988-2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -53,9 +51,8 @@ usage() exit(1); } -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { int c; char *defstr = 0; @@ -177,5 +174,5 @@ main(argc, argv) exit(1); } - exit(0); + return (0); } diff --git a/usr/src/cmd/rpcsvc/nis/utils/nisls.c b/usr/src/cmd/rpcsvc/nis/utils/nisls.c index 870a840478..29a7048819 100644 --- a/usr/src/cmd/rpcsvc/nis/utils/nisls.c +++ b/usr/src/cmd/rpcsvc/nis/utils/nisls.c @@ -20,9 +20,7 @@ * CDDL HEADER END */ /* - * nisls.c - * - * Copyright 1988-2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -154,9 +152,8 @@ usage() exit(1); } -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { int c; ulong_t flinks = 0, master = 0; @@ -265,5 +262,5 @@ main(argc, argv) nis_freeresult(res); } - exit(error); + return (error); } diff --git a/usr/src/cmd/rpcsvc/nis/utils/nismatch.c b/usr/src/cmd/rpcsvc/nis/utils/nismatch.c index 56a0327184..8ba367c6d9 100644 --- a/usr/src/cmd/rpcsvc/nis/utils/nismatch.c +++ b/usr/src/cmd/rpcsvc/nis/utils/nismatch.c @@ -20,9 +20,7 @@ * CDDL HEADER END */ /* - * nismatch.c - * - * Copyright 1988-2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -121,9 +119,8 @@ usage() exit(EXIT_ERROR); } -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { int c; ulong_t fpath = 0, allres = 0, master = 0; @@ -328,7 +325,7 @@ main(argc, argv) printf("%d\n", pld.nmatch); if (pld.nmatch) - exit(EXIT_MATCH); + return (EXIT_MATCH); else - exit(EXIT_NOMATCH); + return (EXIT_NOMATCH); } diff --git a/usr/src/cmd/rpcsvc/nis/utils/nismkdir.c b/usr/src/cmd/rpcsvc/nis/utils/nismkdir.c index f7dcb5e8b7..645fb9c184 100644 --- a/usr/src/cmd/rpcsvc/nis/utils/nismkdir.c +++ b/usr/src/cmd/rpcsvc/nis/utils/nismkdir.c @@ -20,8 +20,8 @@ * CDDL HEADER END */ /* - * Copyright (c) 1988-1995,2001 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -441,10 +441,8 @@ usage() } -void -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { int c; int i; @@ -504,5 +502,5 @@ main(argc, argv) make_directory_replica(name, replicas[i]); } - exit(0); + return (0); } diff --git a/usr/src/cmd/rpcsvc/nis/utils/nispath.c b/usr/src/cmd/rpcsvc/nis/utils/nispath.c index 08617bb938..22c531bf75 100644 --- a/usr/src/cmd/rpcsvc/nis/utils/nispath.c +++ b/usr/src/cmd/rpcsvc/nis/utils/nispath.c @@ -20,10 +20,8 @@ * CDDL HEADER END */ /* - * nispath.c - * - * Copyright (c) 1988-1992 Sun Microsystems Inc - * All Rights Reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -47,9 +45,8 @@ usage(cmd) exit(1); } -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { nis_name *result; int i = 0; @@ -86,5 +83,5 @@ main(argc, argv) printf("\t"); printf("\"%s\"\n", result[i++]); } - exit(0); + return (0); } diff --git a/usr/src/cmd/rpcsvc/nis/utils/nisprefadm.c b/usr/src/cmd/rpcsvc/nis/utils/nisprefadm.c index fa7044a795..c5bd0dfc54 100644 --- a/usr/src/cmd/rpcsvc/nis/utils/nisprefadm.c +++ b/usr/src/cmd/rpcsvc/nis/utils/nisprefadm.c @@ -20,8 +20,8 @@ * CDDL HEADER END */ /* - * Copyright (c) 1996-1999 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -124,6 +124,7 @@ usage(char *s) exit(1); } +int main(int argc, char **argv) { int c; @@ -1584,7 +1585,7 @@ convert_old2new(server_list *servers, char *domain) void print_info(char *client, char *hosts, char *option) { - static first = 1; + static int first = 1; if (!(client && *client && hosts && *hosts && option)) return; @@ -1672,7 +1673,7 @@ print_local_servers(server_list *servers, char *target) int print_line(char *tab, nis_object *ent, void *udata) { - static first = 1; + static int first = 1; char *hosts = NULL, *client = NULL, *options = NULL, *info = NULL; server_list servers; diff --git a/usr/src/cmd/rpcsvc/nis/utils/nisrm.c b/usr/src/cmd/rpcsvc/nis/utils/nisrm.c index 22864ac6e5..ddd3343a8e 100644 --- a/usr/src/cmd/rpcsvc/nis/utils/nisrm.c +++ b/usr/src/cmd/rpcsvc/nis/utils/nisrm.c @@ -20,9 +20,7 @@ * CDDL HEADER END */ /* - * nisrm.c - * - * Copyright 1988-2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -53,10 +51,8 @@ usage() exit(1); } -void -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { int c; char ask_remove = 0, force_remove = 0; @@ -162,5 +158,5 @@ main(argc, argv) nis_freeresult(res); } - exit(error); + return (error); } diff --git a/usr/src/cmd/rpcsvc/nis/utils/nisrmdir.c b/usr/src/cmd/rpcsvc/nis/utils/nisrmdir.c index 698bfb2f78..3c62f101d5 100644 --- a/usr/src/cmd/rpcsvc/nis/utils/nisrmdir.c +++ b/usr/src/cmd/rpcsvc/nis/utils/nisrmdir.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 1988-2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -155,9 +155,8 @@ usage() exit(1); } -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { int c; char ask_remove = 0, force_remove = 0; @@ -334,7 +333,7 @@ main(argc, argv) cleanup_rmdir(); } - exit(0); + break; case OP_RMSLAVE: /* @@ -428,6 +427,8 @@ main(argc, argv) cleanup_rmslave(); exit(1); } - exit(0); + break; } + + return (0); } diff --git a/usr/src/cmd/rpcsvc/nis/utils/nistbladm.c b/usr/src/cmd/rpcsvc/nis/utils/nistbladm.c index e25d8244cf..a448c5ca26 100644 --- a/usr/src/cmd/rpcsvc/nis/utils/nistbladm.c +++ b/usr/src/cmd/rpcsvc/nis/utils/nistbladm.c @@ -20,10 +20,8 @@ * CDDL HEADER END */ /* - * nistbladm.c - * - * Copyright (c) 1988-2000 Sun Microsystems Inc - * All Rights Reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -188,9 +186,8 @@ usage() exit(1); } -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { int c; int len; @@ -718,5 +715,5 @@ main(argc, argv) break; } - exit(0); + return (0); } diff --git a/usr/src/cmd/rpcsvc/nis/utils/nistest.c b/usr/src/cmd/rpcsvc/nis/utils/nistest.c index b2f77ea4b4..7c9443c4b3 100644 --- a/usr/src/cmd/rpcsvc/nis/utils/nistest.c +++ b/usr/src/cmd/rpcsvc/nis/utils/nistest.c @@ -20,10 +20,8 @@ * CDDL HEADER END */ /* - * nistest.c - * - * Copyright (c) 1988-1992 Sun Microsystems Inc - * All Rights Reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -94,7 +92,7 @@ usage() unsigned int flags = 0; zotypes otype; -u_long oaccess; +ulong_t oaccess; int dotest_called = 0; static @@ -201,15 +199,15 @@ dotest(tab, obj, udata) exit(EXIT_FALSE); dotest_called = 1; + return (0); /* Indicates we want any additional objects */ } -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { int c; - u_long flinks = 0, fpath = 0, allres = 0, master = 0; + ulong_t flinks = 0, fpath = 0, allres = 0, master = 0; char *name; nis_result *ores; @@ -316,5 +314,5 @@ main(argc, argv) if (dotest_called) exit(EXIT_TRUE); - exit(EXIT_FALSE); + return (EXIT_FALSE); } diff --git a/usr/src/cmd/rpcsvc/rpc.rusersd.c b/usr/src/cmd/rpcsvc/rpc.rusersd.c index 190b76c6b2..c31ea5bfea 100644 --- a/usr/src/cmd/rpcsvc/rpc.rusersd.c +++ b/usr/src/cmd/rpcsvc/rpc.rusersd.c @@ -19,7 +19,7 @@ * * CDDL HEADER END * - * Copyright 1998 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ @@ -75,7 +75,12 @@ utmp_array utmp_array_res; int used_array_len = 0; struct utmpidlearr utmpidlearr; -main() +static void free_ua_entry(rusers_utmp *uap); +static int findidle(char *name, int ln, time_t now); +static void usys5to_ru(struct utmpx *s5, struct ru_utmp *bss); + +int +main(int argc, char *argv[]) { pid_t pid; int i; @@ -162,8 +167,7 @@ main() svc_run(); msgout("svc_run returned"); - exit(1); - /* NOTREACHED */ + return (1); } @@ -377,8 +381,8 @@ rusers_service(rqstp, transp) } -free_ua_entry(uap) -rusers_utmp *uap; +static void +free_ua_entry(rusers_utmp *uap) { if (uap == NULL) return; @@ -393,10 +397,8 @@ rusers_utmp *uap; /* find & return number of minutes current tty has been idle */ -findidle(name, ln, now) - char *name; - int ln; - time_t now; +static int +findidle(char *name, int ln, time_t now) { struct stat stbuf; long lastaction, diff; @@ -413,10 +415,8 @@ findidle(name, ln, now) return (diff); } -static -usys5to_ru(s5, bss) - struct utmpx *s5; - struct ru_utmp *bss; +static void +usys5to_ru(struct utmpx *s5, struct ru_utmp *bss) { int i; diff --git a/usr/src/cmd/rpcsvc/rstat_main.c b/usr/src/cmd/rpcsvc/rstat_main.c index 272986d3e9..c5a4f26552 100644 --- a/usr/src/cmd/rpcsvc/rstat_main.c +++ b/usr/src/cmd/rpcsvc/rstat_main.c @@ -20,8 +20,8 @@ * CDDL HEADER END */ /* - * Copyright (c) 1991-2000 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -57,7 +57,8 @@ extern void rstatprog_4(/*struct svc_req *rqstp, SVCXPRT *transp*/); extern void rstatprog_3(/*struct svc_req *rqstp, SVCXPRT *transp*/); extern void rstatprog_2(/*struct svc_req *rqstp, SVCXPRT *transp*/); -main() +int +main(int argc, char *argv[]) { pid_t pid; int i; @@ -92,24 +93,26 @@ main() freenetconfigent(nconf); if (!svc_reg(transp, RSTATPROG, RSTATVERS_VAR, rstatprog_4, 0)) { - _msgout("unable to register (RSTATPROG, RSTATVERS_VAR)."); + _msgout("unable to register " + "(RSTATPROG, RSTATVERS_VAR)."); exit(1); } if (!svc_reg(transp, RSTATPROG, RSTATVERS_TIME, rstatprog_3, 0)) { - _msgout("unable to register (RSTATPROG, RSTATVERS_TIME)."); + _msgout("unable to register " + "(RSTATPROG, RSTATVERS_TIME)."); exit(1); } if (!svc_reg(transp, RSTATPROG, RSTATVERS_SWTCH, rstatprog_2, 0)) { - _msgout("unable to register (RSTATPROG, RSTATVERS_SWTCH)."); + _msgout("unable to register " + "(RSTATPROG, RSTATVERS_SWTCH)."); exit(1); } svc_run(); exit(1); /* NOTREACHED */ - } - else { + } else { #ifndef RPC_SVC_FG pid = fork(); if (pid < 0) { @@ -127,20 +130,24 @@ main() #endif } if (!svc_create(rstatprog_4, RSTATPROG, RSTATVERS_VAR, "datagram_v")) { - _msgout("unable to create (RSTATPROG, RSTATVERS_VAR) for datagram_v."); + _msgout("unable to create (RSTATPROG, RSTATVERS_VAR) " + "for datagram_v."); exit(1); } if (!svc_create(rstatprog_3, RSTATPROG, RSTATVERS_TIME, "datagram_v")) { - _msgout("unable to create (RSTATPROG, RSTATVERS_TIME) for datagram_v."); + _msgout("unable to create (RSTATPROG, RSTATVERS_TIME) " + "for datagram_v."); exit(1); } if (!svc_create(rstatprog_4, RSTATPROG, RSTATVERS_VAR, "circuit_v")) { - _msgout("unable to create (RSTATPROG, RSTATVERS_VAR) for circuit_v."); + _msgout("unable to create (RSTATPROG, RSTATVERS_VAR) " + "for circuit_v."); exit(1); } if (!svc_create(rstatprog_3, RSTATPROG, RSTATVERS_TIME, "circuit_v")) { - _msgout("unable to create (RSTATPROG, RSTATVERS_TIME) for circuit_v."); + _msgout("unable to create (RSTATPROG, RSTATVERS_TIME) " + "for circuit_v."); exit(1); } @@ -149,18 +156,18 @@ main() */ if (!svc_create(rstatprog_2, RSTATPROG, RSTATVERS_SWTCH, "datagram_v")) { - _msgout("unable to create (RSTATPROG, RSTATVERS_SWTCH) for datagram_v."); + _msgout("unable to create (RSTATPROG, RSTATVERS_SWTCH) " + "for datagram_v."); exit(1); } svc_run(); _msgout("svc_run returned"); - exit(1); - /* NOTREACHED */ + return (1); } -static -void _msgout(msg) +static void +_msgout(msg) char *msg; { #ifdef RPC_SVC_FG diff --git a/usr/src/cmd/rpcsvc/rstat_proc.c b/usr/src/cmd/rpcsvc/rstat_proc.c index a871985bd8..c2a93dd933 100644 --- a/usr/src/cmd/rpcsvc/rstat_proc.c +++ b/usr/src/cmd/rpcsvc/rstat_proc.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -145,7 +145,7 @@ statsvar stats_s4; /* V2 support for backwards compatibility to pre-5.0 systems */ statsswtch stats_s2; -static stat_is_init = 0; +static int stat_is_init = 0; static void fail(int, char *, ...); static void safe_zalloc(void **, int, int); diff --git a/usr/src/cmd/rpcsvc/rup.c b/usr/src/cmd/rpcsvc/rup.c index 56934c9a5a..f17443b53c 100644 --- a/usr/src/cmd/rpcsvc/rup.c +++ b/usr/src/cmd/rpcsvc/rup.c @@ -22,7 +22,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -48,11 +48,13 @@ int machinecmp(); int loadcmp(); int uptimecmp(); -int collectnames(); +static int collectnames(); int singlehost(); /* returns 1 if rup of given host fails */ void printsinglehosts(); void printnames(); - +static void putline(); +int netbufeq(struct netbuf *ap, struct netbuf *bp); +void usage(void); struct entry { struct netconfig *nconf; @@ -73,8 +75,8 @@ int hflag; /* host: sort by machine name */ int dflag; /* debug: list only first n machines */ int debug; -main(argc, argv) - char **argv; +int +main(int argc, char *argv[]) { statsvar sv; statstime st; @@ -180,8 +182,7 @@ main(argc, argv) free(entry); - exit(0); - /* NOTREACHED */ + return (0); } int @@ -263,6 +264,7 @@ error: return (1); /* a failure */ } +static void putline(now, boottime, avenrun) time_t now; struct timeval boottime; @@ -303,10 +305,11 @@ putline(now, boottime, avenrun) printf("\n"); } +static int collectnames(resultsp, taddr, nconf) char *resultsp; - struct t_bind *taddr; - struct netconfig *nconf; + struct t_bind *taddr; + struct netconfig *nconf; { static int debugcnt; register struct entry *entryp, *lim; @@ -447,14 +450,14 @@ printnames() printsinglehosts(); } -machinecmp(a, b) - struct entry *a, *b; +int +machinecmp(struct entry *a, struct entry *b) { return (strcmp(a->machine, b->machine)); } -uptimecmp(a, b) - struct entry *a, *b; +int +uptimecmp(struct entry *a, struct entry *b) { if (a->boottime.tv_sec != b->boottime.tv_sec) return (a->boottime.tv_sec - b->boottime.tv_sec); @@ -462,8 +465,8 @@ uptimecmp(a, b) return (a->boottime.tv_usec - b->boottime.tv_usec); } -loadcmp(a, b) - struct entry *a, *b; +int +loadcmp(struct entry *a, struct entry *b) { register int i; @@ -523,13 +526,14 @@ netconfigdup(onp) return (nnp); } -netbufeq(ap, bp) - register struct netbuf *ap, *bp; +int +netbufeq(struct netbuf *ap, struct netbuf *bp) { return (ap->len == bp->len && !memcmp(ap->buf, bp->buf, ap->len)); } -usage() +void +usage(void) { fprintf(stderr, "Usage: rup [-h] [-l] [-t] [host ...]\n"); free(entry); diff --git a/usr/src/cmd/rpcsvc/rwall.c b/usr/src/cmd/rpcsvc/rwall.c index 6c4a42ef70..2984e41bcb 100644 --- a/usr/src/cmd/rpcsvc/rwall.c +++ b/usr/src/cmd/rpcsvc/rwall.c @@ -72,13 +72,12 @@ static mutex_t thr_mtx = DEFAULTMUTEX; static int thread_count = 8; /* fudge factor for system threads/fds */ static int qflag = 0; /* quiet: we don't care about errors */ -main(argc, argv) - int argc; - char **argv; +int +main(int argc, char *argv[]) { int msize; char buf[BUFSIZ+1]; - register i; + int i; char hostname[256]; int hflag; struct rlimit rl; diff --git a/usr/src/cmd/rpcsvc/spray.c b/usr/src/cmd/rpcsvc/spray.c index 62c0fa4790..5a8cefc99a 100644 --- a/usr/src/cmd/rpcsvc/spray.c +++ b/usr/src/cmd/rpcsvc/spray.c @@ -19,7 +19,7 @@ * * CDDL HEADER END * - * Copyright 1985 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ @@ -49,9 +49,11 @@ enum clnt_stat sprayproc_spray_1nd(/*argp, clnt*/); #define MAXPACKETLEN 1514 #define SPRAYOVERHEAD 86 /* size of rpc packet when size=0 */ -main(argc, argv) - int argc; - char **argv; +static void slp(int usecs); +static void usage(void); + +int +main(int argc, char *argv[]) { int c; extern char *optarg; @@ -117,7 +119,7 @@ main(argc, argv) if (lnth <= MAXPACKETLEN && lnth % 4 != 2) lnth = ((lnth + 5) / 4) * 4 - 2; arr.sprayarr_len = lnth - SPRAYOVERHEAD; - arr.sprayarr_val = (char *) buf; + arr.sprayarr_val = (char *)buf; printf("sending %u packets of length %u to %s ...", cnt, lnth, host); fflush(stdout); if (sprayproc_clear_1(NULL, clnt) == NULL) { @@ -164,6 +166,7 @@ sprayproc_spray_1nd(argp, clnt) } /* A cheap milliseconds sleep call */ +static void slp(usecs) { static struct pollfd pfds[1] = { @@ -173,6 +176,7 @@ slp(usecs) poll(pfds, 1, usecs/1000); } +static void usage() { printf("spray host [-t nettype] [-l lnth] [-c cnt] [-d delay]\n"); |