Bug 38973
| Summary: | Error code 1 building cyrus-sasl-1.5.27_3 | ||
|---|---|---|---|
| Product: | Ports & Packages | Reporter: | clabadie <clabadie> |
| Component: | Individual Port(s) | Assignee: | freebsd-ports (Nobody) <ports> |
| Status: | Closed FIXED | ||
| Severity: | Affects Only Me | ||
| Priority: | Normal | ||
| Version: | Latest | ||
| Hardware: | Any | ||
| OS: | Any | ||
|
Description
clabadie
2002-06-07 08:20:01 UTC
The problem is that an OpenLDAP v2 function & variable are not defined
when building with OpenLDAP v1. The attached patch fixes this problem.
I have also removed the adding of the 'daemon' user to the 'cyrus' group,
as I have no ideal as to why this user was needed. I suspect it was needed
in the past for either the sendmail/postfix mailers when using the older
cyrus-imapd ports (<1.6).
Changed Files:
pkg-install
New Files:
files/patch-lib::checkpw.c
Scot W. Hetzel
Cyrus-SASL Maintainer
Index: pkg-install
===================================================================
RCS file: /home/ncvs/ports/security/cyrus-sasl/pkg-install,v
retrieving revision 1.8
diff -u -r1.8 pkg-install
--- pkg-install 24 May 2002 02:01:13 -0000 1.8
+++ pkg-install 19 Jun 2002 20:48:03 -0000
@@ -67,9 +67,12 @@
fi
echo "*** Updated user \`${USER}'."
fi
- if ! ${PW} group mod ${USER} -m daemon; then
- echo "*** can't add user \`${USER}' to group \`${GROUP}'"
- fi
+# Don't know why we need the daemon user in the cyrus group
+# hopefully this doesn't affect anyone. It's a leftover from
+# the pre-SASL cyrus-imapd server.
+# if ! ${PW} group mod ${GROUP} -m daemon; then
+# echo "*** can't add user \`daemon' to group \`${GROUP}'"
+# fi
}
create_sasldb() {
Index: files/patch-lib::checkpw.c
===================================================================
RCS file: files/patch-lib::checkpw.c
diff -N files/patch-lib::checkpw.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-lib::checkpw.c 17 Jun 2002 23:32:24 -0000
@@ -0,0 +1,17 @@
+--- lib/checkpw.c.orig Mon Jun 17 18:28:29 2002
++++ lib/checkpw.c Mon Jun 17 18:31:44 2002
+@@ -1667,12 +1667,14 @@
+ return SASL_FAIL;
+ }
+ /* setting dereferensing aliases mode */
++#ifdef LDAP_OPT_DEREF
+ if (ldap_set_option(ld, LDAP_OPT_DEREF, (void *) &ldap_deref) != LDAP_OPT_SUCCESS) {
+ if (reply) {
+ *reply = "cannot set deref options";
+ }
+ return SASL_FAIL;
+ }
++#endif
+ /* set ssl mode if needed */
+ #ifdef LDAP_OPT_X_TLS
+ if ( ldap_ssl_flag ) {
The problem is that an OpenLDAP v2 function & variable are not defined when building with OpenLDAP v1. The attached patch fixes this problem. I have also removed the 'daemon' user from the 'cyrus' group, as I have no ideal as to why this user needs to be in the 'cyrus' group. I suspect that it was being used by one of the MTA's that was running as the 'daemon' user (sendmail?). The 'daemon' user had been added to the 'cyrus' group for 3+ years (see http://www/freebsd.org/cgi/cvsweb.cgi/ports/mail/cyrus/pkg-install v1.1). Changed Files: pkg-install New Files: files/patch-lib::checkpw.c Scot W. Hetzel Cyrus-SASL Maintainer Index: pkg-install =================================================================== RCS file: /home/ncvs/ports/security/cyrus-sasl/pkg-install,v retrieving revision 1.8 diff -u -r1.8 pkg-install --- pkg-install 24 May 2002 02:01:13 -0000 1.8 +++ pkg-install 19 Jun 2002 20:48:03 -0000 @@ -67,9 +67,12 @@ fi echo "*** Updated user \`${USER}'." fi - if ! ${PW} group mod ${USER} -m daemon; then - echo "*** can't add user \`${USER}' to group \`${GROUP}'" - fi +# Don't know why we need the daemon user in the cyrus group +# hopefully this doesn't affect anyone. It's a leftover from +# the pre-SASL cyrus-imapd (<1.6) server. +# if ! ${PW} group mod ${GROUP} -m daemon; then +# echo "*** can't add user \`daemon' to group \`${GROUP}'" +# fi } create_sasldb() { Index: files/patch-lib::checkpw.c =================================================================== RCS file: files/patch-lib::checkpw.c diff -N files/patch-lib::checkpw.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-lib::checkpw.c 17 Jun 2002 23:32:24 -0000 @@ -0,0 +1,17 @@ +--- lib/checkpw.c.orig Mon Jun 17 18:28:29 2002 ++++ lib/checkpw.c Mon Jun 17 18:31:44 2002 +@@ -1667,12 +1667,14 @@ + return SASL_FAIL; + } + /* setting dereferensing aliases mode */ ++#ifdef LDAP_OPT_DEREF + if (ldap_set_option(ld, LDAP_OPT_DEREF, (void *) &ldap_deref) != LDAP_OPT_SUCCESS) { + if (reply) { + *reply = "cannot set deref options"; + } + return SASL_FAIL; + } ++#endif + /* set ssl mode if needed */ + #ifdef LDAP_OPT_X_TLS + if ( ldap_ssl_flag ) { The problem is that when OpenLDAP v1 is selected, a couple of functions & varibal definitions were being used that can only be found in OpenLDAP v2. I have submited a fix for this problem in PR 39800, which includes a fix for the checksum mismatch for the sasl-ldap+mysql patch. This PR can be closed. Scot W. Hetzel State Changed From-To: open->closed Fixed, Thanks! |
