868f7a8
diff -up mgetty-1.1.36/policy.h.policy mgetty-1.1.36/policy.h
868f7a8
--- mgetty-1.1.36/policy.h.policy	2008-10-09 22:56:03.000000000 +0200
868f7a8
+++ mgetty-1.1.36/policy.h	2008-10-09 22:56:02.000000000 +0200
868f7a8
@@ -85,7 +85,7 @@
cvsdist 470f0eb
  * ZyXELs use S40.2=1.
cvsdist 470f0eb
  * If the path doesn't start with "/", it's relative to CONFDIR.
cvsdist 470f0eb
  */
cvsdist 470f0eb
-/* #define CNDFILE "dialin.config" */
cvsdist 470f0eb
+#define CNDFILE "dialin.config"
cvsdist 470f0eb
 
cvsdist 470f0eb
 
cvsdist 470f0eb
 /* If you want to use /etc/gettydefs to set tty flags, define this
868f7a8
@@ -114,7 +114,7 @@
cvsdist 470f0eb
 /* group id that the device is chown()ed to. If not defined, the
cvsdist 470f0eb
  * primary group of "DEVICE_OWNER" is used.
cvsdist 470f0eb
  */
cvsdist 470f0eb
-#define DEVICE_GROUP	"modem"
cvsdist 470f0eb
+#define DEVICE_GROUP	"uucp"
cvsdist 470f0eb
 
cvsdist 470f0eb
 /* access mode for the line while getty has it - it should be accessible
cvsdist 470f0eb
  * by uucp / uucp, but not by others (imagine someone dialing into your
868f7a8
@@ -147,7 +147,7 @@
cvsdist 470f0eb
  *
cvsdist 470f0eb
  * if the directory does not exist, the log file goes to CONSOLE (!)
cvsdist 470f0eb
  */
cvsdist 470f0eb
-#define LOG_PATH "/var/log/mgetty.%s"
96e6daa
+#define LOG_PATH "/var/log/mgetty.%s.log"
cvsdist 470f0eb
 
cvsdist 470f0eb
 /* Default log error level threshold. Possible error levels are
cvsdist 470f0eb
  * L_FATAL, L_ERROR, L_AUDIT, L_WARN, L_MESG, L_NOISE, L_JUNK (see mgetty.h)
868f7a8
@@ -172,15 +172,20 @@
cvsdist 470f0eb
  * mgetty will use the facility "LOG_AUTH", and the priorities
cvsdist 470f0eb
  * LOG_NOTICE, LOG_ERR and LOG_ALERT, respectively.
cvsdist 470f0eb
  */
cvsdist 470f0eb
-/* #define SYSLOG */
cvsdist 470f0eb
+#define SYSLOG
cvsdist 470f0eb
 
cvsdist 470f0eb
 /* Syslog facility
cvsdist 470f0eb
  *
cvsdist 470f0eb
  * This is the facility mgetty uses for logging. Ususally, this will be
cvsdist 470f0eb
  * LOG_AUTH, but on some systems, this may not exist, try LOG_DAEMON
cvsdist 470f0eb
  * instead (or look into the syslog manpage for available options)
cvsdist 470f0eb
+ * Note that LOG_AUTH is deprecated where LOG_AUTHPRIV is defined.
cvsdist 470f0eb
  */
cvsdist 470f0eb
+#ifdef LOG_AUTHPRIV
cvsdist 470f0eb
+#define SYSLOG_FC LOG_AUTHPRIV
cvsdist 470f0eb
+#else
cvsdist 470f0eb
 #define SYSLOG_FC LOG_AUTH
cvsdist 470f0eb
+#endif
cvsdist 470f0eb
 
cvsdist 470f0eb
 /* login stuff */
cvsdist 470f0eb
 
868f7a8
@@ -193,8 +198,9 @@
cvsdist 470f0eb
  * The "@", "\\D" and "\\T" escapes will be replaced by SYSTEM, the
cvsdist 470f0eb
  * current date and time, respectively.
cvsdist 470f0eb
  * override with "-p <prompt>" switch
cvsdist 470f0eb
+ * Modified to match the defaults for mingetty and login.
cvsdist 470f0eb
  */
cvsdist 470f0eb
-#define LOGIN_PROMPT	"@!login: "
cvsdist 470f0eb
+#define LOGIN_PROMPT	"@ login: "
cvsdist 470f0eb
 
868f7a8
 /* The old '#define ENV_TTYPROMPT' option has been superseded by setting 
868f7a8
  * "login-env-ttyprompt-hack yes" in mgetty.config.  See mgetty.texi for
868f7a8
@@ -256,7 +262,7 @@
cvsdist 470f0eb
 
cvsdist 470f0eb
 /* if your system isn't listed above, change that line here */
cvsdist 470f0eb
 #ifndef LOCK
cvsdist 470f0eb
-#define LOCK "/usr/spool/uucp/LCK..%s"
cvsdist 470f0eb
+#define LOCK "/var/spool/uucp/LCK..%s"
cvsdist 470f0eb
 #endif
cvsdist 470f0eb
   
cvsdist 470f0eb
 /* Set this to "1" if your system uses binary lock files (i.e., the pid
868f7a8
@@ -527,8 +533,9 @@
cvsdist 470f0eb
  * (with or without leading /dev/)
cvsdist 470f0eb
  * If you don't adapt this for your needs, sendfax won't run (you can
cvsdist 470f0eb
  * set it from the sendfax.config file, though)!
cvsdist 470f0eb
+ * We have no way of knowing.  Punt.
cvsdist 470f0eb
  */
cvsdist 470f0eb
-#define FAX_MODEM_TTYS	"tty4c:tty4d"
cvsdist 470f0eb
+#define FAX_MODEM_TTYS	"modem"
cvsdist 470f0eb
 
cvsdist 470f0eb
 /* Xon or not?
cvsdist 470f0eb
  *
868f7a8
@@ -586,7 +593,7 @@
cvsdist 470f0eb
  * If you don't want this type of service, do not define it at all
cvsdist 470f0eb
  * Absolute path name has to be used here!
cvsdist 470f0eb
  */
cvsdist 470f0eb
-#define FAX_NOTIFY_PROGRAM "/usr/local/lib/mgetty+sendfax/new_fax"
cvsdist 470f0eb
+#define FAX_NOTIFY_PROGRAM "/etc/mgetty+sendfax/new_fax"
cvsdist 470f0eb
 
cvsdist 470f0eb
 /* default minimum space required on spooling partition for receiving a FAX
cvsdist 470f0eb
  * (in KILObytes)
868f7a8
diff -up mgetty-1.1.36/voice/include/paths.h.policy mgetty-1.1.36/voice/include/paths.h
868f7a8
--- mgetty-1.1.36/voice/include/paths.h.policy	2008-10-09 22:56:03.000000000 +0200
868f7a8
+++ mgetty-1.1.36/voice/include/paths.h	2008-10-09 22:56:02.000000000 +0200
868f7a8
@@ -16,10 +16,10 @@
868f7a8
 
868f7a8
 /*
868f7a8
  * Filename of the logfile for vgetty. The "%s" will be replaced by
868f7a8
- * the device name.
868f7a8
+ * the device name.  We match the pattern used by mgetty for the name.
868f7a8
  */
868f7a8
 
868f7a8
-#define VGETTY_LOG_PATH "/var/log/vgetty.%s"
96e6daa
+#define VGETTY_LOG_PATH "/var/log/vgetty.%s.log"
868f7a8
 
868f7a8
 /*
868f7a8
  * Filename of the logfile for vm.