Attachment 305257 Details for Bug 436390 – cvs diff daemon.c bind.c

[patch] cvs diff daemon.c bind.c

autobind.diffs (text/plain), 2.18 KB, created by Noriko Hosoi on 2008-05-13 16:23:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2008-05-13 16:23:20 UTC

Size: 2.18 KB

patch

obsolete

>Index: daemon.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/daemon.c,v
>retrieving revision 1.18
>diff -t -w -U4 -r1.18 daemon.c
>--- daemon.c    14 Nov 2007 20:18:53 -0000      1.18
>+++ daemon.c    12 May 2008 20:28:27 -0000
>@@ -2342,12 +2349,8 @@
>        if( local )
>        {
>                conn->c_unix_local = 1;
>                slapd_identify_local_user(conn);
>-
>-#if defined(ENABLE_AUTOBIND)
>-                slapd_bind_local_user(conn);
>-#endif /* ENABLE_AUTOBIND */
>        }
>#endif
>#endif /* ENABLE_LDAPI */
>>
>Index: bind.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/bind.c,v
>retrieving revision 1.11
>diff -t -w -U4 -r1.11 bind.c
>--- bind.c      18 Oct 2007 00:08:34 -0000      1.11
>+++ bind.c      12 May 2008 20:28:27 -0000
>@@ -258,16 +258,20 @@
>     */
>    bind_credentials_clear( pb->pb_conn, PR_FALSE, /* do not lock conn */
>                            PR_FALSE /* do not clear external creds. */ );
>>
>+#if defined(ENABLE_AUTOBIND)
>    /* LDAPI might have auto bind on, binding as anon should
>       mean bind as self in this case
>     */
>-#if defined(ENABLE_AUTOBIND)
>-    if((0 == dn || 0 == dn[0]) && pb->pb_conn->c_unix_local)
>+    /* You are "bound" when the SSL connection is made,
>+       but the client still passes a BIND SASL/EXTERNAL request.
>+     */
>+    if((LDAP_AUTH_SASL == method) &&
>+       (0 == strcasecmp (saslmech, LDAP_SASL_EXTERNAL)) &&
>+       (0 == dn || 0 == dn[0]) && pb->pb_conn->c_unix_local)
>    {
>        slapd_bind_local_user(pb->pb_conn);
>-
>        if(pb->pb_conn->c_dn)
>        {
>            auto_bind = 1; /* flag the bind method */
>            dn = slapi_ch_strdup(pb->pb_conn->c_dn);
>@@ -369,8 +373,14 @@
>            charray_free(supported); /* Avoid leaking */
>        }
>>
>        if (!strcasecmp (saslmech, LDAP_SASL_EXTERNAL)) {
>+#if defined(ENABLE_AUTOBIND)
>+            if (1 == auto_bind) {
>+                /* Already AUTO-BOUND */
>+                break;
>+            }
>+#endif
>            /*
>             * if this is not an SSL connection, fail and return an
>             * inappropriateAuth error.
>             */

Actions: View | Diff

Attachments on bug 436390: 304994 | 305257 | 305709