summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2005-12-28 14:28:08 -0800
committerTim Rice <tim@multitalents.net>2005-12-28 14:28:08 -0800
commit8db70e2398ff1830e18533a75c6e8e5fa98a78e2 (patch)
treea552d34c6e33497aa6cd9051678a18d3228172b7
parent7bff1a9b5e6a0958ebc8201542eb6d359d987a1e (diff)
(tim) [buildpkg.sh.in] grep for $SSHDUID instead of $SSHDGID on /etc/passwd
-rw-r--r--ChangeLog5
-rw-r--r--buildpkg.sh.in2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b7c6f700..f86d4090c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120051229
2 - (tim) [buildpkg.sh.in] grep for $SSHDUID instead of $SSHDGID on /etc/passwd
3
120051224 420051224
2 - (djm) OpenBSD CVS Sync 5 - (djm) OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2005/12/20 21:59:43 6 - jmc@cvs.openbsd.org 2005/12/20 21:59:43
@@ -3549,4 +3552,4 @@
3549 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3552 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3550 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3553 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3551 3554
3552$Id: ChangeLog,v 1.4051 2005/12/24 03:59:12 djm Exp $ 3555$Id: ChangeLog,v 1.4052 2005/12/28 22:28:08 tim Exp $
diff --git a/buildpkg.sh.in b/buildpkg.sh.in
index f90ae6e81..cb9eb3048 100644
--- a/buildpkg.sh.in
+++ b/buildpkg.sh.in
@@ -353,7 +353,7 @@ else
353 # Create user if required 353 # Create user if required
354 [ "\$DO_PASSWD" = yes ] && { 354 [ "\$DO_PASSWD" = yes ] && {
355 # Use uid of 67 if possible 355 # Use uid of 67 if possible
356 if cut -f3 -d: \${PKG_INSTALL_ROOT}/etc/passwd | egrep '^'$SSHDGID'\$' >/dev/null 356 if cut -f3 -d: \${PKG_INSTALL_ROOT}/etc/passwd | egrep '^'$SSHDUID'\$' >/dev/null
357 then 357 then
358 : 358 :
359 else 359 else