Menu
▾
▴
[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
|
From: Paul L. <pdo...@us...> - 2005-05-21 19:46:29
|
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) |
