OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [email protected] Module: openpkg-src Date: 25-Dec-2008 18:59:39 Branch: HEAD Handle: 2008122517593800 Modified files: openpkg-src/sasl sasl.patch Log: improve debug output Summary: Revision Changes Path 1.26 +45 -44 openpkg-src/sasl/sasl.patch ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/sasl/sasl.patch ============================================================================ $ cvs diff -u -r1.25 -r1.26 sasl.patch --- openpkg-src/sasl/sasl.patch 25 Dec 2008 12:31:56 -0000 1.25 +++ openpkg-src/sasl/sasl.patch 25 Dec 2008 17:59:38 -0000 1.26 @@ -1,6 +1,6 @@ Index: configure --- configure.orig 2006-05-18 21:30:13 +0200 -+++ configure 2007-01-08 18:48:48 +0100 ++++ configure 2008-12-25 18:48:51 +0100 @@ -3944,9 +3944,6 @@ fi @@ -180,7 +180,7 @@ } Index: lib/saslint.h --- lib/saslint.h.orig 2006-04-18 22:25:45 +0200 -+++ lib/saslint.h 2007-01-08 18:48:48 +0100 ++++ lib/saslint.h 2008-12-25 18:48:51 +0100 @@ -109,8 +109,6 @@ const char *appname; } sasl_global_callbacks_t; @@ -192,7 +192,7 @@ sasl_ssf_t ssf; Index: lib/server.c --- lib/server.c.orig 2006-05-17 18:46:13 +0200 -+++ lib/server.c 2007-01-08 18:48:48 +0100 ++++ lib/server.c 2008-12-25 18:48:51 +0100 @@ -95,7 +95,7 @@ static mech_list_t *mechlist = NULL; /* global var which holds the list */ @@ -223,7 +223,7 @@ Index: plugins/sql.c --- plugins/sql.c.orig 2006-04-07 15:42:16 +0200 -+++ plugins/sql.c 2008-12-25 13:24:00 +0100 ++++ plugins/sql.c 2008-12-25 18:56:32 +0100 @@ -150,9 +150,15 @@ return -1; } @@ -426,6 +426,24 @@ } #endif /* HAVE_SQLITE */ +@@ -771,7 +789,7 @@ + settings = (sql_settings_t *) glob_context; + + sparams->utils->log(NULL, SASL_LOG_DEBUG, +- "sql plugin Parse the username %s\n", user); ++ "sql plugin parse the username %s\n", user); + + user_buf = sparams->utils->malloc(ulen + 1); + if (!user_buf) goto done; +@@ -849,7 +867,7 @@ + } + + sparams->utils->log(NULL, SASL_LOG_DEBUG, +- "sql plugin create statement from %s %s %s\n", ++ "sql plugin create statement from name=%s user=%s realm=%s\n", + realname, escap_userid, escap_realm); + + /* create a statement that we will use */ @@ -864,9 +882,15 @@ /* run the query */ if (!settings->sql_engine->sql_exec(conn, query, value, sizeof(value), @@ -444,7 +462,7 @@ } Index: sample/client.c --- sample/client.c.orig 2004-03-09 18:35:32 +0100 -+++ sample/client.c 2008-12-23 10:19:47 +0100 ++++ sample/client.c 2008-12-25 18:48:51 +0100 @@ -133,13 +133,11 @@ return SASL_OK; } @@ -471,7 +489,7 @@ Index: sample/sample-client.c --- sample/sample-client.c.orig 2004-10-26 13:14:33 +0200 -+++ sample/sample-client.c 2008-12-23 10:40:08 +0100 ++++ sample/sample-client.c 2008-12-25 18:48:51 +0100 @@ -244,13 +244,11 @@ return SASL_OK; } @@ -505,26 +523,30 @@ if (! original) return SASL_FAIL; if (*original) -Index: saslauthd/Makefile.in ---- saslauthd/Makefile.in.orig 2006-05-18 21:30:21 +0200 -+++ saslauthd/Makefile.in 2007-01-08 18:48:48 +0100 -@@ -150,11 +150,11 @@ - saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@ - saslauthd_LDADD = @SASL_KRB_LIB@ \ - @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \ -- @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ -+ @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ ../lib/libsasl2.a - - - testsaslauthd_SOURCES = testsaslauthd.c utils.c --testsaslauthd_LDADD = @LIB_SOCKET@ -+testsaslauthd_LDADD = @LIB_SOCKET@ ../lib/libsasl2.a +Index: saslauthd/Makefile.am +--- saslauthd/Makefile.am.orig 2006-05-17 18:46:17 +0200 ++++ saslauthd/Makefile.am 2008-12-25 18:48:51 +0100 +@@ -36,4 +36,4 @@ - saslcache_SOURCES = saslcache.c + install-data-local: saslauthd.8 + $(mkinstalldirs) $(DESTDIR)$(mandir)/man8 +- $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8 ++ $(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8 +Index: saslauthd/Makefile.in +--- saslauthd/Makefile.in.orig 2008-12-25 18:48:51 +0100 ++++ saslauthd/Makefile.in 2008-12-25 18:48:51 +0100 +@@ -621,7 +621,7 @@ + install-data-local: saslauthd.8 + $(mkinstalldirs) $(DESTDIR)$(mandir)/man8 +- $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8 ++ $(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8 + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: Index: saslauthd/lak.c --- saslauthd/lak.c.orig 2005-05-15 07:49:51 +0200 -+++ saslauthd/lak.c 2007-01-08 18:48:48 +0100 ++++ saslauthd/lak.c 2008-12-25 18:48:51 +0100 @@ -47,6 +47,7 @@ #include <crypt.h> #endif @@ -544,7 +566,7 @@ typedef struct lak_auth_method { Index: utils/pluginviewer.c --- utils/pluginviewer.c.orig 2006-05-17 18:46:17 +0200 -+++ utils/pluginviewer.c 2007-04-12 15:03:43 +0200 ++++ utils/pluginviewer.c 2008-12-25 18:48:51 +0100 @@ -536,7 +536,7 @@ fprintf(stderr, "%s: Usage: %s [-a] [-s] [-c] [-b min=N,max=N] [-e ssf=N,id=ID] [-m MECHS] [-x AUXPROP_MECH] [-f FLAGS] [-i local=IP,remote=IP] [-p PATH]\n" "\t-a\tlist auxprop plugins\n" @@ -554,24 +576,3 @@ "\t-b ...\t#bits to use for encryption\n" "\t\tmin=N\tminumum #bits to use (1 => integrity)\n" "\t\tmax=N\tmaximum #bits to use\n" -Index: saslauthd/Makefile.am ---- saslauthd/Makefile.am.orig 2006-05-17 18:46:17 +0200 -+++ saslauthd/Makefile.am 2007-04-12 16:21:24 +0200 -@@ -36,4 +36,4 @@ - - install-data-local: saslauthd.8 - $(mkinstalldirs) $(DESTDIR)$(mandir)/man8 -- $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8 -+ $(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8 -Index: saslauthd/Makefile.in ---- saslauthd/Makefile.in.orig 2006-05-18 21:30:21 +0200 -+++ saslauthd/Makefile.in 2007-04-12 16:21:09 +0200 -@@ -621,7 +621,7 @@ - - install-data-local: saslauthd.8 - $(mkinstalldirs) $(DESTDIR)$(mandir)/man8 -- $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8 -+ $(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8 - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List [email protected]
