rse 98/06/16 03:29:18
Modified: . configure Log: Merge in some changes between release and local CVS version of my patch Brian applied: - check for nogroup beside nobody, too. - correct space/tabs in sed patterns - cleanup indentation - cleanup ordering of subst vars Revision Changes Path 1.36 +12 -9 apache-1.3/configure Index: configure =================================================================== RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- configure 1998/06/16 03:59:02 1.35 +++ configure 1998/06/16 10:29:17 1.36 @@ -780,6 +780,9 @@ conf_group="#-1" if [ ".`egrep ^nobody: /etc/group`" != . ]; then conf_group="nobody" + if [ ".`egrep ^nogroup: /etc/group`" != . ]; then + conf_group="nogroup" + fi fi conf_port="80" if [ ".`id | grep root`" = . ]; then @@ -808,15 +811,15 @@ hostname="`echo $hostname | sed -e 's/\..*//'`" domainname=""; if [ -f /etc/resolv.conf ]; then - domainname="`egrep '^[ ]*domain' /etc/resolv.conf |\ - sed -e 's/.*domain//' -e 's/^[ ]*//' \ - -e 's/^ *//' -e 's/^ *//' \ + domainname="`egrep '^[ ]*domain' /etc/resolv.conf |\ + sed -e 's/.*domain//' -e 's/^[ ]*//' \ + -e 's/^ *//' -e 's/^ *//' \ -e 's/^\.//' -e 's/^/./'`" if [ ".$domainname" = . ]; then domainname="`egrep '^[ ]*search' /etc/resolv.conf |\ - sed -e 's/.*search//' -e 's/^[ ]*//' \ - -e 's/^ *//' -e 's/^ *//' \ - -e 's/ .*//' -e 's/^\.//' -e 's/^/./'`" + sed -e 's/.*search//' -e 's/^[ ]*//' \ + -e 's/^ *//' -e 's/^ *//' \ + -e 's/ .*//' -e 's/^\.//' -e 's/^/./'`" fi fi conf_serveradmin="[EMAIL PROTECTED]" @@ -902,13 +905,13 @@ -e "[EMAIL PROTECTED]@%$suexec%g" \ -e "[EMAIL PROTECTED]@%$suexec_caller%g" \ -e "[EMAIL PROTECTED]@%$suexec_userdir%g" \ +-e "[EMAIL PROTECTED]@%$suexec_uidmin%g" \ +-e "[EMAIL PROTECTED]@%$suexec_gidmin%g" \ +-e "[EMAIL PROTECTED]@%$suexec_safepath%g" \ -e "[EMAIL PROTECTED]@%$conf_group%g" \ -e "[EMAIL PROTECTED]@%$conf_port%g" \ -e "[EMAIL PROTECTED]@%$conf_serveradmin%g" \ -e "[EMAIL PROTECTED]@%$conf_servername%g" \ --e "[EMAIL PROTECTED]@%$suexec_uidmin%g" \ --e "[EMAIL PROTECTED]@%$suexec_gidmin%g" \ --e "[EMAIL PROTECTED]@%$suexec_safepath%g" \ -e "[EMAIL PROTECTED]@%$build_support%g" \ -e "[EMAIL PROTECTED]@%$install_support%g" \ -e "[EMAIL PROTECTED]@%$clean_support%g" \