Changeset 117

Timestamp:

Aug 22, 2007, 9:55:05 PM (17 years ago)

Author:

rainer

Message:

Fix for ticket #73 (yulectl rejects 14 char password).
--This line, and th se below, will be ignored--

M src/yulectl.c
M docs/Changelog

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/yulectl.c (modified) (3 diffs)

trunk/docs/Changelog

@@ -1 +1 @@
 2.3.6:
-        * introduce 'fflags' flag for suid files to detect new files already found
-          in regular file check (problem reported by J. Crutchfield); also add
-          regression test to ascertain that files in baseline database are not
-          quarantined erroneously
+        * fix yulectl password reading from $HOME/.yulectl_cred, erroneously
+          rejected passwords with exactly 14 chars (reported by Jerry Brown)
+        * introduce 'fflags' flag for suid files to detect new files already 
+          found in regular file check (problem reported by J. Crutchfield); 
+          also add regression test to ascertain that files in baseline 
+          database are not quarantined erroneously
         * sh_hash.c: replace check for prefix 'K' with check for not prefix'/'
           to allow for arbitrary module-specific store/lookup in db

trunk/src/yulectl.c

@@ -334 +334 @@
 }
 
+char * rtrim(char * str)
+{
+  size_t len;
+
+  if (!str)
+    return str;
+
+  len = strlen(str);
+  while (len > 0)
+    {
+      --len;
+      if (str[len] == '\n' || str[len] == '\r')
+        str[len] = '\0';
+      else
+        break;
+    }
+    
+  return str;
+}
+
 void fixup_message (char * message)
 {
@@ -399 +419 @@
       exit(EXIT_FAILURE);
     }
+
+  (void) rtrim(message2);
+
   if (strlen(message2) > 14)
     {
@@ -406 +429 @@
     }
 
-  if ( (0 != strlen(message2)) && ('\n' == message2[strlen(message2)-1]))
-    {
-      message2[strlen(message2)-1] = '\0';
-    }
   strcpy(password, message2);
   fclose(fp);
+
  do_msg:
   strcat(message2, "@");