You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
60 lines
1.5 KiB
60 lines
1.5 KiB
Index: Makefile.in |
|
--- Makefile.in.orig 2007-11-16 17:58:32 +0100 |
|
+++ Makefile.in 2008-04-19 10:27:04 +0200 |
|
@@ -50,19 +50,16 @@ |
|
@if [ ! -d $(prefix)/squidGuard ]; then \ |
|
$(MKINSTALLDIRS) $(prefix)/squidGuard ; \ |
|
echo Created directory $(prefix)/squidGuard ; \ |
|
- chown -R $(SQUIDUSER) $(prefix)/squidGuard || exit 1 ; \ |
|
echo Assigned $(prefix)/squidGuard to user $(SQUIDUSER) ; \ |
|
fi ; |
|
@if [ ! -d $(dbhomedir) ]; then \ |
|
$(MKINSTALLDIRS) $(dbhomedir) ; \ |
|
echo Created directory $(dbhomedir) ; \ |
|
- chown -R $(SQUIDUSER) $(dbhomedir) || exit 1 ; \ |
|
echo Assigned $(dbhomedir) to user $(SQUIDUSER) ; \ |
|
fi ; |
|
@if [ ! -d $(logdir) ]; then \ |
|
$(MKINSTALLDIRS) $(logdir) ; \ |
|
echo Created directory $(logdir) ; \ |
|
- chown -R $(SQUIDUSER) $(logdir) || exit 1 ; \ |
|
echo Assigned $(logdir) to user $(SQUIDUSER) ; \ |
|
fi ; |
|
@if test ! -f $(configfile); then \ |
|
@@ -83,7 +80,7 @@ |
|
@if [ ! -d $(bindir) ]; then \ |
|
$(MKINSTALLDIRS) $(bindir) ; \ |
|
fi ; \ |
|
- cp src/squidGuard $(bindir) || exit 1 ; \ |
|
+ cp src/squidGuard $(bindir)/squidguard || exit 1 ; \ |
|
echo Done. ; |
|
|
|
clean:: |
|
Index: src/sg.y.in |
|
--- src/sg.y.in.orig 2008-04-19 10:27:09 +0200 |
|
+++ src/sg.y.in 2008-04-19 10:33:08 +0200 |
|
@@ -666,13 +666,13 @@ |
|
|
|
|
|
/* MySQLsupport */ |
|
-#ifdef HAVE_MYSQL |
|
#if __STDC__ |
|
void sgSourceUserQuery(char *query) |
|
#else |
|
void sgSourceUserQuery(query) |
|
char *query; |
|
#endif |
|
+#ifdef HAVE_MYSQL |
|
{ |
|
char *dbhome = NULL, *f; |
|
MYSQL *conn; |
|
@@ -723,6 +723,9 @@ |
|
mysql_free_result(res); |
|
mysql_close(conn); |
|
} |
|
+#else |
|
+ { |
|
+ } |
|
#endif |
|
|
|
|
|
|