Bug 571: remove requirement to have separate "fax" user from uucp

diff --git a/CHANGES b/CHANGES
index 0d6d20406f127c4894f35c2918bb90f3a86c28f0..3c68c2c838bbf527b9d2b436702e68c5b84a4f3f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changelog for HylaFAX 4.2.1
 
+* remove need to have separate "fax" user (22 Dec 2004)
+* fix parsing of AT+FCLASS=? response within faxaddmodem
+  and probemodem (21 Dec 2004)
 * improve multi-line handling within notify (20 Dec 2004)
 * improve trap handling in faxaddmodem/probemodem (17 Dec 2004)
 * fix hfaxd from rejecting jobs scheduled for the past while

diff --git a/etc/faxaddmodem.sh.in b/etc/faxaddmodem.sh.in
index e93d3895b9e37ccf6969744c2661040a413a0520..e1a7cc5d4e03382646f001c24ce80a64b7ee435f 100644 (file)
--- a/etc/faxaddmodem.sh.in
+++ b/etc/faxaddmodem.sh.in
@@ -112,7 +112,7 @@ OUT=$TMPDIR/addmodem$$         # temp file in which modem output is recorded
 SVR4UULCKN=$LIBEXEC/lockname   # SVR4 UUCP lock name construction program
 ONDELAY=$LIBEXEC/ondelay       # prgm to open devices blocking on carrier
 CAT="$CAT -u"                  # something to do unbuffered reads and writes
-FAX=fax                                # identity of the fax user
+FAX=@FAXUID@                   # identity of the fax user
 GROUP=/etc/group               # where to go for group entries
 PROTOGID=@FAXGID@              # group who's gid we use for FAX user
 defPROTOGID=10                 # use this gid if PROTOGID doesn't exist

diff --git a/etc/faxsetup.sh.in b/etc/faxsetup.sh.in
index 145de897c4d8ef937489cda48c58aa23cc8bad9d..177fc9315bce55cb8c4ccdab66be1c7a6dd08efb 100644 (file)
--- a/etc/faxsetup.sh.in
+++ b/etc/faxsetup.sh.in
@@ -69,7 +69,7 @@ SED=@SED@                     # sed for use below
 TTYCMD=@TTYCMD@                        # tty for error output
 UUENCODE=@UUENCODE@            # uuencode command to dump in setup.cache
 
-FAX=fax                                # identity of the fax user
+FAX=@FAXUID@                   # identity of the fax user
 SERVICES=/etc/services         # location of services database
 INETDCONF=/usr/etc/inetd.conf  # default location of inetd configuration file
 ALIASES=/usr/lib/aliases       # default location of mail aliases database file
@@ -1535,30 +1535,6 @@ if [ -z "$faxUID" ]; then faxUID=$defPROTOUID; fi
 faxGID=`grep "^$PROTOGID:" $GROUP | cut -d: -f3`
 if [ -z "$faxGID" ]; then faxGID=$defPROTOGID; fi
 
-#
-# Change the password file entry for the fax user.
-#
-fixupFaxUser()
-{
-    emsg1=`modifyPasswd $FAX $faxUID $faxGID $DIR_SPOOL 2>&1`
-    case $? in
-    0) echo "Done, the \"$FAX\" user should now have the correct $1.";;
-    *) cat <<-EOF
-
-       FATAL ERROR: Command failed!
-
-       The modify password command failed with the message:
-
-       "$emsg1"
-
-       HylaFAX will not work correctly until the proper $1 is set up.
-
-       EOF
-       boom
-       ;;
-    esac
-}
-
 #
 # Add a fax user to the password file and lock the
 # entry so that noone can login as the user.
@@ -1640,26 +1616,6 @@ if onServer; then
        prompt "HylaFAX needs this to work properly, add it [yes]?"
        read x
        isOK $x && addFaxUser
-    elif [ "$x" != "$faxUID" ]; then
-       echo ""
-       echo ""
-       echo "It looks like you have a \"$FAX\" user in the password file,"
-       echo "but with a uid different than the uid for uucp.  You probably"
-       echo "have old fax software installed.  In order for this software"
-       echo "to work properly, the fax user uid must be the same as uucp."
-       prompt "Is it ok to change the password entry for \"$FAX\" [yes]?"
-       read x;
-       isOK $x && fixupFaxUser "user id"
-    elif [ `grep "^$FAX:" $PASSWD | cut -d: -f$PARAMLOC` != $DIR_SPOOL ]; then
-       echo ""
-       echo ""
-       echo "It looks like you have a \"$FAX\" user in the password file,"
-       echo "but with a home directory different than what is currently"
-       echo "configured.  This is not a serious matter, but should be"
-       echo "corrected."
-       prompt "Is it ok to change the home directory for \"$FAX\" [yes]?"
-       read x;
-       isOK $x && fixupFaxUser "home directory"
     fi
     machdepPasswdWork
 

diff --git a/util/faxcron.sh.in b/util/faxcron.sh.in
index 1bdcc366c5a4730e79ff0843ba04b52808f52b34..2edcb0d81eff6e7df23fba0b57c4ca90cfd9400a 100644 (file)
--- a/util/faxcron.sh.in
+++ b/util/faxcron.sh.in
@@ -41,7 +41,7 @@ AGEINFO=30                    # purge remote info after 30 days inactivity
 AGELOG=30                      # keep log info for last 30 days
 AGERCV=7                       # purge received facsimile after 7 days
 AGETMP=1                       # purge orphaned temp files after 1 day
-FAXUSER=fax                    # owner of log files
+FAXUSER=@FAXUID@               # owner of log files
 LOGMODE=0644                   # mode for log files
 XFERLOG=etc/xferfaxlog         # HylaFAX xferfaxlog file location
 LAST=etc/lastrun               # file where time+date of last run recorded