Changeset 22 for trunk/src/yulectl.c

Timestamp:

Feb 23, 2006, 12:03:58 AM (19 years ago)

Author:

rainer

Message:

Minor code revisions.

File:

• trunk/src/yulectl.c (modified) (5 diffs)

trunk/src/yulectl.c

@@ -300 +300 @@
   if (0 != good)
     {
-      fprintf (stderr, _("ERROR: Bounced message != original message.\n"));
+      fprintf (stderr, _("ERROR: Bounced message != original message (possible reason: superfluous password).\n"));
       return -1;
     }
@@ -321 +321 @@
   printf(_("          transfer to the client <client_hostname> when\n"));
   printf(_("          this client connects to deliver a message.\n\n"));
+  printf(_("          If password is required, it is read from\n"));
+  printf(_("          $HOME/.yulectl_cred or taken from the environment\n"));
+  printf(_("          variable YULECTL_PASSWORD (not recommended).\n\n"));
 
   printf(_("Commands: RELOAD    <reload configuration>\n"));
@@ -337 +340 @@
   FILE * fp;
   struct passwd * pwent;
-
+  char * pw;
+
+  pw = getenv(_("YULECTL_PASSWORD"));
+  if (pw && strlen(pw) < 15)
+    {
+      strcpy(password, pw);
+      strcpy(message2, password);
+      goto do_msg;
+    }
   
   pwent = getpwuid(geteuid());
@@ -388 +399 @@
       exit(EXIT_FAILURE);
     }
-  if (strlen(message2) > 15)
+  if (strlen(message2) > 14)
     {
       fprintf (stderr, 
@@ -400 +411 @@
     }
   strcpy(password, message2);
+  fclose(fp);
+ do_msg:
   strcat(message2, "@");
-  fclose(fp);
 
   strncat(message2, message, SH_MAXMSG - strlen(message2) -1);