Merge remote branch 'origin/mdb.master'

[openldap] / libraries / libldap / bind.c

diff --git a/libraries/libldap/bind.c b/libraries/libldap/bind.c
index 4305d313d42d66ea11627e734d29fe4a6449602d..db7d0fcf18fc2aa436ae8dfa1b2b92c10fa8bc73 100644 (file)
--- a/libraries/libldap/bind.c
+++ b/libraries/libldap/bind.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -71,6 +71,11 @@ ldap_bind( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *passwd, int authmetho
        case LDAP_AUTH_SIMPLE:
                return( ldap_simple_bind( ld, dn, passwd ) );
 
+#ifdef HAVE_GSSAPI
+       case LDAP_AUTH_NEGOTIATE:
+               return( ldap_gssapi_bind_s( ld, dn, passwd) );
+#endif
+
        case LDAP_AUTH_SASL:
                /* user must use ldap_sasl_bind */
                /* FALL-THRU */
@@ -107,6 +112,11 @@ ldap_bind_s(
        case LDAP_AUTH_SIMPLE:
                return( ldap_simple_bind_s( ld, dn, passwd ) );
 
+#ifdef HAVE_GSSAPI
+       case LDAP_AUTH_NEGOTIATE:
+               return( ldap_gssapi_bind_s( ld, dn, passwd) );
+#endif
+
        case LDAP_AUTH_SASL:
                /* user must use ldap_sasl_bind */
                /* FALL-THRU */