diff -Nru squidGuard-1.3.orig/configure.in squidGuard-1.3/configure.in --- squidGuard-1.3/configure.in 2007-05-10 21:39:44.000000000 +0600 +++ squidGuard-1.3/configure.in 2008-07-06 14:11:01.000000000 +0600 @@ -296,4 +296,4 @@ AC_SUBST(ROBOTEXCEPTIONS) AC_SUBST(BLACKLISTS) -AC_OUTPUT(Makefile src/Makefile src/sg.h doc/Makefile test/Makefile test/test1.conf test/test2.conf samples/Makefile samples/sample.conf samples/squidGuard.cgi samples/squidGuard-simple.cgi contrib/Makefile contrib/squidGuardRobot/squidGuardRobot contrib/sgclean/sgclean contrib/hostbyname/hostbyname) +AC_OUTPUT(Makefile src/Makefile src/sg.h src/sg.y doc/Makefile test/Makefile test/test1.conf test/test2.conf samples/Makefile samples/sample.conf samples/squidGuard.cgi samples/squidGuard-simple.cgi contrib/Makefile contrib/squidGuardRobot/squidGuardRobot contrib/sgclean/sgclean contrib/hostbyname/hostbyname) diff -Nru squidGuard-1.3.orig/src/sg.y.in squidGuard-1.3/src/sg.y.in --- squidGuard-1.3/src/sg.y.in 2007-11-03 18:59:49.000000000 +0500 +++ squidGuard-1.3/src/sg.y.in 2008-07-06 15:35:08.000000000 +0600 @@ -185,7 +185,6 @@ source_content: DOMAIN domain | USER user | USERLIST WORD { sgSourceUserList($2); } -@YACCLINE@ | EXECUSERLIST EXECCMD { sgSourceExecUserList($2); } | USERQUOTA NUMBER NUMBER HOURLY { sgSourceUserQuota($2,$3,"3600");} @@ -667,7 +666,7 @@ */ if(!ldap_is_ldap_url(url)) { - @NOLOG1@ sgLogError("%s: can't parse LDAP url %s",progname, url); @NOLOG2@ + sgLogError("%s: can't parse LDAP url %s",progname, url); return; } @@ -1832,7 +1831,7 @@ m = ((lastval - m) * 60) - lt->tm_sec; if(m <= 0) m = 30; -@NOLOG1@ sgLogError("Info: recalculating alarm in %d seconds", (unsigned int)m); @NOLOG2@ + sgLogError("Info: recalculating alarm in %d seconds", (unsigned int)m); alarm((unsigned int) m); sgTimeCheck(lt,t); sgTimeSetAcl(); @@ -2275,16 +2274,12 @@ } } } -@NOLOG1@ else { if( globalDebug == 1 ) { sgLogError("source not found"); } } -@NOLOG2@ if(!found) { acl = defaultAcl; -@NOLOG1@ if( globalDebug == 1 ) { sgLogError("no ACL matching source, using default"); } -@NOLOG2@ } return acl; } @@ -2516,7 +2511,7 @@ sgDbUpdate(src->userDb, ident, (char *) userinfo, sizeof(struct UserInfo)); - @NOLOG1@ sgLogError("Added LDAP source: %s", ident); @NOLOG2@ + sgLogError("Added LDAP source: %s", ident); if(found) { *rval = userinfo; @@ -2684,12 +2679,12 @@ if (strncmp(key, "bindname=", 9) == 0) { binddn = data; - @NOLOG1@ sgLogError("Extracted binddn: %s", binddn); @NOLOG2@ + sgLogError("Extracted binddn: %s", binddn); } else if (strncmp(key, "x-bindpass=", 11) == 0) { bindpass = data; - @NOLOG1@ sgLogError("Extracted x-bindpass: %s", bindpass); @NOLOG2@ + sgLogError("Extracted x-bindpass: %s", bindpass); } } @@ -2707,14 +2702,12 @@ lud->lud_attrs, 0, NULL, NULL, NULL, -1, &ldapresult) != LDAP_SUCCESS) { -@NOLOG1@ sgLogError("%s: ldap_search_ext_s failed: %s " "(params: %s, %d, %s, %s)", progname, ldap_err2string(get_ldap_errno(ld)), lud->lud_dn, lud->lud_scope, lud->lud_filter, lud->lud_attrs[0]); -@NOLOG2@ ldap_unbind(ld); ldap_free_urldesc(lud);