Moved the two warning fields into one warning field.

1 files changed, 9 insertions, 8 deletions

diff --git a/clients/zshutdown_notify/zshutdown_notify.c b/clients/zshutdown_notify/zshutdown_notify.c
index 9bfc4b9..88f6cae 100644
--- a/clients/zshutdown_notify/zshutdown_notify.c
+++ b/clients/zshutdown_notify/zshutdown_notify.c
@@ -3,9 +3,12 @@
  *	$Author$
  *	$Locker$
  *	$Log$
- *	Revision 1.1  1987-08-08 03:42:52  tony
- *	Initial revision
+ *	Revision 1.2  1987-08-08 04:48:42  tony
+ *	Moved the two warning fields into one warning field.
  *
+ * Revision 1.1  87/08/08  03:42:52  tony
+ * Initial revision
+ * 
  */
 
 #ifndef lint
@@ -44,16 +47,15 @@ static char rcsid_zlogin_c[] = "$Header$";
 #define N_CLASS_ROOT	"FILSRV"
 #define N_CLASS_INST	"STATUS"
 #define N_OPCODE	"SHUTDOWN"
-#define N_DEF_FORMAT	"@bold(Shutdown message from $1 at $time)\n@center(System going down, message is:)\n\n$2\n\n@center(@bold($3))\n@center(@bold($4))"
-#define N_FIELD_CNT	4
+#define N_DEF_FORMAT	"@bold(Shutdown message from $1 at $time)\n@center(System going down, message is:)\n\n$2\n\n@center(@bold($3))"
+#define N_FIELD_CNT	3
 
 /*
  * Standard warning strings appended as extra fields to
  * the message body.
  */
 
-static char warn1[] = "Please detach any filesystems you may have";
-static char warn2[] = "attached from this host!";
+static char warning[] = "Please detach any filesystems you may have\nattached from this host!";
 
 main(argc,argv)
     int argc;
@@ -69,8 +71,7 @@ main(argc,argv)
 
     msg[0] = hostname;
     msg[1] = message;
-    msg[2] = warn1;
-    msg[3] = warn2;
+    msg[2] = warning;
 
     if ((retval = ZInitialize()) != ZERR_NONE) {
 	com_err(argv[0], retval, "while initializing");