diff options
Diffstat (limited to 'usr/src/cmd')
34 files changed, 107 insertions, 137 deletions
diff --git a/usr/src/cmd/auths/Makefile b/usr/src/cmd/auths/Makefile index a716337269..131eee0687 100644 --- a/usr/src/cmd/auths/Makefile +++ b/usr/src/cmd/auths/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,9 +19,10 @@ # CDDL HEADER END # # -# Copyright (c) 1999 by Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # PROG= auths @@ -36,7 +36,7 @@ ROOTBINAUTHS = $(AUTHS:%=$(ROOTBIN)/%) .KEEP_STATE: CPPFLAGS += -D_REENTRANT -LDLIBS += -lsecdb -lcmd +LDLIBS += -lsecdb all: $(PROG) diff --git a/usr/src/cmd/cmd-inet/usr.bin/Makefile b/usr/src/cmd/cmd-inet/usr.bin/Makefile index aa203a2216..1f418ae70a 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/Makefile +++ b/usr/src/cmd/cmd-inet/usr.bin/Makefile @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -75,7 +76,7 @@ finger := CFLAGS += $(CCVERBOSE) # Enable large file support for reading the lastlog file. finger := CPPFLAGS += -D_FILE_OFFSET_BITS=64 -finger := LDLIBS += -lnsl -lcurses -lcmd -lsocket +finger := LDLIBS += -lnsl -lcurses -lsocket rcp lint-rcp := LDLIBS += -lsocket -lsec -lsendfile rdate lint-rdate:= LDLIBS += -lsocket rlogin lint-rlogin := LDLIBS += -lnsl -lsocket diff --git a/usr/src/cmd/cmd-inet/usr.bin/finger.c b/usr/src/cmd/cmd-inet/usr.bin/finger.c index 0e8cd23a66..1fe31a7573 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/finger.c +++ b/usr/src/cmd/cmd-inet/usr.bin/finger.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,8 +18,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -1456,7 +1456,7 @@ initscreening(void) */ flags = defcntl(DC_GETFLAGS, 0); TURNOFF(flags, DC_CASE); - defcntl(DC_SETFLAGS, flags); + (void) defcntl(DC_SETFLAGS, flags); if (cp = defread(passvar)) { options = cp; diff --git a/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile b/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile index e4c0460476..d7db17d316 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile +++ b/usr/src/cmd/cmd-inet/usr.bin/ftp/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -42,7 +41,7 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64 \ -I$(SRC)/lib/gss_mechs/mech_krb5/include \ -I$(SRC)/uts/common/gssapi/mechs/krb5/include -LDLIBS += -lsocket -lnsl -lcmd -lgss +LDLIBS += -lsocket -lnsl -lgss LDFLAGS += $(ZLAZYLOAD) .KEEP_STATE: diff --git a/usr/src/cmd/cmd-inet/usr.bin/netstat/Makefile b/usr/src/cmd/cmd-inet/usr.bin/netstat/Makefile index fa24253112..85bc6e1376 100644 --- a/usr/src/cmd/cmd-inet/usr.bin/netstat/Makefile +++ b/usr/src/cmd/cmd-inet/usr.bin/netstat/Makefile @@ -17,15 +17,13 @@ # information: Portions Copyright [yyyy] [name of copyright owner] # # CDDL HEADER END - - # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# ident "%Z%%M% %I% %E% SMI" +# # Copyright (c) 1990 Mentat Inc. # # cmd/cmd-inet/usr.bin/netstat/Makefile @@ -46,7 +44,7 @@ SRCS= $(LOCALSRCS) $(COMMONSRCS) CPPFLAGS += -DNDEBUG -I$(CMDINETCOMMONDIR) LAZYLIBS = $(ZLAZYLOAD) -ltsnet -ltsol $(ZNOLAZYLOAD) lint := LAZYLIBS = -ltsnet -ltsol -LDLIBS += -ldhcpagent -lcmd -lsocket -lnsl -lkstat $(LAZYLIBS) +LDLIBS += -ldhcpagent -lsocket -lnsl -lkstat $(LAZYLIBS) .KEEP_STATE: diff --git a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile index b3240595af..b92d2782ba 100644 --- a/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile +++ b/usr/src/cmd/cmd-inet/usr.lib/in.mpathd/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -42,7 +41,7 @@ POFILES = $(SRCS:%.c=%.po) # via UNIX98; enable the appropriate #defines for UNIX98. # CPPFLAGS += -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ -I$(SRC)/cmd/cmd-inet/common -LDLIBS += -lcmd -lsocket -lnsl -lsysevent -lnvpair -lipmp -lc +LDLIBS += -lsocket -lnsl -lsysevent -lnvpair -lipmp -lc LINTFLAGS += -erroff=E_FUNC_DECL_VAR_ARG2 -erroff=E_INCONS_VAL_TYPE_DECL2 \ -erroff=E_FUNC_USED_VAR_ARG2 -erroff=E_INCONS_ARG_DECL2 \ diff --git a/usr/src/cmd/cmd-inet/usr.sbin/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/Makefile index 696a3a6df7..7ccfbed9aa 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/Makefile +++ b/usr/src/cmd/cmd-inet/usr.sbin/Makefile @@ -17,8 +17,6 @@ # information: Portions Copyright [yyyy] [name of copyright owner] # # CDDL HEADER END - - # # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. @@ -139,7 +137,6 @@ $(NSLPROG) := LDLIBS += -lnsl $(AUDITPROG) := LDLIBS += -lbsm $(PAMPROG) := LDLIBS += -lpam $(RPCSVCPROG) := LDLIBS += -lrpcsvc -$(CMDPROG) := LDLIBS += -lcmd $(K5PROGS) := LDFLAGS += $(ZLAZYLOAD) $(KRUNPATH) \ -L$(ROOT)$(KLIBDIR_DO) -L$(ROOT)$(KLIBDIR_GL) $(K5PROGS) := K5LIBS= -lmech_krb5 diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/Makefile index a008c55ac1..3011207150 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/Makefile +++ b/usr/src/cmd/cmd-inet/usr.sbin/ifconfig/Makefile @@ -39,7 +39,7 @@ COMMONSRCS= $(CMDINETCOMMONDIR)/$(COMMONOBJS:%.o=%.c) SRCS= $(LOCALSRCS) $(COMMONSRCS) CPPFLAGS += -I$(CMDINETCOMMONDIR) -I$(SRC)/common/net/dhcp -LDLIBS += -lcmd -ldevinfo -ldhcpagent -linetcfg -ldlpi +LDLIBS += -ldevinfo -ldhcpagent -linetcfg -ldlpi LINTFLAGS += -m ROOTUSRSBINLINKS = $(PROG:%=$(ROOTUSRSBIN)/%) diff --git a/usr/src/cmd/cmd-inet/usr.sbin/in.telnetd.c b/usr/src/cmd/cmd-inet/usr.sbin/in.telnetd.c index 46d76888ec..bb6c73c548 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/in.telnetd.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/in.telnetd.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -18,8 +17,10 @@ * information: Portions Copyright [yyyy] [name of copyright owner] * * CDDL HEADER END - * - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + */ + +/* + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -4746,7 +4747,7 @@ showbanner(void) /* ignore case */ flags = defcntl(DC_GETFLAGS, 0); TURNOFF(flags, DC_CASE); - defcntl(DC_SETFLAGS, flags); + (void) defcntl(DC_SETFLAGS, flags); if (cp = defread(bannervar)) { FILE *fp; diff --git a/usr/src/cmd/cron/Makefile b/usr/src/cmd/cron/Makefile index f449b98220..12970e35d0 100644 --- a/usr/src/cmd/cron/Makefile +++ b/usr/src/cmd/cron/Makefile @@ -141,7 +141,7 @@ at := LDLIBS += -lproject -lsecdb at.xpg4 := LDLIBS += -lproject -lsecdb atq := LDLIBS += -lsecdb atrm := LDLIBS += -lsecdb -cron := LDLIBS += -lcmd -lpam -lproject -lcontract +cron := LDLIBS += -lpam -lproject -lcontract crontab := LDLIBS += -lsecdb -lpam crontab.xpg6 := LDLIBS += -lsecdb -lpam crontab.xpg4 := LDLIBS += -lsecdb -lpam diff --git a/usr/src/cmd/devfsadm/Makefile.com b/usr/src/cmd/devfsadm/Makefile.com index 972f4e985c..8037e617dc 100644 --- a/usr/src/cmd/devfsadm/Makefile.com +++ b/usr/src/cmd/devfsadm/Makefile.com @@ -18,7 +18,6 @@ # # CDDL HEADER END # - # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -124,7 +123,7 @@ LINTFLAGS += -erroff=E_NAME_MULTIPLY_DEF2 LAZYLIBS = $(ZLAZYLOAD) -lzonecfg -lbrand -lbsm $(ZNOLAZYLOAD) lint := LAZYLIBS = -lzonecfg -lbrand -lbsm -LDLIBS += -ldevinfo -lgen -lsysevent -lnvpair -lcmd -ldoor $(LAZYLIBS) -lnsl +LDLIBS += -ldevinfo -lgen -lsysevent -lnvpair -ldoor $(LAZYLIBS) -lnsl SRCS = $(DEVFSADM_SRC) $(LINK_SRCS) OBJS = $(DEVFSADM_OBJ) $(LINK_OBJS) diff --git a/usr/src/cmd/fs.d/Makefile b/usr/src/cmd/fs.d/Makefile index eb78c8d14e..d14b141a07 100644 --- a/usr/src/cmd/fs.d/Makefile +++ b/usr/src/cmd/fs.d/Makefile @@ -88,8 +88,7 @@ df.o := CFLAGS += $(iBCS2FLAG) CPPFLAGS += -D_LARGEFILE64_SOURCE %.xpg4.o := CPPFLAGS += -DXPG4 -$(XPG4) df ff fsck mount volcopy := LDLIBS += -lcmd -$(SPPROG) := LDLIBS += -lcmd -lkstat +$(SPPROG) := LDLIBS += -lkstat $(ROOTETCMNTTAB) := FILEMODE = 444 $(ROOTETCMNTTAB) := OWNER = root diff --git a/usr/src/cmd/fs.d/autofs/Makefile b/usr/src/cmd/fs.d/autofs/Makefile index ef869ee615..47fb37668e 100644 --- a/usr/src/cmd/fs.d/autofs/Makefile +++ b/usr/src/cmd/fs.d/autofs/Makefile @@ -85,10 +85,9 @@ POFILE= autofs.po GREP= egrep SED= sed -$(AUTO) := LDLIBS += -lnsl -lsldap -lcmd +$(AUTO) := LDLIBS += -lnsl -lsldap $(MOUNT):= LDLIBS += -lnsl -$(TYPEPROG) := LDLIBS += -lrpcsvc -lsocket -lnsl -lsldap -lcmd \ - -lkstat +$(TYPEPROG) := LDLIBS += -lrpcsvc -lsocket -lnsl -lsldap -lkstat $(TYPEPROG) := LDFLAGS += -R/usr/lib/fs/$(FSTYPE) CFLAGS += $(CCVERBOSE) -D_FILE_OFFSET_BITS=64 diff --git a/usr/src/cmd/fs.d/nfs/mount/Makefile b/usr/src/cmd/fs.d/nfs/mount/Makefile index b1287a27a9..c9419f823d 100644 --- a/usr/src/cmd/fs.d/nfs/mount/Makefile +++ b/usr/src/cmd/fs.d/nfs/mount/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -51,7 +50,7 @@ UNCHECKED_HDRS= webnfs.h # POFILE= mount.po -LDLIBS += -lrpcsvc -lnsl -lsocket -lcmd +LDLIBS += -lrpcsvc -lnsl -lsocket CPPFLAGS += -I. -I../.. -I../lib CFLAGS += $(CCVERBOSE) diff --git a/usr/src/cmd/fs.d/nfs/mountd/Makefile b/usr/src/cmd/fs.d/nfs/mountd/Makefile index 97a7153cc5..ce74236d54 100644 --- a/usr/src/cmd/fs.d/nfs/mountd/Makefile +++ b/usr/src/cmd/fs.d/nfs/mountd/Makefile @@ -24,6 +24,7 @@ # # ident "%Z%%M% %I% %E% SMI" # + FSTYPE = nfs TYPEPROG = mountd ATTMK = $(TYPEPROG) @@ -35,7 +36,7 @@ LOCAL = mountd.o netgroup.o rmtab.o nfsauth.o \ nfsauth_xdr.o exportlist.o hashset.o OBJS = $(LOCAL) $(COMMON) SRCS = $(LOCAL:%.o=%.c) $(FSLIBSRC) ../lib/nfs_sec.c ../lib/sharetab.c -LDLIBS += -lrpcsvc -lnsl -lbsm -lsocket -lcmd -ldoor +LDLIBS += -lrpcsvc -lnsl -lbsm -lsocket -ldoor CPPFLAGS += -D_REENTRANT $(TYPEPROG): $(OBJS) diff --git a/usr/src/cmd/fs.d/nfs/nfsd/Makefile b/usr/src/cmd/fs.d/nfs/nfsd/Makefile index 1061f6d286..b8390cb9eb 100644 --- a/usr/src/cmd/fs.d/nfs/nfsd/Makefile +++ b/usr/src/cmd/fs.d/nfs/nfsd/Makefile @@ -31,7 +31,7 @@ ATTMK= $(TYPEPROG) include ../../Makefile.fstype -LDLIBS += -lnsl -lcmd -lnvpair +LDLIBS += -lnsl -lnvpair LOCAL= nfsd.o OBJS= $(LOCAL) nfs_tbind.o thrpool.o diff --git a/usr/src/cmd/fs.d/nfs/nfslog/Makefile b/usr/src/cmd/fs.d/nfs/nfslog/Makefile index 54178a0000..c8d5ec9127 100644 --- a/usr/src/cmd/fs.d/nfs/nfslog/Makefile +++ b/usr/src/cmd/fs.d/nfs/nfslog/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,11 +19,11 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# ident "%Z%%M% %I% %E% SMI" +# # cmd/fs.d/nfs/nfslog/Makefile FSTYPE= nfs @@ -40,7 +39,7 @@ LOCAL= process_buffer.o fhtab.o nfslogd.o nfslog_elf.o \ nfs_log_xdr.o buffer_list.o OBJS= $(LOCAL) $(COMMON) SRCS= $(LOCAL:%.o=%.c) $(COMMON:%.o=../lib/%.c) -LDLIBS += -lsocket -lnsl -lcmd +LDLIBS += -lsocket -lnsl CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_FILE_OFFSET_BITS=64 diff --git a/usr/src/cmd/kbd/Makefile b/usr/src/cmd/kbd/Makefile index c4aab529d3..2457008098 100644 --- a/usr/src/cmd/kbd/Makefile +++ b/usr/src/cmd/kbd/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,10 +19,10 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # MANIFEST = keymap.xml @@ -38,7 +37,6 @@ ROOTMANIFESTDIR = $(ROOTSVCSYSTEM) PROG = kbd CFLAGS += $(CCVERBOSE) -LDLIBS += -lcmd $(ROOTMANIFEST) := FILEMODE = 0444 diff --git a/usr/src/cmd/keyserv/Makefile b/usr/src/cmd/keyserv/Makefile index 1507674b69..5dddafd644 100644 --- a/usr/src/cmd/keyserv/Makefile +++ b/usr/src/cmd/keyserv/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -83,7 +82,7 @@ CPPFLAGS += -I. -I$(SRC)/lib/libnsl/include -I$(SRC)/lib/libsldap/common \ LDLIBS += -lnsl chkey := LDLIBS += -lsldap -keyserv := LDLIBS += -lmp -lcmd +keyserv := LDLIBS += -lmp newkey := LDLIBS += -lsldap -lsocket .KEEP_STATE: diff --git a/usr/src/cmd/keyserv/keyserv.c b/usr/src/cmd/keyserv/keyserv.c index a998b605aa..1bcd917864 100644 --- a/usr/src/cmd/keyserv/keyserv.c +++ b/usr/src/cmd/keyserv/keyserv.c @@ -18,6 +18,7 @@ * * CDDL HEADER END */ + /* * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. @@ -1401,7 +1402,7 @@ defaults(void) */ flags = defcntl(DC_GETFLAGS, 0); TURNOFF(flags, DC_CASE); - defcntl(DC_SETFLAGS, flags); + (void) defcntl(DC_SETFLAGS, flags); if ((ptr = defread("ENABLE_NOBODY_KEYS=")) != NULL) { if (strcasecmp(ptr, "NO") == 0) { diff --git a/usr/src/cmd/login/Makefile b/usr/src/cmd/login/Makefile index 22b7c9a796..a56995a813 100644 --- a/usr/src/cmd/login/Makefile +++ b/usr/src/cmd/login/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,11 +19,11 @@ # CDDL HEADER END # # -# ident "%Z%%M% %I% %E% SMI" -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# ident "%Z%%M% %I% %E% SMI" +# PROG= login OBJS= login.o login_audit.o @@ -49,7 +48,7 @@ CLOBBERFILES += $(LOGINDEVPERM) $(ONC_SRCS) CPPFLAGS += -DSYSV -DCONSOLE='"/dev/console"' -DSECURITY \ -D_FILE_OFFSET_BITS=64 -I$(SRC)/lib/pam_modules/krb5 -LDLIBS += -lcmd -lbsm -lpam -ldevinfo +LDLIBS += -lbsm -lpam -ldevinfo CFLAGS += $(CCVERBOSE) .KEEP_STATE: diff --git a/usr/src/cmd/lp/cmd/lpsched/Makefile b/usr/src/cmd/lp/cmd/lpsched/Makefile index 2afbf2377c..83ccf68d6c 100644 --- a/usr/src/cmd/lp/cmd/lpsched/Makefile +++ b/usr/src/cmd/lp/cmd/lpsched/Makefile @@ -17,15 +17,13 @@ # information: Portions Copyright [yyyy] [name of copyright owner] # # CDDL HEADER END - - -# # -# ident "%Z%%M% %I% %E% SMI" # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# ident "%Z%%M% %I% %E% SMI" +# # cmd/lp/cmd/lpsched/lpsched/Makefile # @@ -104,7 +102,7 @@ LPLIBS = \ $(LIBSEC) SYSLIBS= -lcurses -lgen -lcurses -lnsl -z lazyload \ - -ltsol -lsecdb -lcmd -lbsm -z nolazyload + -ltsol -lsecdb -lbsm -z nolazyload LDLIBS += $(LPLIBS) $(SYSLIBS) diff --git a/usr/src/cmd/mkpwdict/Makefile b/usr/src/cmd/mkpwdict/Makefile index cb11b13dab..791fadf4c2 100644 --- a/usr/src/cmd/mkpwdict/Makefile +++ b/usr/src/cmd/mkpwdict/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -35,8 +34,6 @@ CFLAGS += -I$(SRC)/lib/pam_modules/authtok_check LINTFLAGS += -erroff=E_NAME_DEF_NOT_USED2 -m LINTFLAGS += -I$(SRC)/lib/pam_modules/authtok_check -LDLIBS += -lcmd - CRACK_SRCDIR= $(SRC)/lib/pam_modules/authtok_check/ CRACK_OBJS= packer.o packlib.o dict.o stringlib.o CRACK_SRCS= $(CRACK_OBJS:%.o=$(CRACK_SRCDIR)/%.c) diff --git a/usr/src/cmd/pfexec/Makefile b/usr/src/cmd/pfexec/Makefile index a492f266d9..4f60f15ddd 100644 --- a/usr/src/cmd/pfexec/Makefile +++ b/usr/src/cmd/pfexec/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,10 +19,10 @@ # CDDL HEADER END # # -# Copyright 1999-2003 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # PROG= pfexec @@ -39,7 +38,7 @@ ROOTBINPFEXEC = $(PFEXEC:%=$(ROOTBIN)/%) .KEEP_STATE: CPPFLAGS += -D_REENTRANT -LDLIBS += -lcmd -lsecdb -lbsm +LDLIBS += -lsecdb -lbsm all: $(PROG) diff --git a/usr/src/cmd/power/Makefile b/usr/src/cmd/power/Makefile index b931f81f4c..d1f6534bc7 100644 --- a/usr/src/cmd/power/Makefile +++ b/usr/src/cmd/power/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,14 +19,13 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # # cmd/power/Makefile # -# DAEMON_SRCS = powerd.c sysstat.c DAEMON_OBJS = $(DAEMON_SRCS:%.c=%.o) @@ -66,7 +64,7 @@ sparc_LDEVINFO= -ldevinfo i386_LDEVINFO= DAEMON_LDLIBS = $(LDLIBS.cmd) -lkstat $($(MACH)_LDEVINFO) -PMCFG_LDLIBS = $(LDLIBS.cmd) -lcmd $($(MACH)_LDEVINFO) +PMCFG_LDLIBS = $(LDLIBS.cmd) $($(MACH)_LDEVINFO) OWNER= root ROOTUSRSBINPMCFG= $(PMCFG:%=$(ROOTUSRSBIN)/%) diff --git a/usr/src/cmd/profiles/Makefile b/usr/src/cmd/profiles/Makefile index 3ce4578496..2c356db68a 100644 --- a/usr/src/cmd/profiles/Makefile +++ b/usr/src/cmd/profiles/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,8 @@ # CDDL HEADER END # # -# Copyright (c) 1999 by Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" # @@ -36,7 +36,7 @@ ROOTBINPROFILES = $(PROFILES:%=$(ROOTBIN)/%) .KEEP_STATE: CPPFLAGS += -D_REENTRANT -LDLIBS += -lsecdb -lcmd +LDLIBS += -lsecdb all: $(PROG) diff --git a/usr/src/cmd/rcm_daemon/Makefile.com b/usr/src/cmd/rcm_daemon/Makefile.com index a25a4d32c2..fe3ca2f998 100644 --- a/usr/src/cmd/rcm_daemon/Makefile.com +++ b/usr/src/cmd/rcm_daemon/Makefile.com @@ -110,7 +110,7 @@ SUNW_network_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -llaadm SUNW_ip_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -linetutil SUNW_ip_anon_rcm.so := LDLIBS_MODULES += -L$(ROOT)/lib -linetutil -LDLIBS += -lgen -lelf -lcmd -lrcm -lnvpair -ldevinfo -lnsl -lsocket +LDLIBS += -lgen -lelf -lrcm -lnvpair -ldevinfo -lnsl -lsocket SRCS = $(RCM_SRC) $(COMMON_MOD_SRC) diff --git a/usr/src/cmd/savecore/Makefile.com b/usr/src/cmd/savecore/Makefile.com index 35b473066e..4b9faf5683 100644 --- a/usr/src/cmd/savecore/Makefile.com +++ b/usr/src/cmd/savecore/Makefile.com @@ -31,7 +31,6 @@ OBJS= savecore.o compress.o include ../../Makefile.cmd -LDLIBS += -lcmd CFLAGS += $(CCVERBOSE) CFLAGS64 += $(CCVERBOSE) CPPFLAGS += -D_LARGEFILE64_SOURCE=1 diff --git a/usr/src/cmd/ssh/sshd/Makefile b/usr/src/cmd/ssh/sshd/Makefile index 0685fc6be7..c96107ec5f 100644 --- a/usr/src/cmd/ssh/sshd/Makefile +++ b/usr/src/cmd/ssh/sshd/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -19,7 +18,8 @@ # # CDDL HEADER END # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -80,7 +80,6 @@ LDLIBS += $(SSH_COMMON_LDLIBS) -lsocket \ -L$(ROOTSFWLIB) -lwrap \ $(OPENSSL_LDFLAGS) -lcrypto \ -lgss \ - -lcmd \ -lcontract DYNFLAGS += $(OPENSSL_DYNFLAGS) $(C99_DISABLE) diff --git a/usr/src/cmd/su/Makefile b/usr/src/cmd/su/Makefile index e15981c3ea..9046af3a10 100644 --- a/usr/src/cmd/su/Makefile +++ b/usr/src/cmd/su/Makefile @@ -48,17 +48,17 @@ $(PROG_STATIC) := FILEMODE = 0555 # A reduced su.static is created, with just enough functionality # to satisfy the needs of a single-user login with /usr not mounted. # In particular, nss_files.so.1 may be dlopen()'ed at runtime. -$(ROOTFS_PROG) := LDLIBS += -lcmd -lbsm -lpam -lsecdb +$(ROOTFS_PROG) := LDLIBS += -lbsm -lpam -lsecdb # The standard su is fully functional. $(PROG) := CPPFLAGS += -DDYNAMIC_SU -$(PROG) := LDLIBS += -lcmd -lbsm -lpam -lsecdb +$(PROG) := LDLIBS += -lbsm -lpam -lsecdb LINTFLAGS += -DDYNAMIC_SU CLOBBERFILES += $(ROOTFS_PROG) $(EMB_PROG) -lint := LDLIBS += -lcmd -lbsm -lpam -lsecdb +lint := LDLIBS += -lbsm -lpam -lsecdb .KEEP_STATE: diff --git a/usr/src/cmd/sulogin/Makefile b/usr/src/cmd/sulogin/Makefile index 6c7b4e5b57..a0658160db 100644 --- a/usr/src/cmd/sulogin/Makefile +++ b/usr/src/cmd/sulogin/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -31,8 +30,6 @@ ROOTFS_PROG = $(PROG) include ../Makefile.cmd -LDLIBS += -lcmd - FILEMODE = 0555 OWNER = root diff --git a/usr/src/cmd/tar/Makefile b/usr/src/cmd/tar/Makefile index 2172afa2ac..e769a93542 100644 --- a/usr/src/cmd/tar/Makefile +++ b/usr/src/cmd/tar/Makefile @@ -17,8 +17,6 @@ # information: Portions Copyright [yyyy] [name of copyright owner] # # CDDL HEADER END - - # # # Copyright 2006 Sun Microsystems, Inc. All rights reserved. @@ -33,12 +31,12 @@ DEFAULTFILES= tar.dfl include ../Makefile.cmd -CPPFLAGS += -D_FILE_OFFSET_BITS=64 -I../../lib/libcmd/inc +CPPFLAGS += -D_FILE_OFFSET_BITS=64 DCFILE= $(PROG).dc LAZYLIBS = $(ZLAZYLOAD) -ltsol $(ZNOLAZYLOAD) lint := LAZYLIBS = -ltsol -LDLIBS += -lcmd -lsec $(LAZYLIBS) +LDLIBS += -lsec $(LAZYLIBS) CFLAGS += $(CCVERBOSE) diff --git a/usr/src/cmd/utmpd/Makefile b/usr/src/cmd/utmpd/Makefile index 74b2cbe53f..4b256151bb 100644 --- a/usr/src/cmd/utmpd/Makefile +++ b/usr/src/cmd/utmpd/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,10 +19,10 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" +# ident "%Z%%M% %I% %E% SMI" # PROG= utmpd @@ -38,7 +37,6 @@ SVCMETHOD = svc-utmpd FILEMODE = 555 OWNER = root GROUP = bin -LDLIBS += -lcmd $(ROOTMANIFEST) := FILEMODE = 444 $(ROOTMANIFEST) := GROUP = sys diff --git a/usr/src/cmd/ypcmd/yppasswd/Makefile b/usr/src/cmd/ypcmd/yppasswd/Makefile index 58e84fc30a..caa961d575 100644 --- a/usr/src/cmd/ypcmd/yppasswd/Makefile +++ b/usr/src/cmd/ypcmd/yppasswd/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -44,7 +43,7 @@ ROOTDIRS = $(NETSVC) $(NETYP) # include library definitions #LDLIBS += -lrpcsvc -lnsl -lcrypt -lintl -lgen -LDLIBS += -lnsl -lcmd -lc -lnisdb +LDLIBS += -lnsl -lnisdb -lc # Pick up includes from library CPPFLAGS += -I$(SRC)/lib/libnisdb/yptol |