diff -Naur netams-3.4.0rc2.orig/lib/libcli/libcli.c netams-3.4.0rc2/lib/libcli/libcli.c
--- netams-3.4.0rc2.orig/lib/libcli/libcli.c	2007-04-04 11:33:46 +0400
+++ netams-3.4.0rc2/lib/libcli/libcli.c	2007-12-02 12:18:57 +0300
@@ -1650,13 +1650,38 @@
 		char *p;
 		char *cmd;
 		char *end;
+		int bracket1 = 0; // ' count
+		int bracket2 = 0; // " count
 
 		if (fgets(buf, sizeof(buf), fh) <= 0)
 			break; // End of file
 
-		if ((p = strpbrk(buf, "#\r\n")))
+		if ((p = strpbrk(buf, "\r\n")))
 			*p = 0;
 
+		for (p = buf; *p; p++)
+		{
+		    switch (*p)
+		    {
+			case '\'':
+			    if (!bracket2)
+				bracket1 = 1 - bracket1;
+			    break;
+
+			case '"':
+			    if (!bracket1)
+				bracket2 = 1 - bracket2;
+			    break;
+
+			case '#':
+			    if (!bracket1 && !bracket2)
+				*p = 0;
+			    break;
+		    }
+		    if (!(*p))
+			break;
+		}
+
 		cmd = buf;
 		while (isspace(*cmd))
 			cmd++;