Changes in trunk/src/yulectl.c [22:1]

File:

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

trunk/src/yulectl.c

@@ -300 +300 @@
   if (0 != good)
     {
-      fprintf (stderr, _("ERROR: Bounced message != original message (possible reason: superfluous password).\n"));
+      fprintf (stderr, _("ERROR: Bounced message != original message.\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"));
@@ -340 +337 @@
   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());
@@ -399 +388 @@
       exit(EXIT_FAILURE);
     }
-  if (strlen(message2) > 14)
+  if (strlen(message2) > 15)
     {
       fprintf (stderr, 
@@ -411 +400 @@
     }
   strcpy(password, message2);
+  strcat(message2, "@");
   fclose(fp);
- do_msg:
-  strcat(message2, "@");
 
   strncat(message2, message, SH_MAXMSG - strlen(message2) -1);