OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 04-Apr-2003 17:34:40
Branch: HEAD Handle: 2003040416343801
Modified files:
openpkg-src/sasl sasl.patch sasl.spec
openpkg-web news.txt
Log:
allow for secrets in mysql containing NUL-Bytes, so now we can store
non-clear passwords in mysql using cmusaslsecretMECH schemes
Summary:
Revision Changes Path
1.5 +39 -18 openpkg-src/sasl/sasl.patch
1.66 +1 -1 openpkg-src/sasl/sasl.spec
1.3957 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 sasl.patch
--- openpkg-src/sasl/sasl.patch 12 Mar 2003 10:45:26 -0000 1.4
+++ openpkg-src/sasl/sasl.patch 4 Apr 2003 15:34:39 -0000 1.5
@@ -1,21 +1,3 @@
---- plugins/mysql.c.dist Fri Mar 7 13:26:42 2003
-+++ plugins/mysql.c Fri Mar 7 13:30:38 2003
-@@ -325,8 +325,15 @@
- sparams->utils->log(NULL, SASL_LOG_WARN,
- "mysql plugin try and connect to %s\n",
- cur_host);
-+#ifdef HAVE_MYSQL_REAL_CONNECT
-+ mysql_init(&mysql);
-+ sock = mysql_real_connect(&mysql,cur_host,settings->mysql_user,
-+ settings->mysql_passwd,
-+ NULL,0,NULL,CLIENT_COMPRESS);
-+#else
- sock = mysql_connect(&mysql,cur_host,settings->mysql_user,
- settings->mysql_passwd);
-+#endif
- if (sock) break;
-
- cur_host = db_host;
--- saslauthd/lak.c.dist Wed Mar 12 11:39:22 2003
+++ saslauthd/lak.c Wed Mar 12 11:39:22 2003
@@ -532,8 +532,6 @@
@@ -62,3 +44,42 @@
ldap_unbind_s(lak->ld);
lak->ld = NULL;
+--- plugins/mysql.c.dist Fri Mar 7 13:26:42 2003
++++ plugins/mysql.c Fri Apr 4 16:55:38 2003
+@@ -254,6 +254,7 @@
+ MYSQL mysql,*sock = NULL;
+ MYSQL_RES *result;
+ MYSQL_ROW row;
++ unsigned long *rlen;
+
+ /* setup the settings */
+ settings = (struct mysql_settings *)glob_context;
+@@ -325,8 +326,15 @@
+ sparams->utils->log(NULL, SASL_LOG_WARN,
+ "mysql plugin try and connect to %s\n",
+ cur_host);
++#ifdef HAVE_MYSQL_REAL_CONNECT
++ mysql_init(&mysql);
++ sock = mysql_real_connect(&mysql,cur_host,settings->mysql_user,
++ settings->mysql_passwd,
++ NULL,0,NULL,CLIENT_COMPRESS);
++#else
+ sock = mysql_connect(&mysql,cur_host,settings->mysql_user,
+ settings->mysql_passwd);
++#endif
+ if (sock) break;
+
+ cur_host = db_host;
+@@ -405,8 +413,10 @@
+ /* now get the result set value and value_len */
+ /* we only fetch one becuse we dont car about the rest */
+ row = mysql_fetch_row(result);
+- strncpy(value,row[0],8190);
+- value_len = strlen(value);
++ rlen = mysql_fetch_lengths(result);
++ value_len = rlen[0] > 8190 ? 8190 : rlen[0];
++ memcpy(value, row[0], value_len);
++ value[value_len] = '\0';
+
+ sparams->utils->prop_set(sparams->propctx, cur->name,
+ value, value_len);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
============================================================================
$ cvs diff -u -r1.65 -r1.66 sasl.spec
--- openpkg-src/sasl/sasl.spec 16 Mar 2003 16:07:20 -0000 1.65
+++ openpkg-src/sasl/sasl.spec 4 Apr 2003 15:34:39 -0000 1.66
@@ -33,7 +33,7 @@
Group: Cryptography
License: BSD
Version: 2.1.12
-Release: 20030316
+Release: 20030404
# package options
%option with_fsl no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3956 -r1.3957 news.txt
--- openpkg-web/news.txt 4 Apr 2003 14:53:40 -0000 1.3956
+++ openpkg-web/news.txt 4 Apr 2003 15:34:38 -0000 1.3957
@@ -1,3 +1,4 @@
+04-Apr-2003: Upgraded package: P<sasl-2.1.12-20030404>
04-Apr-2003: Upgraded package: P<rt-3.0.0-20030404>
04-Apr-2003: Upgraded package: P<bind8-8.3.4-20030404>
04-Apr-2003: Upgraded package: P<bind-9.2.2-20030404>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
