[389-commits] ldap/servers

ldap/servers/slapd/ldaputil.c | 412 +++++++++++++++++++++---------------------
1 file changed, 210 insertions(+), 202 deletions(-)

New commits:
commit cb22bb3ce64f948b2361273b225a1423c1575979
Author: Mark Reynolds <mreynolds@redhat.com>
Date: Wed Jun 15 14:30:23 2016 -0400

Ticket 48346 - ldaputil code cleanup

Description: Fixed code indentation/comments. slapi_ldap_bind() was
really bad.

https://fedorahosted.org/389/ticket/48346

Reviewed by: nhosoi(Thanks!)

diff --git a/ldap/servers/slapd/ldaputil.c b/ldap/servers/slapd/ldaputil.c
index c556fc1..45a7dac 100644
--- a/ldap/servers/slapd/ldaputil.c
+++ b/ldap/servers/slapd/ldaputil.c
@@ -116,7 +116,7 @@ void
slapi_ldap_unbind( LDAP *ld )
{
if ( ld != NULL ) {
- ldap_unbind_ext( ld, NULL, NULL );
+ ldap_unbind_ext( ld, NULL, NULL );
}
}

@@ -206,46 +206,46 @@ slapi_urlparse_err2string( int err )

switch( err ) {
case 0:
- s = "no error";
- break;
+ s = "no error";
+ break;
case LDAP_URL_ERR_BADSCOPE:
- s = "invalid search scope";
- break;
+ s = "invalid search scope";
+ break;
case LDAP_URL_ERR_MEM:
- s = "unable to allocate memory";
- break;
+ s = "unable to allocate memory";
+ break;
case LDAP_URL_ERR_PARAM:
- s = "bad parameter to an LDAP URL function";
- break;
+ s = "bad parameter to an LDAP URL function";
+ break;
#if defined(USE_OPENLDAP)
case LDAP_URL_ERR_BADSCHEME:
- s = "does not begin with ldap://, ldaps://, or ldapi://";
- break;
+ s = "does not begin with ldap://, ldaps://, or ldapi://";
+ break;
case LDAP_URL_ERR_BADENCLOSURE:
- s = "missing trailing '>' in enclosure";
- break;
+ s = "missing trailing '>' in enclosure";
+ break;
case LDAP_URL_ERR_BADURL:
- s = "not a valid LDAP URL";
- break;
+ s = "not a valid LDAP URL";
+ break;
case LDAP_URL_ERR_BADHOST:
- s = "hostname part of url is not valid or not given";
- break;
+ s = "hostname part of url is not valid or not given";
+ break;
case LDAP_URL_ERR_BADATTRS:
- s = "attribute list not formatted correctly or missing";
- break;
+ s = "attribute list not formatted correctly or missing";
+ break;
case LDAP_URL_ERR_BADFILTER:
- s = "search filter not correct";
- break;
+ s = "search filter not correct";
+ break;
case LDAP_URL_ERR_BADEXTS:
- s = "extensions not specified correctly";
- break;
+ s = "extensions not specified correctly";
+ break;
#else /* !USE_OPENLDAP */
case LDAP_URL_ERR_NOTLDAP:
- s = "missing ldap:// or ldaps:// or ldapi://";
- break;
+ s = "missing ldap:// or ldaps:// or ldapi://";
+ break;
case LDAP_URL_ERR_NODN:
- s = "missing suffix";
- break;
+ s = "missing suffix";
+ break;