Attachment #232023 for bug #262133

View | Details | Raw Unified | Return to bug 262133
Collapse All | Expand All

Lines 1-5 Link Here

(-)security/cyrus-sasl2-gssapi/Makefile (-1 lines)
1	PKGNAMESUFFIX= -gssapi	1	PKGNAMESUFFIX= -gssapi
2	PORTREVISION= 2
3		2
4	COMMENT= SASL GSSAPI authentication plugin	3	COMMENT= SASL GSSAPI authentication plugin
5		4

Lines 1-5 Link Here

(-)security/cyrus-sasl2-saslauthd/Makefile (-1 lines)
1	PKGNAMESUFFIX= -saslauthd	1	PKGNAMESUFFIX= -saslauthd
2	PORTREVISION= 2
3		2
4	COMMENT= SASL authentication server for cyrus-sasl2	3	COMMENT= SASL authentication server for cyrus-sasl2
5		4

Lines 1-4 Link Here

(-)security/cyrus-sasl2-saslauthd/pkg-plist (+1 lines)
1	man/man8/saslauthd.8.gz	1	man/man8/saslauthd.8.gz
		2	man/man8/testsaslauthd.8.gz
2	sbin/saslauthd	3	sbin/saslauthd
3	sbin/saslcache	4	sbin/saslcache
4	sbin/testsaslauthd	5	sbin/testsaslauthd

Lines 1-5 Link Here

(-)security/cyrus-sasl2-sql/Makefile (-1 lines)
1	PKGNAMESUFFIX= -sql	1	PKGNAMESUFFIX= -sql
2	PORTREVISION= 1
3		2
4	COMMENT= SASL SQL plugins	3	COMMENT= SASL SQL plugins
5		4

Lines 1-5 Link Here

(-)security/cyrus-sasl2/Makefile (-3 / +1 lines)
1	PORTREVISION= 2
2
3	COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer)	1	COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer)
4		2
5	USES= cpe libtool:keepla pathfix perl5	3	USES= cpe libtool:keepla pathfix perl5
Lines 60-65 PLAIN_CONFIGURE_ENABLE= plain Link Here
60	SCRAM_DESC= SCRAM authentication	58	SCRAM_DESC= SCRAM authentication
61	SCRAM_CONFIGURE_ENABLE= scram	59	SCRAM_CONFIGURE_ENABLE= scram
62		60
63	DOCS= AUTHORS COPYING ChangeLog INSTALL INSTALL.TXT README	61	DOCS= AUTHORS COPYING ChangeLog INSTALL.TXT README
64		62
65	.include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"	63	.include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"

Lines 1-5 Link Here

(-)security/cyrus-sasl2/Makefile.common (-1 / +1 lines)
1	PORTNAME= cyrus-sasl	1	PORTNAME= cyrus-sasl
2	PORTVERSION= 2.1.27	2	PORTVERSION= 2.1.28
3	CATEGORIES= security	3	CATEGORIES= security
4	MASTER_SITES= https://github.com/cyrusimap/cyrus-sasl/releases/download/${PORTNAME}-${PORTVERSION}/	4	MASTER_SITES= https://github.com/cyrusimap/cyrus-sasl/releases/download/${PORTNAME}-${PORTVERSION}/
5		5

Lines 1-3 Link Here

(-)security/cyrus-sasl2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1542468728	1	TIMESTAMP = 1645585277
2	SHA256 (cyrus-sasl-2.1.27.tar.gz) = 26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5	2	SHA256 (cyrus-sasl-2.1.28.tar.gz) = 7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c
3	SIZE (cyrus-sasl-2.1.27.tar.gz) = 4111249	3	SIZE (cyrus-sasl-2.1.28.tar.gz) = 4034803




--- plugins/sql.c.orig	2016-12-10 15:45:55 UTC
+++ plugins/sql.c
@@ -1150,6 +1150,7 @@ static int sql_auxprop_store(void *glob_context,
     char *statement = NULL;
     char *escap_userid = NULL;
     char *escap_realm = NULL;
+    char *escap_passwd = NULL;
     const char *cmd;
     
     sql_settings_t *settings;
@@ -1221,6 +1222,11 @@ static int sql_auxprop_store(void *glob_context,
 			    "Unable to begin transaction\n");
     }
     for (cur = to_store; ret == SASL_OK && cur->name; cur++) {
+	/* Free the buffer, current content is from previous loop. */
+	if (escap_passwd) {
+	    sparams->utils->free(escap_passwd);
+	    escap_passwd = NULL;
+	}
 
 	if (cur->name[0] == '*') {
 	    continue;
@@ -1242,19 +1248,32 @@ static int sql_auxprop_store(void *glob_context,
 	}
 	sparams->utils->free(statement);
 
+	if (cur->values[0]) {
+	    escap_passwd = (char *)sparams->utils->malloc(strlen(cur->values[0])*2+1);
+	    if (!escap_passwd) {
+		ret = SASL_NOMEM;
+		break;
+	    }
+	    settings->sql_engine->sql_escape_str(escap_passwd, cur->values[0]);
+	}
+
 	/* create a statement that we will use */
 	statement = sql_create_statement(cmd, cur->name, escap_userid,
 					 escap_realm,
-					 cur->values && cur->values[0] ?
-					 cur->values[0] : SQL_NULL_VALUE,
+					 escap_passwd ?
+					 escap_passwd : SQL_NULL_VALUE,
 					 sparams->utils);
+	if (!statement) {
+	    ret = SASL_NOMEM;
+	    break;
+	}
 	
 	{
 	    char *log_statement =
 		sql_create_statement(cmd, cur->name,
 				     escap_userid,
 				     escap_realm,
-				     cur->values && cur->values[0] ?
+				     escap_passwd ?
 				     "<omitted>" : SQL_NULL_VALUE,
 				     sparams->utils);
 	    sparams->utils->log(sparams->utils->conn, SASL_LOG_DEBUG,
@@ -1287,6 +1306,7 @@ static int sql_auxprop_store(void *glob_context,
   done:
     if (escap_userid) sparams->utils->free(escap_userid);
     if (escap_realm) sparams->utils->free(escap_realm);
+    if (escap_passwd) sparams->utils->free(escap_passwd);
     if (conn) settings->sql_engine->sql_close(conn);
     if (userid) sparams->utils->free(userid);
     if (realm) sparams->utils->free(realm);




Index: saslauthd/Makefile.in
diff -u saslauthd/Makefile.in.orig saslauthd/Makefile.in
--- saslauthd/Makefile.in.orig	2011-09-07 22:13:56.000000000 +0900
+++ saslauthd/Makefile.in	2011-09-14 15:16:53.207259788 +0900
@@ -722,7 +722,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.

Return to bug 262133

Removed Link Here

(-)security/cyrus-sasl2/files/patch-plugins__sql.c (-66 lines)
1	--- plugins/sql.c.orig 2016-12-10 15:45:55 UTC
2	+++ plugins/sql.c
3	@@ -1150,6 +1150,7 @@ static int sql_auxprop_store(void *glob_context,
4	char *statement = NULL;
5	char *escap_userid = NULL;
6	char *escap_realm = NULL;
7	+ char *escap_passwd = NULL;
8	const char *cmd;
9
10	sql_settings_t *settings;
11	@@ -1221,6 +1222,11 @@ static int sql_auxprop_store(void *glob_context,
12	"Unable to begin transaction\n");
13	}
14	for (cur = to_store; ret == SASL_OK && cur->name; cur++) {
15	+ /* Free the buffer, current content is from previous loop. */
16	+ if (escap_passwd) {
17	+ sparams->utils->free(escap_passwd);
18	+ escap_passwd = NULL;
19	+ }
20
21	if (cur->name[0] == '*') {
22	continue;
23	@@ -1242,19 +1248,32 @@ static int sql_auxprop_store(void *glob_context,
24	}
25	sparams->utils->free(statement);
26
27	+ if (cur->values[0]) {
28	+ escap_passwd = (char )sparams->utils->malloc(strlen(cur->values[0])2+1);
29	+ if (!escap_passwd) {
30	+ ret = SASL_NOMEM;
31	+ break;
32	+ }
33	+ settings->sql_engine->sql_escape_str(escap_passwd, cur->values[0]);
34	+ }
35	+
36	/* create a statement that we will use */
37	statement = sql_create_statement(cmd, cur->name, escap_userid,
38	escap_realm,
39	- cur->values && cur->values[0] ?
40	- cur->values[0] : SQL_NULL_VALUE,
41	+ escap_passwd ?
42	+ escap_passwd : SQL_NULL_VALUE,
43	sparams->utils);
44	+ if (!statement) {
45	+ ret = SASL_NOMEM;
46	+ break;
47	+ }
48
49	{
50	char *log_statement =
51	sql_create_statement(cmd, cur->name,
52	escap_userid,
53	escap_realm,
54	- cur->values && cur->values[0] ?
55	+ escap_passwd ?
56	"<omitted>" : SQL_NULL_VALUE,
57	sparams->utils);
58	sparams->utils->log(sparams->utils->conn, SASL_LOG_DEBUG,
59	@@ -1287,6 +1306,7 @@ static int sql_auxprop_store(void *glob_context,
60	done:
61	if (escap_userid) sparams->utils->free(escap_userid);
62	if (escap_realm) sparams->utils->free(escap_realm);
63	+ if (escap_passwd) sparams->utils->free(escap_passwd);
64	if (conn) settings->sql_engine->sql_close(conn);
65	if (userid) sparams->utils->free(userid);
66	if (realm) sparams->utils->free(realm);

Removed Link Here

(-)security/cyrus-sasl2/files/patch-saslauthd__Makefile.in (-13 lines)
1	Index: saslauthd/Makefile.in
2	diff -u saslauthd/Makefile.in.orig saslauthd/Makefile.in
3	--- saslauthd/Makefile.in.orig 2011-09-07 22:13:56.000000000 +0900
4	+++ saslauthd/Makefile.in 2011-09-14 15:16:53.207259788 +0900
5	@@ -722,7 +722,7 @@
6
7	install-data-local: saslauthd.8
8	$(mkinstalldirs) $(DESTDIR)$(mandir)/man8
9	- $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8
10	+ $(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8
11
12	# Tell versions [3.59,3.63) of GNU make to not export all variables.
13	# Otherwise a system limit (for SysV at least) may be exceeded.