ref: 8bc69a872883224675a55db51ac8f60ab5ed9e5a
parent: 36fd714f7addd87e6d87c695e949852e7c34fb80
parent: bd1b52eea09d6ae1077bdee09005822cefc16330
author: grobe0ba <grobe0ba@tcp80.org>
date: Sat Nov 12 17:25:14 EST 2022
Merge branch 'upstream'
--- a/.builds/obsd.yml
+++ /dev/null
@@ -1,11 +1,0 @@
-image: openbsd/6.9
-sources:
- - https://git.sr.ht/~moody/tlsclient
-packages:
- - "openssl-1.1.1k"
-artifacts:
- - tlsclient/obsd.tar.gz
-tasks:
- - build: |
- cd tlsclient
- OPENSSL=eopenssl11 make -j $(sysctl -n hw.ncpu) obsd.tar.gz
--- a/.builds/pam.yml
+++ /dev/null
@@ -1,9 +1,0 @@
-image: archlinux
-sources:
- - https://git.sr.ht/~moody/tlsclient
-artifacts:
- - tlsclient/linux.tar.gz
-tasks:
- - build: |
- cd tlsclient
- make -j $(nproc) linux.tar.gz
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,8 @@
default: $(TARG)
$(TARG): $(LIBS) $(OFILES)
- $(CXX) -pthread -Lthird_party/boringssl $(LDFLAGS) -o $(TARG) $(OFILES) -Wl,--start-group $(LIBS) -Wl,--end-group $(LDADD)
+ $(CXX) -pthread -Lthird_party/boringssl $(LDFLAGS) -o $(TARG) $(OFILES) \
+ -Wl,--start-group $(LIBS) -Wl,--end-group $(LDADD)
login_-dp9ik: p9any.$O bsd.$O $(LIBS)
$(CC) -o $@ p9any.$O bsd.$O $(LIBS)
@@ -67,23 +68,11 @@
linux.tar.gz: tlsclient pam_p9.so tlsclient.1
tar cf - tlsclient pam_p9.so tlsclient.1 | gzip > $@
-tlsclient.obsd:
- OPENSSL=eopenssl11 LDFLAGS="$(LDFLAGS) -Xlinker --rpath=/usr/local/lib/eopenssl11/" $(MAKE) tlsclient
- mv tlsclient tlsclient.obsd
+obsd.tar.gz: tlsclient.obsd login_-dp9ik tlsclient.1 login_-dp9ik.8
+ tar cf - tlsclient.obsd login_-dp9ik tlsclient.1 login_-dp9ik.8 | gzip > $@
-obsd.tar.gz: tlsclient.obsd login_-dp9ik tlsclient.1
- tar cf - tlsclient.obsd login_-dp9ik tlsclient.1 | gzip > $@
.PHONY: tlsclient.install
tlsclient.install: tlsclient tlsclient.1
cp tlsclient $(PREFIX)/bin
cp tlsclient.1 $(PREFIX)/man/man1/
-
-.PHONY: tlsclient.obsd.install
-tlsclient.obsd.install: tlsclient.obsd login_-dp9ik tlsclient.1
- install tlsclient.obsd $(PREFIX)/bin/tlsclient
- install tlsclient.1 $(PREFIX)/man/man1/
- install -d $(PREFIX)/libexec/auth
- install -g auth login_-dp9ik $(PREFIX)/libexec/auth/
- install -d $(PREFIX)/libexec/git
- install git-remote-hjgit $(PREFIX)/libexec/git
--- /dev/null
+++ b/login_-dp9ik.8
@@ -1,0 +1,73 @@
+.\" Copyright (c) 2000 Todd C. Miller <millert@openbsd.org>
+.\" Copyright (c) 2022 Jacob Moody <moody@posixcafe.org>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd $Mdocdate: July 13 2022 $
+.Dt LOGIN_-dp9ik 8
+.Os
+.Sh NAME
+.Nm login_-dp9ik
+.Nd provide 9front dp9ik authentication type.
+.Sh SYNOPSIS
+.Nm login_-dp9ik
+.Op Fl s Ar service
+.Op Fl v Cm wheel Ns = Ns Cm yes Ns | Ns Cm no
+.Ar user
+.Sh DESCRIPTION
+The
+.Nm
+utility is called by
+.Xr login 1 ,
+.Xr su 1 ,
+.Xr ftpd 8 ,
+and others to authenticate the
+.Ar user
+to a 9front auth server using dp9ik. The specific
+auth server used for a given
+.Ar user
+is defined in their
+.Pa ~/.p9auth
+file, which contains a single line with a hostname
+or IP address.
+.Pp
+The
+.Ar user
+argument is the login name of the user to be authenticated.
+.Pp
+The
+.Ar service
+argument specifies which protocol to use with the
+invoking program.
+The only supported protocol currently is
+.Em login .
+.Pp
+If the
+.Cm wheel
+argument is specified and is not set to
+.Cm yes ,
+then the user will be rejected as not being in group
+.Dq wheel .
+This is used by
+.Xr su 1 .
+.Pp
+.Nm
+will prompt the user for a password and report back to the
+invoking program whether or not the authentication was
+successful.
+.Sh SEE ALSO
+.Xr login 1 ,
+.Xr passwd 1 ,
+.Xr su 1 ,
+.Xr login.conf 5 ,
+.Xr ftpd 8