summaryrefslogtreecommitdiffstats
path: root/adduser
diff options
context:
space:
mode:
authorCameron Katri <me@cameronkatri.com>2021-05-02 16:00:07 -0400
committerCameron Katri <me@cameronkatri.com>2021-05-02 16:00:07 -0400
commitf3dab068fce37270e5e4e1a00e5a44e30f00baf7 (patch)
treed6b8c70074d440e56c1d7cdbfc7b68d8b96bda96 /adduser
parent6b46c62f4663c84790120a4e74e155a6ef16b41c (diff)
downloadpw-darwin-f3dab068fce37270e5e4e1a00e5a44e30f00baf7.tar.gz
pw-darwin-f3dab068fce37270e5e4e1a00e5a44e30f00baf7.tar.zst
pw-darwin-f3dab068fce37270e5e4e1a00e5a44e30f00baf7.zip
Recommit everything, add chpass, improve history (except for a few files that git-filter-repo dislikes for some reason [_secure_path.c and login_cap.h])
Diffstat (limited to 'adduser')
-rw-r--r--adduser/Makefile22
-rw-r--r--adduser/adduser.conf.54
-rw-r--r--adduser/adduser.sh2
-rw-r--r--adduser/rmuser.sh2
4 files changed, 26 insertions, 4 deletions
diff --git a/adduser/Makefile b/adduser/Makefile
new file mode 100644
index 0000000..7d67923
--- /dev/null
+++ b/adduser/Makefile
@@ -0,0 +1,22 @@
+GINSTALL ?= install
+PREFIX ?= /usr
+DESTDIR ?=
+
+all:
+ @echo "Nothing to build"
+
+clean:
+ @echo "Nothing to clean"
+
+install: install-adduser install-rmuser
+
+install-adduser: adduser.sh adduser.8 adduser.conf.5
+ $(GINSTALL) -Dm755 adduser.sh $(DESTDIR)/$(PREFIX)/sbin/adduser
+ $(GINSTALL) -Dm644 adduser.8 $(DESTDIR)/$(PREFIX)/share/man/man8/adduser.8
+ $(GINSTALL) -Dm644 adduser.conf.5 $(DESTDIR)/$(PREFIX)/share/man/man5/adduser.conf.5
+
+install-rmuser: rmuser.sh rmuser.8
+ $(GINSTALL) -Dm755 rmuser.sh $(DESTDIR)/$(PREFIX)/sbin/rmuser
+ $(GINSTALL) -Dm644 rmuser.8 $(DESTDIR)/$(PREFIX)/share/man/man8/rmuser.8
+
+.PHONY: all install install-adduser install-rmuser clean
diff --git a/adduser/adduser.conf.5 b/adduser/adduser.conf.5
index af9fe22..42ccaa0 100644
--- a/adduser/adduser.conf.5
+++ b/adduser/adduser.conf.5
@@ -120,7 +120,7 @@ read in
.Xr adduser 8 .
.It Va homeprefix
The default home directory prefix, usually
-.Pa /home .
+.Pa /var .
.It Va defaultshell
The user's default shell which may be any of the shells listed in
.Xr shells 5 .
@@ -190,7 +190,7 @@ defaultLgroup=
defaultclass=
defaultgroups=
passwdtype=yes
-homeprefix=/home
+homeprefix=/var
defaultshell=/bin/csh
udotdir=/usr/share/skel
msgfile=/etc/adduser.msg
diff --git a/adduser/adduser.sh b/adduser/adduser.sh
index 91a1b4b..b9abd81 100644
--- a/adduser/adduser.sh
+++ b/adduser/adduser.sh
@@ -877,7 +877,7 @@ disableflag=
Dflag=
Sflag=
readconfig="yes"
-homeprefix="/home"
+homeprefix="/var"
randompass=
fileline=
savedpwtype=
diff --git a/adduser/rmuser.sh b/adduser/rmuser.sh
index abaf004..e2308d0 100644
--- a/adduser/rmuser.sh
+++ b/adduser/rmuser.sh
@@ -156,7 +156,7 @@ rm_ipc() {
for i in s m q; do
ipcs -$i |
awk -v i=$i -v login=$1 '$1 == i && $5 == login { print $2 }' |
- xargs -n 1 ipcrm -$i
+ xargs -r -n 1 ipcrm -$i
done
verbose && echo '.'
}