From: Source Maintenance <squidadm@squid-cache.org>
Date: Tue, 21 Apr 2015 06:12:14 +0000 (+0000)
Subject: SourceFormat Enforcement
X-Git-Tag: merge-candidate-3-v1~169
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f4daa474f8138674565cebfa3288ee34ba6e034;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/helpers/external_acl/kerberos_ldap_group/support_ldap.cc b/helpers/external_acl/kerberos_ldap_group/support_ldap.cc
index 27d7a4efd8..6e1eb7638f 100644
--- a/helpers/external_acl/kerberos_ldap_group/support_ldap.cc
+++ b/helpers/external_acl/kerberos_ldap_group/support_ldap.cc
@@ -117,7 +117,7 @@ ldap_simple_rebind(
     struct berval cred;
     if (cp->pw) {
         cred.bv_val=cp->pw;
-	cred.bv_len=strlen(cp->pw);
+        cred.bv_len=strlen(cp->pw);
     }
     whop = whop;
     credp = credp;
@@ -156,7 +156,7 @@ ldap_simple_rebind(
     struct berval cred;
     if (cp->pw) {
         cred.bv_val=cp->pw;
-	cred.bv_len=strlen(cp->pw);
+        cred.bv_len=strlen(cp->pw);
     }
     return ldap_sasl_bind_s(ld, cp->dn, LDAP_SASL_SIMPLE, &cred, NULL, NULL, NULL);
 }
@@ -201,7 +201,7 @@ ldap_simple_rebind(
     struct berval cred;
     if (cp->pw) {
         cred.bv_val=cp->pw;
-	cred.bv_len=strlen(cp->pw);
+        cred.bv_len=strlen(cp->pw);
     }
     whop = whop;
     credp = credp;
@@ -234,7 +234,7 @@ ldap_simple_rebind(LDAP *ld, LDAP_CONST char *, ber_tag_t request, ber_int_t msg
     struct berval cred;
     if (cp->pw) {
         cred.bv_val=cp->pw;
-	cred.bv_len=strlen(cp->pw);
+        cred.bv_len=strlen(cp->pw);
     }
     return ldap_sasl_bind_s(ld, cp->dn, LDAP_SASL_SIMPLE, &cred, NULL, NULL, NULL);
 }
@@ -1013,11 +1013,11 @@ get_memberof(struct main_args *margs, char *user, char *domain, char *group)
         nhosts = get_hostname_list(&hlist, 0, host);
         xfree(host);
         for (size_t i = 0; i < nhosts; ++i) {
-	    struct berval cred;
-	    if (margs->lpass) {
+            struct berval cred;
+            if (margs->lpass) {
                 cred.bv_val=margs->lpass;
                 cred.bv_len=strlen(margs->lpass);
-	    }
+            }
             ld = tool_ldap_open(margs, hlist[i].host, port, ssl);
             if (!ld)
                 continue;
@@ -1026,7 +1026,7 @@ get_memberof(struct main_args *margs, char *user, char *domain, char *group)
              */
 
             debug((char *) "%s| %s: DEBUG: Bind to ldap server with Username/Password\n", LogTime(), PROGRAM);
-	    rc = ldap_sasl_bind_s(ld, margs->luser, LDAP_SASL_SIMPLE, &cred, NULL, NULL, NULL);
+            rc = ldap_sasl_bind_s(ld, margs->luser, LDAP_SASL_SIMPLE, &cred, NULL, NULL, NULL);
             if (rc != LDAP_SUCCESS) {
                 error((char *) "%s| %s: ERROR: Error while binding to ldap server with Username/Password: %s\n", LogTime(), PROGRAM, ldap_err2string(rc));
                 ldap_unbind_ext(ld, NULL, NULL);
diff --git a/helpers/negotiate_auth/kerberos/negotiate_kerberos.h b/helpers/negotiate_auth/kerberos/negotiate_kerberos.h
index f32a592a89..d853859acd 100644
--- a/helpers/negotiate_auth/kerberos/negotiate_kerberos.h
+++ b/helpers/negotiate_auth/kerberos/negotiate_kerberos.h
@@ -166,3 +166,4 @@ char *get_ad_groups(char *ad_groups, krb5_context context, krb5_pac pac);
 #define HAVE_PAC_SUPPORT 0
 #endif
 int check_k5_err(krb5_context context, const char *msg, krb5_error_code code);
+