svn commit: r205633 - stable/7/contrib/tcp_wrappers

[Maxim Sobolev]

Author: sobomax
Date: Thu Mar 25 00:37:13 2010
New Revision: 205633
URL: http://svn.freebsd.org/changeset/base/205633

Log:
  MFC: allow comment in the middle of configuration line not only at the
  beginning.

Modified:
  stable/7/contrib/tcp_wrappers/hosts_access.c
Directory Properties:
  stable/7/contrib/tcp_wrappers/   (props changed)

Modified: stable/7/contrib/tcp_wrappers/hosts_access.c
==============================================================================
--- stable/7/contrib/tcp_wrappers/hosts_access.c	Wed Mar 24 23:08:25 2010	(r205632)
+++ stable/7/contrib/tcp_wrappers/hosts_access.c	Thu Mar 25 00:37:13 2010	(r205633)
@@ -148,6 +148,7 @@ struct request_info *request;
     char   *sh_cmd;			/* becomes optional shell command */
     int     match = NO;
     struct tcpd_context saved_context;
+    char   *cp;
 
     saved_context = tcpd_context;		/* stupid compilers */
 
@@ -164,7 +165,16 @@ struct request_info *request;
 		tcpd_warn("missing newline or line too long");
 		continue;
 	    }
-	    if (sv_list[0] == '#' || sv_list[strspn(sv_list, " \t\r\n")] == 0)
+	    /* Ignore anything after unescaped # character */
+	    for (cp = strchr(sv_list, '#'); cp != NULL;) {
+		if (cp > sv_list && cp[-1] == '\\') {
+		    cp = strchr(cp + 1, '#');
+		    continue;
+		}
+		*cp = '\0';
+		break;
+	    }
+	    if (sv_list[strspn(sv_list, " \t\r\n")] == 0)
 		continue;
 	    if ((cl_list = split_at(sv_list, ':')) == 0) {
 		tcpd_warn("missing \":\" separator");