INN commit: branches/2.5/nnrpd (perm.c)

[INN Commit]

    Date: Sunday, January 23, 2011 @ 02:22:06
  Author: iulius
Revision: 9160

Improve the logging of Perl and Python access hooks.
The origin wasn't previously mentioned:

"syntax error in (null)(2), Expected value."

Now, nnrpd will log:

"syntax error in perl_access-block(2), Expected value."

Modified:
  branches/2.5/nnrpd/perm.c

--------+
 perm.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: perm.c
===================================================================
--- perm.c	2011-01-23 10:17:49 UTC (rev 9159)
+++ perm.c	2011-01-23 10:22:06 UTC (rev 9160)
@@ -1064,6 +1064,7 @@
     SetDefaultAccess(acc);
     str = xstrdup(name);
     acc->name = str;
+    file->filename = str;
 
     for (i = 0; i <= access_vec->count; i++) {
       tok = CONFgettoken(PERMtoks, file);
@@ -1072,6 +1073,9 @@
         accessdecl_parse(acc, file, tok);
       }
     }
+
+    /* No need to free str here; it is used by acc, and will be
+     * free'd when the access block is free'd. */
     free(file);
     return;
 }
@@ -1603,7 +1607,7 @@
 
         access_realms[0] = xcalloc(1, sizeof(ACCESSGROUP));
 
-        PERMvectortoaccess(access_realms[0], "perl-dynamic", access_vec);
+        PERMvectortoaccess(access_realms[0], "perl_access-block", access_vec);
 
         vector_free(access_vec);
       } else {
@@ -1638,7 +1642,7 @@
             access_realms[0] = xcalloc(1, sizeof(ACCESSGROUP));
             memset(access_realms[0], 0, sizeof(ACCESSGROUP));
 
-            PERMvectortoaccess(access_realms[0], "python-dynamic", access_vec);
+            PERMvectortoaccess(access_realms[0], "python_access-block", access_vec);
 
             vector_free(access_vec);
         } else {