components/openindiana/illumos-gate/patches/0002-7648-useradd-mod-commands-operate-on-home-special-fi.patch

   1 From a13b0914bc7ff54ee5c9c77493b5ccff971b00d0 Mon Sep 17 00:00:00 2001
   2 From: Alexander Pyhalov <apyhalov@gmail.com>
   3 Date: Thu, 8 Dec 2016 08:36:52 +0300
   4 Subject: [PATCH] 7648 useradd/mod commands operate on /home special filesystem
   5
   6 Updated 2022.03.15 for IPD4
   7
   8 diff --git a/usr/src/cmd/passwd/passwd.c b/usr/src/cmd/passwd/passwd.c
   9 index 7d993f6..fcd7eb2 100644
  10 --- a/usr/src/cmd/passwd/passwd.c
  11 +++ b/usr/src/cmd/passwd/passwd.c
  12 @@ -53,7 +53,6 @@
  13  #include <rpcsvc/nis.h>
  14  #undef GROUP
  15  #include <syslog.h>
  16 -#include <userdefs.h>
  17  #include <passwdutil.h>
  18
  19  #include <nss_dbdefs.h>
  20 @@ -65,6 +64,12 @@
  21  #include <bsm/adt_event.h>
  22
  23  /*
  24 + * This actually has just informational meaning and should match
  25 + * SHELL defined in usr/src/cmd/login/login.c
  26 + */
  27 +#define        SHELL   "/usr/bin/sh"
  28 +
  29 +/*
  30   * flags indicate password attributes to be modified
  31   */
  32
  33 @@ -550,10 +555,10 @@ userinput(char *name, pwu_repository_t *rep, attrtype type)
  34         oldval = oldattr.data.val_s;
  35
  36         if (type == ATTR_SHELL) {
  37 -               /* No current shell: set DEFSHL as default choice */
  38 +               /* No current shell: set SHELL as default choice */
  39                 if (*oldval == '\0') {
  40                         free(oldval);
  41 -                       oldval = strdup(DEFSHL);
  42 +                       oldval = strdup(SHELL);
  43                 }
  44
  45                 if (ckuid() != SUCCESS) {
  46 diff --git a/usr/src/head/userdefs.h b/usr/src/head/userdefs.h
  47 index 7c6407c..c6f2efc 100644
  48 --- a/usr/src/head/userdefs.h
  49 +++ b/usr/src/head/userdefs.h
  50 @@ -51,10 +51,10 @@ extern "C" {
  51  #define        DEFPROJNAME     "default"
  52  #define        DEFGROUP        1
  53  #define        DEFGNAME        "other"
  54 -#define        DEFPARENT       "/home"
  55 +#define        DEFPARENT       "/export/home"
  56  #define        DEFSKL          "/etc/skel"
  57 -#define        DEFSHL          "/bin/sh"
  58 -#define        DEFROLESHL      "/bin/pfsh"
  59 +#define        DEFSHL          "/usr/bin/bash"
  60 +#define        DEFROLESHL      "/usr/bin/pfbash"
  61  #define        DEFINACT        0
  62  #define        DEFEXPIRE       ""
  63  #define        DEFAUTH         ""
  64 diff --git a/usr/src/man/man8/roleadd.8 b/usr/src/man/man8/roleadd.8
  65 index 6777f95..54f9b03 100644
  66 --- a/usr/src/man/man8/roleadd.8
  67 +++ b/usr/src/man/man8/roleadd.8
  68 @@ -136,7 +136,7 @@ are:
  69  .ad
  70  .sp .6
  71  .RS 4n
  72 -\fB/home\fR
  73 +\fB/export/home\fR
  74  .RE
  75
  76  .sp
  77 @@ -156,7 +156,7 @@ are:
  78  .ad
  79  .sp .6
  80  .RS 4n
  81 -\fB/bin/pfsh\fR
  82 +\fB/usr/bin/pfbash\fR
  83  .RE
  84
  85  .sp
  86 diff --git a/usr/src/man/man8/useradd.8 b/usr/src/man/man8/useradd.8
  87 index f87c545..8fb1581 100644
  88 --- a/usr/src/man/man8/useradd.8
  89 +++ b/usr/src/man/man8/useradd.8
  90 @@ -145,7 +145,7 @@ values are:
  91  .ad
  92  .sp .6
  93  .RS 4n
  94 -\fB/home\fR
  95 +\fB/export/home\fR
  96  .RE
  97
  98  .sp
  99 @@ -165,7 +165,7 @@ values are:
 100  .ad
 101  .sp .6
 102  .RS 4n
 103 -\fB/bin/sh\fR
 104 +\fB/usr/bin/bash\fR
 105  .RE
 106
 107  .sp
 108 --
 109 2.9.2
 110