serverfilters-commit — CVS Commits

[Serverfilters-commit] serversidefilter setup.php,1.2,1.3

[Paul L. <pdo...@us...>]

Update of /cvsroot/serverfilters/serversidefilter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26595

Modified Files:
	setup.php 
Log Message:
Wrong SM_PATH

Index: setup.php
===================================================================
RCS file: /cvsroot/serverfilters/serversidefilter/setup.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** setup.php	21 May 2005 19:46:19 -0000	1.2
--- setup.php	16 Jun 2005 18:38:52 -0000	1.3
***************
*** 15,19 ****
  /** @ignore */
  if (!defined('SM_PATH'))
!    define('SM_PATH', '../../');
  
  
--- 15,19 ----
  /** @ignore */
  if (!defined('SM_PATH'))
!    define('SM_PATH', '../');
  
  

[Serverfilters-commit] serversidefilter recipie_functions.php,1.1.1.1,1.2

[Paul L. <pdo...@us...>]

Update of /cvsroot/serverfilters/serversidefilter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24861

Modified Files:
	recipie_functions.php 
Log Message:
Disallow newlines in user input

Index: recipie_functions.php
===================================================================
RCS file: /cvsroot/serverfilters/serversidefilter/recipie_functions.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** recipie_functions.php	21 May 2005 09:13:18 -0000	1.1.1.1
--- recipie_functions.php	7 Jun 2005 22:58:50 -0000	1.2
***************
*** 183,188 ****
           $ssmatching = addslashes($recipies[$i]['matching']);
  
!          $ssstring = escapeshellcmd($ssstring);
!          $ssadd_string = escapeshellcmd($ssadd_string);
  
           fputs($nf, "\n###${ssfield} '' ${ssstring} '' ${ssfolder} '' ${ssaction} '' ${sstoFolder} '' ${sstoAddress} '' ${ssadd_string} '' ${ssmatching} \n");
--- 183,190 ----
           $ssmatching = addslashes($recipies[$i]['matching']);
  
!          $ssstring = str_replace(array("\r\n", "\r", "\n"), "", 
!                                  escapeshellcmd($ssstring));
!          $ssadd_string = str_replace(array("\r\n", "\r", "\n"), "", 
!                                      escapeshellcmd($ssadd_string));
  
           fputs($nf, "\n###${ssfield} '' ${ssstring} '' ${ssfolder} '' ${ssaction} '' ${sstoFolder} '' ${sstoAddress} '' ${ssadd_string} '' ${ssmatching} \n");

[Serverfilters-commit] serversidefilter functions.php,1.1.1.1,1.2

[Paul L. <pdo...@us...>]

Update of /cvsroot/serverfilters/serversidefilter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24751

Modified Files:
	functions.php 
Log Message:
no change whatsoever

Index: functions.php
===================================================================
RCS file: /cvsroot/serverfilters/serversidefilter/functions.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** functions.php	21 May 2005 09:13:18 -0000	1.1.1.1
--- functions.php	2 Jun 2005 06:44:19 -0000	1.2
***************
*** 23,27 ****
  function serversidefilter_optpage_register_block_do()
  {
! 
     global $optpage_blocks;
  
--- 23,27 ----
  function serversidefilter_optpage_register_block_do()
  {
!  
     global $optpage_blocks;
  

[Serverfilters-commit] serversidefilter/script filter,1.1.1.1,NONE

[Paul L. <pdo...@us...>]

Update of /cvsroot/serverfilters/serversidefilter/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18163

Removed Files:
	filter 
Log Message:
removing junk

--- filter DELETED ---

[Serverfilters-commit] serversidefilter/script Makefile,1.1.1.1,1.2 Makefile.ldap,1.1.1.1,1.2 Makefile.mysql,1.1.1.1,1.2 README,1.1.1.1,1.2 filtercmd.c,1.1.1.1,1.2 index.php,1.1.1.1,1.2

[Paul L. <pdo...@us...>]

Update of /cvsroot/serverfilters/serversidefilter/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15712/script

Modified Files:
	Makefile Makefile.ldap Makefile.mysql README filtercmd.c 
	index.php 
Log Message:
Added checkcreds_imap alternative to c-client lib

Index: Makefile.ldap
===================================================================
RCS file: /cvsroot/serverfilters/serversidefilter/script/Makefile.ldap,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.ldap	21 May 2005 09:13:19 -0000	1.1.1.1
--- Makefile.ldap	21 May 2005 19:46:19 -0000	1.2
***************
*** 47,58 ****
  #
  # filtercmd validates usernames and passwords with the c-client library from
! # UW. This library is part of pine and UW IMAP and is installed separately
! # on many Linux systems.  See http://www.washington.edu/imap/ for more
! # information.
  
  
! # This line selects c-client credentials checking. This is currently the
! # only option. 
  #
  CHECKCREDS=checkcreds_cclient.o
  
--- 47,61 ----
  #
  # filtercmd validates usernames and passwords with the c-client library from
! # UW or our own homegrown variation thereof.  The UW library is part of pine 
! # and UW IMAP and is installed separately on many Linux systems.
! # See http://www.washington.edu/imap/ for more information.
  
  
! # This line selects the client code for credentials checking.  The 
! # checkcreds_cclient library from UW is much more robust and mature 
! # but can be harder to compile.  The checkcreds_imap choice is home 
! # grown, but easier to compile.  We recommend you try checkcreds_cclient first.
  #
+ #CHECKCREDS=checkcreds_imap.o
  CHECKCREDS=checkcreds_cclient.o
  
***************
*** 60,71 ****
  # You may need to adjust the following line.  The commented-out sample below 
  # is for use when you have manually downloaded the UW-IMAP c-client library
! # and placed it in a subdirectory below serversidefilter/script.
  #
  LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto
  #LIBS=../../../plugins/serversidefilter/script/imap-2004a/c-client/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto
  # FreeBSD:
  #LIBS=-L/usr/local/lib -lc-client4 -lssl -lpam -lgssapi -lcrypt -lkrb5 -lcom_err -lz -lcrypto -lopie -lradius -lskey -ltacplus -lutil -lmd
  # Solaris(?):
  #LIBS=-lsocket -lnsl
  
  
--- 63,81 ----
  # You may need to adjust the following line.  The commented-out sample below 
  # is for use when you have manually downloaded the UW-IMAP c-client library
! # and placed it in a subdirectory below serversidefilter/script (in this case
! # called "imap-2004a").  You should be able to successfully compile with 
! # LIBS being completely empty when using CHECKCREDS=checkcreds_imap.o above.
  #
  LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto
  #LIBS=../../../plugins/serversidefilter/script/imap-2004a/c-client/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto
+ #
  # FreeBSD:
  #LIBS=-L/usr/local/lib -lc-client4 -lssl -lpam -lgssapi -lcrypt -lkrb5 -lcom_err -lz -lcrypto -lopie -lradius -lskey -ltacplus -lutil -lmd
+ #
  # Solaris(?):
  #LIBS=-lsocket -lnsl
+ #
+ # Only when CHECKCREDS=checkcreds_imap.o:
+ #LIBS=
  
  
***************
*** 76,79 ****
--- 86,90 ----
  I=/usr/include/imap
  #I=../../../plugins/serversidefilter/script/imap-2004a/c-client
+ #
  # FreeBSD:
  #I=/usr/local/include/c-client
***************
*** 175,178 ****
--- 186,192 ----
  	gcc -c checkcreds_cclient.c $(CFLAGS) $(CCLIENT_CFLAGS)
  
+ checkcreds_imap.o: checkcreds_imap.c Makefile
+ 	gcc -c checkcreds_imap.c $(CFLAGS) $(CCLIENT_CFLAGS)
+ 
  mdmysql.o: mysql/mdmysql.c Makefile
  	gcc -c mysql/mdmysql.c $(CFLAGS) $(MYSQL_FLAGS)

Index: Makefile.mysql
===================================================================
RCS file: /cvsroot/serverfilters/serversidefilter/script/Makefile.mysql,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.mysql	21 May 2005 09:13:19 -0000	1.1.1.1
--- Makefile.mysql	21 May 2005 19:46:19 -0000	1.2
***************
*** 47,58 ****
  #
  # filtercmd validates usernames and passwords with the c-client library from
! # UW. This library is part of pine and UW IMAP and is installed separately
! # on many Linux systems.  See http://www.washington.edu/imap/ for more
! # information.
  
  
! # This line selects c-client credentials checking. This is currently the
! # only option. 
  #
  CHECKCREDS=checkcreds_cclient.o
  
--- 47,61 ----
  #
  # filtercmd validates usernames and passwords with the c-client library from
! # UW or our own homegrown variation thereof.  The UW library is part of pine 
! # and UW IMAP and is installed separately on many Linux systems.
! # See http://www.washington.edu/imap/ for more information.
  
  
! # This line selects the client code for credentials checking.  The 
! # checkcreds_cclient library from UW is much more robust and mature 
! # but can be harder to compile.  The checkcreds_imap choice is home 
! # grown, but easier to compile.  We recommend you try checkcreds_cclient first.
  #
+ #CHECKCREDS=checkcreds_imap.o
  CHECKCREDS=checkcreds_cclient.o
  
***************
*** 60,71 ****
  # You may need to adjust the following line.  The commented-out sample below 
  # is for use when you have manually downloaded the UW-IMAP c-client library
! # and placed it in a subdirectory below serversidefilter/script.
  #
  LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto
  #LIBS=../../../plugins/serversidefilter/script/imap-2004a/c-client/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto
  # FreeBSD:
  #LIBS=-L/usr/local/lib -lc-client4 -lssl -lpam -lgssapi -lcrypt -lkrb5 -lcom_err -lz -lcrypto -lopie -lradius -lskey -ltacplus -lutil -lmd
  # Solaris(?):
  #LIBS=-lsocket -lnsl
  
  
--- 63,81 ----
  # You may need to adjust the following line.  The commented-out sample below 
  # is for use when you have manually downloaded the UW-IMAP c-client library
! # and placed it in a subdirectory below serversidefilter/script (in this case
! # called "imap-2004a").  You should be able to successfully compile with 
! # LIBS being completely empty when using CHECKCREDS=checkcreds_imap.o above.
  #
  LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto
  #LIBS=../../../plugins/serversidefilter/script/imap-2004a/c-client/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto
+ #
  # FreeBSD:
  #LIBS=-L/usr/local/lib -lc-client4 -lssl -lpam -lgssapi -lcrypt -lkrb5 -lcom_err -lz -lcrypto -lopie -lradius -lskey -ltacplus -lutil -lmd
+ #
  # Solaris(?):
  #LIBS=-lsocket -lnsl
+ #
+ # Only when CHECKCREDS=checkcreds_imap.o:
+ #LIBS=
  
  
***************
*** 76,79 ****
--- 86,90 ----
  I=/usr/include/imap
  #I=../../../plugins/serversidefilter/script/imap-2004a/c-client
+ #
  # FreeBSD:
  #I=/usr/local/include/c-client
***************
*** 175,178 ****
--- 186,192 ----
  	gcc -c checkcreds_cclient.c $(CFLAGS) $(CCLIENT_CFLAGS)
  
+ checkcreds_imap.o: checkcreds_imap.c Makefile
+ 	gcc -c checkcreds_imap.c $(CFLAGS) $(CCLIENT_CFLAGS)
+ 
  mdmysql.o: mysql/mdmysql.c Makefile
  	gcc -c mysql/mdmysql.c $(CFLAGS) $(MYSQL_FLAGS)

Index: filtercmd.c
===================================================================
RCS file: /cvsroot/serverfilters/serversidefilter/script/filtercmd.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** filtercmd.c	21 May 2005 09:13:18 -0000	1.1.1.1
--- filtercmd.c	21 May 2005 19:46:19 -0000	1.2
***************
*** 38,43 ****
   *	name and port is read from the squirrelmail configuration file.
   *	
!  * 	Authentication is performed using the c-client software from UW.
!  *	See checkcreds_cclient.c for more details.
   *	
   *  RC FILE LOCATIONS
--- 38,44 ----
   *	name and port is read from the squirrelmail configuration file.
   *	
!  * 	Authentication is performed using the c-client software from UW or
!  *      or own simplified version thereof.
!  *	See checkcreds_cclient.c or checkcreds_imap.c for more details.
   *	
   *  RC FILE LOCATIONS


Index: README
===================================================================
RCS file: /cvsroot/serverfilters/serversidefilter/script/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README	21 May 2005 09:13:19 -0000	1.1.1.1
--- README	21 May 2005 19:46:19 -0000	1.2
***************
*** 20,25 ****
    it will need to write files as any mail user on the system.
  
! * The c-client library. This is a UW-IMAP library; if you 
!   do not use UW-IMAP, you may download the library from 
    http://www.washington.edu/imap/  
    As of November 2004, the download link is:
--- 20,25 ----
    it will need to write files as any mail user on the system.
  
! * OPTIONAL: The c-client library. This is a UW-IMAP library; 
!   if you do not use UW-IMAP, you may download the library from 
    http://www.washington.edu/imap/  
    As of November 2004, the download link is:
***************
*** 27,31 ****
    The Makefile also has more details, including tips on
    how to compile with a manually downloaded and compiled
!   version of this library.
  
  
--- 27,36 ----
    The Makefile also has more details, including tips on
    how to compile with a manually downloaded and compiled
!   version of this library.  This plugin contains a home-grown 
!   alternative to this library if you cannot get the c-client 
!   library to compile, but we recommend you at least try 
!   c-client first, since it is much more robust and mature.
!   Make your choice between the two in the Makefile with
!   the CHECKCREDS setting.
  
  

Index: Makefile
===================================================================
RCS file: /cvsroot/serverfilters/serversidefilter/script/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile	21 May 2005 09:13:18 -0000	1.1.1.1
--- Makefile	21 May 2005 19:46:19 -0000	1.2
***************
*** 47,58 ****
  #
  # filtercmd validates usernames and passwords with the c-client library from
! # UW. This library is part of pine and UW IMAP and is installed separately
! # on many Linux systems.  See http://www.washington.edu/imap/ for more
! # information.
  
  
! # This line selects c-client credentials checking. This is currently the
! # only option. 
  #
  CHECKCREDS=checkcreds_cclient.o
  
--- 47,61 ----
  #
  # filtercmd validates usernames and passwords with the c-client library from
! # UW or our own homegrown variation thereof.  The UW library is part of pine 
! # and UW IMAP and is installed separately on many Linux systems.
! # See http://www.washington.edu/imap/ for more information.
  
  
! # This line selects the client code for credentials checking.  The 
! # checkcreds_cclient library from UW is much more robust and mature 
! # but can be harder to compile.  The checkcreds_imap choice is home 
! # grown, but easier to compile.  We recommend you try checkcreds_cclient first.
  #
+ #CHECKCREDS=checkcreds_imap.o
  CHECKCREDS=checkcreds_cclient.o
  
***************
*** 60,71 ****
  # You may need to adjust the following line.  The commented-out sample below 
  # is for use when you have manually downloaded the UW-IMAP c-client library
! # and placed it in a subdirectory below serversidefilter/script.
  #
  LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto
  #LIBS=../../../plugins/serversidefilter/script/imap-2004a/c-client/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto
  # FreeBSD:
  #LIBS=-L/usr/local/lib -lc-client4 -lssl -lpam -lgssapi -lcrypt -lkrb5 -lcom_err -lz -lcrypto -lopie -lradius -lskey -ltacplus -lutil -lmd
  # Solaris(?):
  #LIBS=-lsocket -lnsl
  
  
--- 63,81 ----
  # You may need to adjust the following line.  The commented-out sample below 
  # is for use when you have manually downloaded the UW-IMAP c-client library
! # and placed it in a subdirectory below serversidefilter/script (in this case
! # called "imap-2004a").  You should be able to successfully compile with 
! # LIBS being completely empty when using CHECKCREDS=checkcreds_imap.o above.
  #
  LIBS=/usr/lib/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto
  #LIBS=../../../plugins/serversidefilter/script/imap-2004a/c-client/c-client.a -lssl -lpam -L/usr/kerberos/lib/ -lgssapi_krb5 -lcrypt -lkrb5 -lresolv -lcom_err -ldl -lz -lcrypto -lk5crypto
+ #
  # FreeBSD:
  #LIBS=-L/usr/local/lib -lc-client4 -lssl -lpam -lgssapi -lcrypt -lkrb5 -lcom_err -lz -lcrypto -lopie -lradius -lskey -ltacplus -lutil -lmd
+ #
  # Solaris(?):
  #LIBS=-lsocket -lnsl
+ #
+ # Only when CHECKCREDS=checkcreds_imap.o:
+ #LIBS=
  
  
***************
*** 76,79 ****
--- 86,90 ----
  I=/usr/include/imap
  #I=../../../plugins/serversidefilter/script/imap-2004a/c-client
+ #
  # FreeBSD:
  #I=/usr/local/include/c-client
***************
*** 175,178 ****
--- 186,192 ----
  	gcc -c checkcreds_cclient.c $(CFLAGS) $(CCLIENT_CFLAGS)
  
+ checkcreds_imap.o: checkcreds_imap.c Makefile
+ 	gcc -c checkcreds_imap.c $(CFLAGS) $(CCLIENT_CFLAGS)
+ 
  mdmysql.o: mysql/mdmysql.c Makefile
  	gcc -c mysql/mdmysql.c $(CFLAGS) $(MYSQL_FLAGS)

[Serverfilters-commit] serversidefilter/script/mysql index.php,1.1.1.1,1.2

[Paul L. <pdo...@us...>]

Update of /cvsroot/serverfilters/serversidefilter/script/mysql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15712/script/mysql

Modified Files:
	index.php 
Log Message:
Added checkcreds_imap alternative to c-client lib

[Serverfilters-commit] serversidefilter/script/ldap index.php,1.1.1.1,1.2

[Paul L. <pdo...@us...>]

Update of /cvsroot/serverfilters/serversidefilter/script/ldap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15712/script/ldap

Modified Files:
	index.php 
Log Message:
Added checkcreds_imap alternative to c-client lib

[Serverfilters-commit] serversidefilter CHANGELOG,1.1.1.1,1.2 INSTALL,1.1.1.1,1.2 README,1.1.1.1,1.2 TODO,1.1.1.1,1.2 index.php,1.1.1.1,1.2 setup.php,1.1.1.1,1.2 version,1.1.1.1,1.2

[Paul L. <pdo...@us...>]

Update of /cvsroot/serverfilters/serversidefilter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15712

Modified Files:
	CHANGELOG INSTALL README TODO index.php setup.php version 
Log Message:
Added checkcreds_imap alternative to c-client lib

Index: setup.php
===================================================================
RCS file: /cvsroot/serverfilters/serversidefilter/setup.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** setup.php	21 May 2005 09:13:18 -0000	1.1.1.1
--- setup.php	21 May 2005 19:46:19 -0000	1.2
***************
*** 44,48 ****
  {
  
!    return '1.5';
  
  }
--- 44,48 ----
  {
  
!    return '1.5-1.2.7-alpha-1';
  
  }

Index: version
===================================================================
RCS file: /cvsroot/serverfilters/serversidefilter/version,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** version	21 May 2005 09:13:18 -0000	1.1.1.1
--- version	21 May 2005 19:46:19 -0000	1.2
***************
*** 1,2 ****
  Server Side Filter
! 1.5
--- 1,2 ----
  Server Side Filter
! 1.5-1.2.7-alpha-1

Index: INSTALL
===================================================================
RCS file: /cvsroot/serverfilters/serversidefilter/INSTALL,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** INSTALL	21 May 2005 09:13:18 -0000	1.1.1.1
--- INSTALL	21 May 2005 19:46:19 -0000	1.2
***************
*** 81,87 ****
        above for other backends as needed.
  
- TODO: document alternative simpler check auth suid script instead of the UW IMAP lib
- TODO: document alternative simpler check auth suid script instead of the UW IMAP lib
- TODO: document alternative simpler check auth suid script instead of the UW IMAP lib
  6) Compile the filtercmd executable in the script directory.
     For information on how to compile the binary yourself, refer 
--- 81,84 ----


Index: README
===================================================================
RCS file: /cvsroot/serverfilters/serversidefilter/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README	21 May 2005 09:13:18 -0000	1.1.1.1
--- README	21 May 2005 19:46:19 -0000	1.2
***************
*** 93,97 ****
  
     cd script/
!    ./test.sh
  
  For more help with the access and management of filter files, refer 
--- 93,97 ----
  
     cd script/
!    make test
  
  For more help with the access and management of filter files, refer 

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/serverfilters/serversidefilter/CHANGELOG,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CHANGELOG	21 May 2005 09:13:18 -0000	1.1.1.1
--- CHANGELOG	21 May 2005 19:46:19 -0000	1.2
***************
*** 26,30 ****
   - Closed security problem where Maildrop filters could be 
     exploited to make Maildrop run any shell commands.
!    
  
  Version 1.41
--- 26,31 ----
   - Closed security problem where Maildrop filters could be 
     exploited to make Maildrop run any shell commands.
!  - Added new checkcreds_imap alternative to the UW
!    c-client library (thanks to David Phillips <david at geektech.com>).
  
  Version 1.41
***************
*** 32,35 ****
--- 33,37 ----
  1.  Fixed infinite loop bug
  
+ 
  Version 1.40
  ------------
***************
*** 50,54 ****
--- 52,59 ----
  8.  Added direct delete option
  
+ 
  Version 1.33
  ------------
  1.  Fixed the LOCAL_MAILDIR variable to support the [DOMAIN] option
+ 
+ 

Index: TODO
===================================================================
RCS file: /cvsroot/serverfilters/serversidefilter/TODO,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TODO	21 May 2005 09:13:18 -0000	1.1.1.1
--- TODO	21 May 2005 19:46:19 -0000	1.2
***************
*** 3,9 ****
  
  
- integrate alternative easy IMAP login auth code instead of UW lib
- 
- 
  bring back FTP functionality
  
--- 3,6 ----

[Serverfilters-commit] serversidefilter/script checkcreds_imap.c,NONE,1.1

[Paul L. <pdo...@us...>]

Update of /cvsroot/serverfilters/serversidefilter/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14528/script

Added Files:
	checkcreds_imap.c 
Log Message:
Initial checkin

--- NEW FILE: checkcreds_imap.c ---
/*
 * Credential checking using IMAP
 *
 * David Phillips <david <at> geektech.com>
 *
 * Public domain
 *
 */

#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <errno.h>
#include <netdb.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>

// error definitions
#include "filtercmd.h"

 char *checkcreds_extra_configvar = "";

 static int socket_connect(const char *host, int port)
 {
 struct in_addr addr;
 struct hostent *hent;
 struct sockaddr_in saddr;
 int s;
 int r;

 if (inet_aton(host, &addr) == 0)
 {
 hent = gethostbyname(host);
 if (hent == NULL)
 return -1;
 addr = *((struct in_addr *)hent->h_addr);
 }
 saddr.sin_family = AF_INET;
 saddr.sin_addr = addr;
 saddr.sin_port = htons(port);
 memset(&saddr.sin_zero, 0, 8);

 s = socket(AF_INET, SOCK_STREAM, 0);
 if (s == -1)
 return -1;

 if (connect(s, (struct sockaddr *)&saddr, sizeof(struct sockaddr)) == -1)
 {
 close(s);
 return -1;
 }

 return s;
 }

 int checkcredentials(imapserver, imapport, user, passwd, extra)
 char *imapserver;
 int imapport;
 char *user;
 char *passwd;
 char *extra;
 {
 char LOGOUT[] = "a2 LOGOUT\r\n";
 int s;
 char buf[4096];
 FILE *fp;

 s = socket_connect(imapserver, imapport);
 if (s == -1)
 return ERR_CANT_READ_IMAP_SERVER;

 fp = fdopen(s, "r+");

 if (fgets(buf, sizeof(buf), fp) == NULL)
 goto error;

 fprintf(fp, "a1 LOGIN %s %s\r\n", user, passwd);

 if (fgets(buf, sizeof(buf), fp) == NULL)
 goto error;

 fprintf(fp, "a2 LOGOUT\r\n");
 fclose(fp);

#ifdef DEBUG
 fprintf(stderr, "IMAP response: %s\n", buf);
#endif

 if (strstr(buf, "OK") == NULL)
 return ERR_BAD_CREDENTIALS;

 return ERR_OK;

 error:
 fclose(fp);
 return ERR_CANT_READ_IMAP_SERVER;
 }

[Serverfilters-commit] images delete.gif,1.1.1.1,NONE down.gif,1.1.1.1,NONE saveas.gif,1.1.1.1,NONE save.gif,1.1.1.1,NONE up.gif,1.1.1.1,NONE

[Paul L. <pdo...@us...>]

Update of /cvsroot/serverfilters/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1565/images

Removed Files:
	delete.gif down.gif saveas.gif save.gif up.gif 
Log Message:
All this needs to be in a module

--- down.gif DELETED ---

--- up.gif DELETED ---

--- delete.gif DELETED ---

--- saveas.gif DELETED ---

--- save.gif DELETED ---

[Serverfilters-commit] skeleton footer.sample,1.1,NONE header.sample,1.1,NONE

[Paul L. <pdo...@us...>]

Update of /cvsroot/serverfilters/skeleton
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1565/skeleton

Removed Files:
	footer.sample header.sample 
Log Message:
All this needs to be in a module

--- footer.sample DELETED ---

--- header.sample DELETED ---

[Serverfilters-commit] script checkcreds_cclient.c,1.5,NONE filtercmd.c,1.15,NONE filtercmd.h,1.4,NONE Makefile,1.8,NONE README,1.2,NONE test.sh,1.8,NONE

[Paul L. <pdo...@us...>]

Update of /cvsroot/serverfilters/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1565/script

Removed Files:
	checkcreds_cclient.c filtercmd.c filtercmd.h Makefile README 
	test.sh 
Log Message:
All this needs to be in a module

--- README DELETED ---

--- filtercmd.c DELETED ---

--- test.sh DELETED ---

--- checkcreds_cclient.c DELETED ---

--- Makefile DELETED ---

--- filtercmd.h DELETED ---

[Serverfilters-commit] ChangeLog,1.9,NONE config.php,1.13,NONE config.php.sample,1.4,NONE FAQ,1.1,NONE functions.php,1.16,NONE getpot,1.1,NONE index.php,1.1.1.1,NONE migrate_config.php,1.2,NONE options.php,1.19,NONE package,1.9,NONE README,1.15,NONE recipie_functions.php,1.13,NONE serversidefilter.pot,1.2,NONE setup.php,1.4,NONE version,1.4,NONE virtualdomains.sample,1.1,NONE

[Paul L. <pdo...@us...>]

Update of /cvsroot/serverfilters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1292

Removed Files:
	ChangeLog config.php config.php.sample FAQ functions.php 
	getpot index.php migrate_config.php options.php package README 
	recipie_functions.php serversidefilter.pot setup.php version 
	virtualdomains.sample 
Log Message:
All this needs to be in a module

--- options.php DELETED ---

--- virtualdomains.sample DELETED ---

--- recipie_functions.php DELETED ---

--- getpot DELETED ---

--- package DELETED ---

--- migrate_config.php DELETED ---

--- ChangeLog DELETED ---

--- index.php DELETED ---

--- setup.php DELETED ---

--- config.php DELETED ---

--- version DELETED ---

--- config.php.sample DELETED ---

--- README DELETED ---

--- serversidefilter.pot DELETED ---

--- functions.php DELETED ---

--- FAQ DELETED ---

[Serverfilters-commit] backend.php,1.20,NONE

[Paul L. <pdo...@us...>]

Update of /cvsroot/serverfilters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1097

Removed Files:
	backend.php 
Log Message:
All this needs to be in a module

--- backend.php DELETED ---

[Serverfilters-commit] script checkcreds_cclient.c,1.4,1.5

[Tony L. <ton...@us...>]

Update of /cvsroot/serverfilters/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4202/script

Modified Files:
	checkcreds_cclient.c 
Log Message:
String literal concatenation causing problems; only show password in extra verbose mode

Index: checkcreds_cclient.c
===================================================================
RCS file: /cvsroot/serverfilters/script/checkcreds_cclient.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** checkcreds_cclient.c	3 Apr 2004 21:56:36 -0000	1.4
--- checkcreds_cclient.c	29 Apr 2004 14:22:35 -0000	1.5
***************
*** 58,63 ****
  
  	snprintf(mailboxname, MAILTMPLEN, 
! 		"{%s:%d/service=imap/user=%s" MAILBOXFLAGS "%s}INBOX", 
! 		imapserver, imapport, user, extra);
  		
  	if (debugon()) {
--- 58,63 ----
  
  	snprintf(mailboxname, MAILTMPLEN, 
! 		"{%s:%d/service=imap/user=%s%s%s}INBOX", 
! 		imapserver, imapport, user, MAILBOXFLAGS, extra);
  		
  	if (debugon()) {
***************
*** 79,83 ****
  	if (debugon()) {
  		fprintf(stderr, "mm_login: {%s/%s/user=\"%s\"}\n",mb->host,mb->service,mb->user);
! 		fprintf(stderr, "mm_login -> %s %s\n", callback_user, callback_passwd);
  	}
  
--- 79,84 ----
  	if (debugon()) {
  		fprintf(stderr, "mm_login: {%s/%s/user=\"%s\"}\n",mb->host,mb->service,mb->user);
! 		fprintf(stderr, "mm_login -> %s %s\n", callback_user, 
! 			debugon() > 1 ? callback_passwd : "");
  	}
  

[Serverfilters-commit] script Makefile,1.7,1.8 checkcreds_cclient.c,1.3,1.4 filtercmd.c,1.14,1.15 test.sh,1.7,1.8

[Tony L. <ton...@us...>]

Update of /cvsroot/serverfilters/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20340

Modified Files:
	Makefile checkcreds_cclient.c filtercmd.c test.sh 
Log Message:
* Enhanced FREEBSD compatibility (patches contributed by st...@sm...)
* Debug option now run-time (FILTERCMDDEBUG envar) instead of compile-time
* $cclient_mailboxflags run-time option
* $imapPort read from config file



Index: test.sh
===================================================================
RCS file: /cvsroot/serverfilters/script/test.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** test.sh	2 Mar 2004 02:56:02 -0000	1.7
--- test.sh	3 Apr 2004 21:56:36 -0000	1.8
***************
*** 17,36 ****
  cd $RUNFROM
  cat $SCRIPTDIR/test_creds | $SCRIPTDIR/filtercmd getrc filter > $SCRIPTDIR/filter; 
! if [ $? == '0' ] ; then
     echo "Pass: Filter get"
  else
!    echo "RESULT:" $?
  fi;
  cp $SCRIPTDIR/filter $SCRIPTDIR/filter.orig
  echo '# filtercmd testing ' >> $SCRIPTDIR/filter
  cat $SCRIPTDIR/test_creds $SCRIPTDIR/filter | $SCRIPTDIR/filtercmd putrc filter;
! rm $SCRIPTDIR/filter
! if [ $? == '0' ] ; then
     echo "Pass: Filter put"
  else
!    echo "RESULT:" $?
  fi;
  cat $SCRIPTDIR/test_creds | $SCRIPTDIR/filtercmd getrc filter > $SCRIPTDIR/filter;
! if [ $? == '0' ] ; then
     command=`grep "filtercmd testing" $SCRIPTDIR/filter`;
     if [ -n "$command" ] ; then
--- 17,39 ----
  cd $RUNFROM
  cat $SCRIPTDIR/test_creds | $SCRIPTDIR/filtercmd getrc filter > $SCRIPTDIR/filter; 
! xx=$?
! if [ $xx -eq '0' ] ; then
     echo "Pass: Filter get"
  else
!    echo "RESULT:" $xx
  fi;
  cp $SCRIPTDIR/filter $SCRIPTDIR/filter.orig
  echo '# filtercmd testing ' >> $SCRIPTDIR/filter
  cat $SCRIPTDIR/test_creds $SCRIPTDIR/filter | $SCRIPTDIR/filtercmd putrc filter;
! xx=$?
! if [ $xx -eq '0' ] ; then
     echo "Pass: Filter put"
  else
!    echo "RESULT:" $xx
  fi;
+ rm $SCRIPTDIR/filter
  cat $SCRIPTDIR/test_creds | $SCRIPTDIR/filtercmd getrc filter > $SCRIPTDIR/filter;
! xx=$?
! if [ $xx -eq '0' ] ; then
     command=`grep "filtercmd testing" $SCRIPTDIR/filter`;
     if [ -n "$command" ] ; then
***************
*** 43,47 ****
     fi;
  else
!    echo "RESULT:" $?
  fi;
  
--- 46,50 ----
     fi;
  else
!    echo "RESULT:" $xx
  fi;
  
***************
*** 54,58 ****
  done;
  
! if [ $REMOVE == 'y' ] || [ $REMOVE == 'Y' ] ; then
     rm $SCRIPTDIR/test_creds
  fi;
--- 57,61 ----
  done;
  
! if [ $REMOVE = 'y' ] || [ $REMOVE = 'Y' ] ; then
     rm $SCRIPTDIR/test_creds
  fi;

Index: checkcreds_cclient.c
===================================================================
RCS file: /cvsroot/serverfilters/script/checkcreds_cclient.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** checkcreds_cclient.c	1 Mar 2004 01:20:24 -0000	1.3
--- checkcreds_cclient.c	3 Apr 2004 21:56:36 -0000	1.4
***************
*** 4,7 ****
--- 4,9 ----
   */
  
+ #include <stdio.h>
+ 
  // error definitions
  #include "filtercmd.h"
***************
*** 11,23 ****
  
  #ifndef MAILBOXFLAGS
! #define MAILBOXFLAGS "/norsh/notls"
  #endif
  
  static char *callback_user, *callback_passwd;
  
! int checkcredentials(imapserver, user, passwd) 
  char *imapserver;
  char *user;
  char *passwd;
  {
  	char mailboxname[MAILTMPLEN];
--- 13,28 ----
  
  #ifndef MAILBOXFLAGS
! #define MAILBOXFLAGS "/norsh"
  #endif
  
  static char *callback_user, *callback_passwd;
+ char *checkcreds_extra_configvar = "$cclient_mailboxflags";
  
! int checkcredentials(imapserver, imapport, user, passwd, extra)
  char *imapserver;
+ int imapport;
  char *user;
  char *passwd;
+ char *extra;
  {
  	char mailboxname[MAILTMPLEN];
***************
*** 49,53 ****
    	mail_parameters(NIL, SET_MAXLOGINTRIALS, (void*)1);
  
! 	snprintf(mailboxname, MAILTMPLEN, "{%s/service=imap/user=\"%s\"" MAILBOXFLAGS  "}INBOX", imapserver, user);
  
  	stream = mail_open(NIL, mailboxname, NIL);
--- 54,67 ----
    	mail_parameters(NIL, SET_MAXLOGINTRIALS, (void*)1);
  
!         /* extra may be null (if configvar was not set) */
!         if (!extra) extra = "";
! 
! 	snprintf(mailboxname, MAILTMPLEN, 
! 		"{%s:%d/service=imap/user=%s" MAILBOXFLAGS "%s}INBOX", 
! 		imapserver, imapport, user, extra);
! 		
! 	if (debugon()) {
! 		fprintf(stderr, "c-client mailboxname: %s\n", mailboxname);
! 	}
  
  	stream = mail_open(NIL, mailboxname, NIL);
***************
*** 61,70 ****
  }
  
! /* we must store user and password when this is called */
  void mm_login (NETMBX *mb,char *user,char *pwd,long trial) {
! 	#ifdef DEBUG
! 	fprintf(stderr, "mm_login: {%s/%s/user=\"%s\"}\n",mb->host,mb->service,mb->user);
! 	fprintf(stderr, "mm_login -> %s %s\n", callback_user, callback_passwd);
! 	#endif
  
  	strncpy(user, callback_user, MAILTMPLEN);
--- 75,84 ----
  }
  
! /* we must store user and password when this is called by the c-client library */
  void mm_login (NETMBX *mb,char *user,char *pwd,long trial) {
! 	if (debugon()) {
! 		fprintf(stderr, "mm_login: {%s/%s/user=\"%s\"}\n",mb->host,mb->service,mb->user);
! 		fprintf(stderr, "mm_login -> %s %s\n", callback_user, callback_passwd);
! 	}
  
  	strncpy(user, callback_user, MAILTMPLEN);
***************
*** 72,86 ****
  }
  void mm_log (char *string,long errflg) {
!   #ifdef DEBUG
!   char *errflgname;
!   switch ((short) errflg) {
!     case NIL: 	errflgname = "NIL"; break;
!     case PARSE: errflgname = "PARSE"; break;
!     case WARN: 	errflgname = "WARN"; break;
!     case ERROR:	errflgname = "ERROR"; break;
!     default: 	errflgname = "?"; break;    
!   };
!   fprintf(stderr, "mm_log: %s: %s\n", errflgname, string);
!   #endif
  }
  void mm_notify (MAILSTREAM *stream,char *string,long errflg) {
--- 86,100 ----
  }
  void mm_log (char *string,long errflg) {
! 	char *errflgname;
! 	switch ((short) errflg) {
! 		case NIL:	errflgname = "NIL"; break;
! 		case PARSE: 	errflgname = "PARSE"; break;
! 		case WARN:	errflgname = "WARN"; break;
! 		case ERROR:	errflgname = "ERROR"; break;
! 		default:	errflgname = "?"; break;
! 	}
! 	if (debugon()) {
! 		fprintf(stderr, "mm_log: %s: %s\n", errflgname, string);
! 	}
  }
  void mm_notify (MAILSTREAM *stream,char *string,long errflg) {

Index: Makefile
===================================================================
RCS file: /cvsroot/serverfilters/script/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile	2 Mar 2004 03:24:19 -0000	1.7
--- Makefile	3 Apr 2004 21:56:36 -0000	1.8
***************
*** 7,11 ****
  # change this to match the group your HTTPD server runs as.
  # The resulting binary will be owned by this group.
! HTTPD_GROUP=apache
  
  # If you are having problems connecting, recompile with this 
--- 7,11 ----
  # change this to match the group your HTTPD server runs as.
  # The resulting binary will be owned by this group.
! HTTPD_GROUP=http
  
  # If you are having problems connecting, recompile with this 

Index: filtercmd.c
===================================================================
RCS file: /cvsroot/serverfilters/script/filtercmd.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** filtercmd.c	1 Mar 2004 16:16:36 -0000	1.14
--- filtercmd.c	3 Apr 2004 21:56:36 -0000	1.15
***************
*** 24,29 ****
   *
   *	The putrc command will read an rc file from standard input, after 
!  *	reading the credentials, and replace the existing rcfile. Note: the use 
!  *	of two input-redirections is intended to indicate that the 
   *
   *	The rcexists command will return a zero exit status if the rc file exists,
--- 24,28 ----
   *
   *	The putrc command will read an rc file from standard input, after 
!  *	reading the credentials, and replace the existing rcfile.
   *
   *	The rcexists command will return a zero exit status if the rc file exists,
***************
*** 88,91 ****
--- 87,93 ----
   *  DIAGNOSTICS
   *
+  *	Setting an environment variable FILTERCMDDEBUG to 1 will 
+  *	cause debugging output to be printed.
+  *
   *	filtercmd will exit with a non-zero status if an error occurs.
   *	filtercmd will write text to standard error in the case of
***************
*** 96,102 ****
  #define STR_MAX 1024
  #define MAXLEN 1024
! 
! /* define DEBUG for debugging output */
! /* #define DEBUG */
  
  /* define this in filtercmd.opts */
--- 98,102 ----
  #define STR_MAX 1024
  #define MAXLEN 1024
! #define VERSION "filtercmd 1.41, part of serversidefilter for squirrelmail"
  
  /* define this in filtercmd.opts */
***************
*** 109,112 ****
--- 109,113 ----
  
  #include <stdio.h>
+ #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
***************
*** 116,121 ****
  #include "filtercmd.h"
  
! /* externally defined functions */
! int  checkcredentials(char*, char*, char*);
  
  /* global variables -- used in path calculation code (findfilterfile) */
--- 117,123 ----
  #include "filtercmd.h"
  
! /* externally defined functions and variables */
! extern char *checkcreds_extra_configvar;
! int  checkcredentials(char*, int, char*, char*, char*);
  
  /* global variables -- used in path calculation code (findfilterfile) */
***************
*** 126,129 ****
--- 128,136 ----
  char *domain;		   /* The domain of the IMAP username */
  
+ /* function prototypes */
+ void eperror(register char *s, int exitcode);
+ void setdebug(int *argc, char ***argv);
+ void printversion();
+ 
  int main(int argc, char *argv[]){
  	/*
***************
*** 139,154 ****
  	char temp_file[STR_MAX];
  	char imap_server[STR_MAX];
  	uid_t UID;
  	gid_t GID;
  	
  	err = readcredentials(user, passwd, STR_MAX);
   	if (err) return inerror(err);
  
!  	err = readimapserver(imap_server, STR_MAX);
   	if (err) return inerror(err);
  
! 	#ifdef DEBUG
! 	fprintf(stderr, "user: %s\n", user);
! 	#endif
  	
  	if (splitdomain(user, &domain, dom_user, STR_MAX)) {
--- 146,171 ----
  	char temp_file[STR_MAX];
  	char imap_server[STR_MAX];
+ 	char checkcreds_extra[STR_MAX] = "";
+ 	int imap_port;
  	uid_t UID;
  	gid_t GID;
  	
+ 	setdebug(&argc, &argv);
+ 	
+ 	/* look for the "version" command early */
+ 	if (argc > 1 && !strcmp("version", argv[1])) {
+ 		printversion();
+ 		return ERR_OK;
+ 	}
+ 	
  	err = readcredentials(user, passwd, STR_MAX);
   	if (err) return inerror(err);
  
!  	err = readimapserver(imap_server, &imap_port, STR_MAX);
   	if (err) return inerror(err);
  
! 	if (debugon()) {
! 		fprintf(stderr, "imap user validated: %s\n", user);
! 	}
  	
  	if (splitdomain(user, &domain, dom_user, STR_MAX)) {
***************
*** 160,167 ****
  	}
  	
! 	#ifdef DEBUG
! 	fprintf(stderr, "domain: %s\n", domain);
! 	fprintf(stderr, "dom_user: %s\n", dom_user);
! 	#endif
  	
   	err = finduidgid(real_user, &UID, &GID);
--- 177,184 ----
  	}
  	
! 	if (debugon()) {
! 		fprintf(stderr, "domain: %s\n", domain);
! 		fprintf(stderr, "dom_user: %s\n", dom_user);
! 	}
  	
   	err = finduidgid(real_user, &UID, &GID);
***************
*** 171,175 ****
  	if((setuid(UID)) < 0) eperror("setuid", ERR_NOT_SUID);
  
! 	err = checkcredentials(imap_server, user, passwd);
  	if (err) return inerror(err);
  
--- 188,197 ----
  	if((setuid(UID)) < 0) eperror("setuid", ERR_NOT_SUID);
  
! 	if (checkcreds_extra_configvar) {
! 		readconfigvar(SERVERSIDEFILTERHOME "/config.php", checkcreds_extra_configvar, 
! 			checkcreds_extra, STR_MAX);
! 	}
! 
! 	err = checkcredentials(imap_server, imap_port, user, passwd, checkcreds_extra);
  	if (err) return inerror(err);
  
***************
*** 242,245 ****
--- 264,298 ----
  }
  
+ static int _debuglevel = 0;
+ int debugon() {
+ 	return _debuglevel;
+ }
+ 
+ /*
+  * Figure out from the environment/arguments what the current debug level
+  * should be. Currently this only reads the environment. Pointers to argc and
+  * argv are provided, so that this routine can (in the future) remove any 
+  * debug-related arguments.
+  *
+  * Parameters:
+  *   argc - IN/OUT.
+  *   argv - IN/OUT. 
+  */
+ void setdebug(int *argc, char ***argv) {
+ 	char *FILTERCMDDEBUG;
+ 	FILTERCMDDEBUG = getenv("FILTERCMDDEBUG");
+ 	if (FILTERCMDDEBUG) {
+ 		sscanf(FILTERCMDDEBUG, "%d", &_debuglevel);
+ 	}
+ }
+ 
+ void printversion() {
+ 	puts(	VERSION "\n"
+ 		"\n"
+ 		"Compile-time definitions:\n"
+ 		"\tSQUIRRELMAILCONFIGFILE: " SQUIRRELMAILCONFIGFILE "\n"
+ 		"\tSERVERSIDEFILTERHOME: " SERVERSIDEFILTERHOME "\n"
+ 		);
+ }
  
  /* 
***************
*** 282,286 ****
  
  /*
!  * Reads IMAP server information from SQUIRRELMAILCONFIGFILE.
   *
   * Parameters:
--- 335,342 ----
  
  /*
!  * Reads IMAP server information from SQUIRRELMAILCONFIGFILE. Also 
!  * reads the port. The routine is not fussy about finding a port 
!  * specification in the file -- it will just set a useful default if 
!  * there are issues.
   *
   * Parameters:
***************
*** 288,299 ****
   *   serverlen - IN. buffer size of the server buffer.
   * Returns:
!  *   ERR_OK if it found all the parameters, an error code if not.
   */
   
! int readimapserver(server, serverlen) 
! char *server;
! int serverlen;
  {
  	int foundserver;
  	foundserver = readconfigvar(SQUIRRELMAILCONFIGFILE, "$imapServerAddress", server, serverlen);
  	return foundserver ? ERR_OK : ERR_CANT_READ_IMAP_SERVER;
--- 344,360 ----
   *   serverlen - IN. buffer size of the server buffer.
   * Returns:
!  *   ERR_OK if it found the necessary parameters, an error code if not.
   */
   
! int readimapserver(char *server, int *port, int serverlen) 
  {
  	int foundserver;
+ 	char port_str[STR_MAX];
+ 	
+ 	*port = 143; /* a useful default */
+ 	if (readconfigvar(SQUIRRELMAILCONFIGFILE, "$imapPort", port_str, STR_MAX)) {
+ 		sscanf(port_str, "%d", port);
+ 	}
+ 	
  	foundserver = readconfigvar(SQUIRRELMAILCONFIGFILE, "$imapServerAddress", server, serverlen);
  	return foundserver ? ERR_OK : ERR_CANT_READ_IMAP_SERVER;
***************
*** 323,329 ****
  	if (err) return err;
  	while (fgets(line, STR_MAX, f)) {
! 		/*fprintf(stderr, "config: %s", line);*/
! 		if (!found) 
! 			found = parsephpstring(phpvar, line, outbuf, outbuflen);
  	}
  	return found;
--- 384,392 ----
  	if (err) return err;
  	while (fgets(line, STR_MAX, f)) {
! 		found = parsephpstring(phpvar, line, outbuf, outbuflen);
! 		if (found) break;
! 	}
! 	if (debugon()) {
! 		fprintf(stderr, "config: %s %s -> %d\n", configfile, phpvar, found);
  	}
  	return found;
***************
*** 361,368 ****
  
  /*
!  * Looks for a given varname in a line of PHP code; if it is found, the
!  * code will try to parse out the value between quotes. This funtion is 
!  * easily confused and when it returns 1 it means the variable was found, 
!  * not necessarily that the string contents were successfully passed.
   *
   * Parameters:
--- 424,431 ----
  
  /*
!  * Looks for a given varname in a line of PHP code; if it is found, the code
!  * will try to parse out the number or string between quotes. This function
!  * is easily confused and when it returns 1 it means the variable was found,
!  * not necessarily that the string contents were successfully parsed.
   *
   * Parameters:
***************
*** 394,400 ****
  	if (commentpos && commentpos < s) return 0;
  
! 	/* skip ahead to either ' or " */
! 	s += strcspn(s, "\"'\0\n") + 1;
! 	n = strcspn(s, "\"'\0\n");
  	if (n > destlen) n = destlen;
  	strncpy(dest, s, n);
--- 457,471 ----
  	if (commentpos && commentpos < s) return 0;
  
! 	/* skip ahead to either ' or " or a number */
! 	s += strcspn(s, "\"'0123456789\0\n");
! 	if (strchr("0123456789", *s)) {
! 	  /* found number - now find semicolon, space or EOL */
! 	  n = strcspn(s, "; \0\n");
! 	} else {
! 	  /* found quote - now find next quote or EOL */
! 	  /* this does not find matching quotes */
! 	  s++;
! 	  n = strcspn(s, "\"'\0\n");
! 	}
  	if (n > destlen) n = destlen;
  	strncpy(dest, s, n);
***************
*** 664,668 ****
  	do {
  		if (stat(filepath, &buf)) 
! 			eperror(filepath);
  	        if (buf.st_mode & S_IWOTH)
          		return trusted_error("writable by others", curpath, filepath);
--- 735,739 ----
  	do {
  		if (stat(filepath, &buf)) 
! 			eperror(filepath, ERR_CANT_TRUST_FILE);
  	        if (buf.st_mode & S_IWOTH)
          		return trusted_error("writable by others", curpath, filepath);

[Serverfilters-commit] README,1.14,1.15

[<jgs...@us...>]

Update of /cvsroot/serverfilters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5526

Modified Files:
	README 
Log Message:
Modified installation steps.

[Serverfilters-commit] ChangeLog,1.8,1.9 setup.php,1.3,1.4 version,1.3,1.4

[<jgs...@us...>]

Update of /cvsroot/serverfilters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14299

Modified Files:
	ChangeLog setup.php version 
Log Message:
Fixed changelog to reflect bugfix


Index: setup.php
===================================================================
RCS file: /cvsroot/serverfilters/setup.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** setup.php	1 Mar 2004 06:26:42 -0000	1.3
--- setup.php	5 Mar 2004 17:17:06 -0000	1.4
***************
*** 42,46 ****
  function serversidefilter_version() {
  
!          return '1.40';
  
  }
--- 42,46 ----
  function serversidefilter_version() {
  
!          return '1.41';
  
  }

Index: version
===================================================================
RCS file: /cvsroot/serverfilters/version,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** version	2 Mar 2004 03:30:22 -0000	1.3
--- version	5 Mar 2004 17:17:06 -0000	1.4
***************
*** 1,2 ****
  Serverside Filter Configuration
! 1.40
--- 1,2 ----
  Serverside Filter Configuration
! 1.41

[Serverfilters-commit] backend.php,1.19,1.20 recipie_functions.php,1.12,1.13

[<jgs...@us...>]

Update of /cvsroot/serverfilters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11807

Modified Files:
	backend.php recipie_functions.php 
Log Message:
Fixed infinite loop problem.


Index: recipie_functions.php
===================================================================
RCS file: /cvsroot/serverfilters/recipie_functions.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** recipie_functions.php	1 Mar 2004 17:24:00 -0000	1.12
--- recipie_functions.php	5 Mar 2004 17:06:20 -0000	1.13
***************
*** 227,233 ****
                  fputs($nf, $footer);
  		fclose($nf);
! 		filter_put($file);
!                 if (isset($FORWARD_FILE_PATH))
!                     write_forward();
  	}
  
--- 227,234 ----
                  fputs($nf, $footer);
  		fclose($nf);
! 		$err_code = filter_put($file);
!                 if (isset($FORWARD_FILE_PATH) and !$err_code)
!                     $err_code = write_forward();
!                 return $err_code;
  	}
  

[Serverfilters-commit] README,1.13,1.14

[<jgs...@us...>]

Update of /cvsroot/serverfilters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6601

Modified Files:
	README 
Log Message:
Remove comment that squirrelmail 1.2.x is supported, cuz it aint.

[Serverfilters-commit] README,1.12,1.13

[<jgs...@us...>]

Update of /cvsroot/serverfilters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20498

Modified Files:
	README 
Log Message:
Updated installation instruction to reflect migrate_config.php changes;

[Serverfilters-commit] package,1.8,1.9

[<jgs...@us...>]

Update of /cvsroot/serverfilters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20332

Modified Files:
	package 
Log Message:
Oops, still missed a few files.

[Serverfilters-commit] package,1.7,1.8

[<jgs...@us...>]

Update of /cvsroot/serverfilters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19314

Modified Files:
	package 
Log Message:
Updated to suppoart new files.

[Serverfilters-commit] version,1.2,1.3

[<jgs...@us...>]

Update of /cvsroot/serverfilters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19282

Modified Files:
	version 
Log Message:
Updated version number

[Serverfilters-commit] ChangeLog,1.7,1.8

[<jgs...@us...>]

Update of /cvsroot/serverfilters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19206

Modified Files:
	ChangeLog 
Log Message: