2989 Eliminate use of LOGNAME_MAX in ON
1166 useradd have warning with name more 8 chars

          --- old/usr/src/cmd/oamuser/user/Makefile
          +++ new/usr/src/cmd/oamuser/user/Makefile

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions

  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
       21 +# Copyright (c) 2013 Gary Mills
  21   22  #
  22   23  # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
  23   24  #
  24   25  # cmd/oamuser/user/Makefile
  25   26  #
  26   27  
       28 +DEFAULTFILES= useradd.dfl
       29 +
  27   30  include ../../Makefile.cmd
  28   31  
  29   32  GREP=           grep
  30   33  
  31   34  USERADD=        useradd
  32   35  USERDEL=        userdel
  33   36  USERMOD=        usermod
  34   37  ROLEADD=        roleadd
  35   38  ROLEDEL=        roledel
  36   39  ROLEMOD=        rolemod

  37   40  
  38   41  SBINPROG=       $(USERADD)   $(USERDEL)   $(USERMOD)
  39   42  #
  40   43  #       Removing sysadm: deleted $(SYSADMPROG) from this target.
  41   44  #
  42   45  PROG=           $(SBINPROG)
  43   46  PRODUCT=        $(PROG)
  44   47  
  45   48  ADD_OBJ=        useradd.o     uid.o        homedir.o \
  46   49                  groups.o      call_pass.o      userdefs.o   messages.o \
  47   50                  val_lgrp.o    funcs.o          val_lprj.o   proj.o
  48   51  
  49   52  DEL_OBJ=        userdel.o     call_pass.o      rmfiles.o    isbusy.o \
  50   53                  groups.o      messages.o       funcs.o      proj.o
  51   54  
  52   55  MOD_OBJ=        usermod.o     uid.o            movedir.o    groups.o \
  53   56                  rmfiles.o     call_pass.o      isbusy.o     homedir.o \
  54   57                  userdefs.o    messages.o       val_lgrp.o   funcs.o \
  55   58                  val_lprj.o    proj.o
  56   59  
  57   60  OBJECTS=        $(ADD_OBJ)     $(DEL_OBJ)    $(MOD_OBJ)
  58   61  
  59   62  SRCS=           $(OBJECTS:.o=.c)
  60   63  
  61   64  LIBDIR=         ../lib
  62   65  LIBUSRGRP=      $(LIBDIR)/lib.a
  63   66  LIBADM=         -ladm
  64   67  LOCAL=          ../inc
  65   68  HERE=           .
  66   69  LINTFLAGS=      -u
  67   70  
  68   71  ROOTSKEL=       $(ROOTETC)/skel
  69   72  INSSBINPROG=    $(SBINPROG:%=$(ROOTUSRSBIN)/%)
  70   73  INSSKELFILE=    $(SKELFILE:%=$(ROOTSKEL)/%)
  71   74  
  72   75  CPPFLAGS=       -I$(HERE) -I$(LOCAL) $(CPPFLAGS.master)
  73   76  CERRWARN +=     -_gcc=-Wno-implicit-function-declaration
  74   77  CERRWARN +=     -_gcc=-Wno-type-limits
  75   78  CERRWARN +=     -_gcc=-Wno-uninitialized
  76   79  CERRWARN +=     -_gcc=-Wno-parentheses
  77   80  
  78   81  $(INSSBINPROG)  := FILEMODE = 0555
  79   82  $(INSSYSADMPROG):= FILEMODE = 0500
  80   83  $(INSSKELFILE)  := FILEMODE = 0644
  81   84  
  82   85  $(USERADD) :=   OBJS = $(ADD_OBJ)
  83   86  $(USERADD) :=   LIBS = $(LIBUSRGRP)
  84   87  
  85   88  $(USERDEL) :=   OBJS = $(DEL_OBJ)
  86   89  $(USERDEL) :=   LIBS = $(LIBUSRGRP)
  87   90  
  88   91  $(USERMOD) :=   OBJS = $(MOD_OBJ)
  89   92  $(USERMOD) :=   LIBS = $(LIBUSRGRP)
  90   93  
  91   94  LDLIBS +=       -lbsm -lnsl -lsecdb -lproject -ltsol
  92   95  
  93   96  .PARALLEL: $(OBJECTS)
  94   97  

  95   98  all:            $(PRODUCT)
  96   99  
  97  100  $(PROG):        $$(OBJS) $$(LIBS)
  98  101          $(LINK.c) $(OBJS) -o $@ $(LIBS) $(LDLIBS)
  99  102          $(POST_PROCESS)
 100  103  
 101  104  $(USERADD):     $(ADD_OBJ)
 102  105  $(USERMOD):     $(MOD_OBJ)
 103  106  $(USERDEL):     $(DEL_OBJ)
 104  107  
 105      -install:        all .WAIT $(ROOTSKEL) $(INSSBINPROG) $(INSSKELFILE)
      108 +install:        all $(ROOTETCDEFAULTFILES) .WAIT \
      109 +                        $(ROOTSKEL) $(INSSBINPROG) $(INSSKELFILE)
 106  110                  $(RM) $(ROOTUSRSBIN)/$(ROLEADD)
 107  111                  $(LN) $(ROOTUSRSBIN)/$(USERADD) $(ROOTUSRSBIN)/$(ROLEADD)
 108  112                  $(RM) $(ROOTUSRSBIN)/$(ROLEDEL)
 109  113                  $(LN) $(ROOTUSRSBIN)/$(USERDEL) $(ROOTUSRSBIN)/$(ROLEDEL)
 110  114                  $(RM) $(ROOTUSRSBIN)/$(ROLEMOD)
 111  115                  $(LN) $(ROOTUSRSBIN)/$(USERMOD) $(ROOTUSRSBIN)/$(ROLEMOD)
 112  116  
 113  117  clean:
 114  118          $(RM) $(OBJECTS)
 115  119  
 116  120  lint:   lint_SRCS
 117  121  
 118  122  include ../../Makefile.targ
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX