Index: Mk/Scripts/do-users-groups.sh =================================================================== --- Mk/Scripts/do-users-groups.sh +++ Mk/Scripts/do-users-groups.sh @@ -95,7 +95,7 @@ fi o_IFS=${IFS} IFS=":" - while read -r login _ uid gid class _ _ gecos homedir shell; do + while read -r login _ uid gid class _ _ gecos homedir shell homemode; do if [ -z "$uid" ] || [ -z "$gid" ] || [ -z "$homedir" ] || [ -z "$shell" ]; then error "User line for ${user} is invalid" fi @@ -105,6 +105,9 @@ class="-L $class" fi homedir=$(echo "$homedir" | sed "s|^/usr/local|${dp_PREFIX}|") + if [ -n "$homemode" ]; then + homemode="-m $homemode" + fi cat >> "${dp_UG_INSTALL}" <<-eot2 if ! \${PW} usershow $login >/dev/null 2>&1; then echo "Creating user '$login' with uid '$uid'." @@ -118,7 +121,7 @@ ;; *) group=$(awk -F: -v gid=${gid} '$3 == gid { print $1 }' ${dp_GID_FILES}) - echo "${dp_INSTALL} -d -g $group -o $login $homedir" >> "${dp_UG_INSTALL}" + echo "${dp_INSTALL} -d $homemode -g $group -o $login $homedir" >> "${dp_UG_INSTALL}" ;; esac done <<-eot Index: UIDs =================================================================== --- UIDs +++ UIDs @@ -46,7 +46,7 @@ mud:*:97:97::0:0:MUD Owner:/nonexistent:/bin/sh msql:*:98:98::0:0:mSQL-2 pseudo-user:/var/db/msqldb:/bin/sh rscsi:*:99:99::0:0:Remote SCSI:/usr/local/rscsi:/usr/local/sbin/rscsi -squid:*:100:100::0:0:squid caching-proxy pseudo user:/var/squid:/usr/sbin/nologin +squid:*:100:100::0:0:squid caching-proxy pseudo user:/var/squid:/usr/sbin/nologin:0770 quagga:*:101:101::0:0:Quagga route daemon pseudo user:/var/empty:/usr/sbin/nologin ganglia:*:102:102::0:0:Ganglia User:/nonexistent:/usr/sbin/nologin sgeadmin:*:103:103::0:0:Sun Grid Engine Admin:/nonexistent:/usr/sbin/nologin Index: ports-mgmt/portlint/src/portlint.pl =================================================================== --- ports-mgmt/portlint/src/portlint.pl +++ ports-mgmt/portlint/src/portlint.pl @@ -902,7 +902,7 @@ $format = '^[^|]*\|[^|]*\|[^|]*\|[^|]*$'; $dosort = 0; } elsif ($file =~ m/UIDs$/) { - $format = '^[^:]+:\*:[0-9]+:[0-9]+:[^:]*:0:0:[^:]+:[^:]+:[^:]+$'; + $format = '^[^:]+:\*:[0-9]+:[0-9]+:[^:]*:0:0:[^:]+:[^:]+:[^:]+(:[0-7]+)?$'; $dosort = 1; } elsif ($file =~ m/GIDs$/) { $format = '^[^:]+:\*:[0-9]+:[^:]*$';