Whitespace
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Thu, 8 May 2014 07:30:34 +0000 (08:30 +0100)
committerArran Cudbard-Bell <a.cudbardb@freeradius.org>
Thu, 8 May 2014 10:07:22 +0000 (11:07 +0100)
src/lib/debug.c
src/main/command.c
src/main/modules.c
src/main/radclient.c
src/main/tls.c
src/modules/rlm_couchbase/README.md
src/modules/rlm_couchbase/configure
src/modules/rlm_ruby/rlm_ruby.c

index 483fca1..d54847b 100644 (file)
@@ -796,7 +796,7 @@ void fr_verify_list(TALLOC_CTX *expected, VALUE_PAIR *vps)
                parent = talloc_parent(vp);
                if (expected && (parent != expected)) {
                        fr_perror("Expected VALUE_PAIR (%s) to be parented by %p (%s), "
-                                 "but parented by %p (%s)",
+                                 "but parented by %p (%s)",
                                  vp->da->name,
                                  expected, talloc_get_name(expected),
                                  parent, parent ? talloc_get_name(parent) : "NULL");
index 9307408..f558243 100644 (file)
@@ -206,10 +206,10 @@ static int fr_server_domain_socket(char const *path)
                }
 
                if (unlink(path) < 0) {
-                       ERROR("Failed to delete %s: %s",
+                      ERROR("Failed to delete %s: %s",
                             path, fr_syserror(errno));
-                       close(sockfd);
-                       return -1;
+                      close(sockfd);
+                      return -1;
                }
        }
 
index 6b849ec..2326e1e 100644 (file)
@@ -799,7 +799,7 @@ rlm_rcode_t indexed_modcall(rlm_components_t comp, int idx, REQUEST *request)
                        list = this->modulelist;
                } else {
                        RDEBUG3("%s sub-section not found.  Ignoring.",
-                               section_type_value[comp].typename);
+                               section_type_value[comp].typename);
                }
        }
 
index 9dc860b..0a6cfc7 100644 (file)
@@ -778,7 +778,7 @@ static int send_one_packet(rc_request_t *request)
                        fr_packet_list_yank(pl, request->packet);
 
                        REDEBUG("No reply from server for ID %d socket %d",
-                               request->packet->id, request->packet->sockfd);
+                               request->packet->id, request->packet->sockfd);
                        deallocate_id(request);
 
                        /*
@@ -933,7 +933,7 @@ static int recv_one_packet(int wait_time)
                                fr_packet_codes[request->reply->code]);
                } else {
                        REDEBUG("Expected %u got %i", request->filter_code,
-                               request->reply->code);
+                               request->reply->code);
                }
                stats.failed++;
        /*
index 0ec0402..374b90b 100644 (file)
@@ -1648,18 +1648,18 @@ int cbtls_verify(int ok, X509_STORE_CTX *ctx)
 #endif /* GEN_DNS */
 #ifdef GEN_OTHERNAME
                                case GEN_OTHERNAME:
-                                        /* look for a MS UPN */
-                                        if (NID_ms_upn == OBJ_obj2nid(name->d.otherName->type_id)) {
-                                            /* we've got a UPN - Must be ASN1-encoded UTF8 string */
-                                            if (name->d.otherName->value->type == V_ASN1_UTF8STRING) {
-                                                pairmake(NULL, certs, cert_attr_names[FR_TLS_SAN_UPN][lookup],
-                                                         (char *) ASN1_STRING_data(name->d.otherName->value->value.utf8string), T_OP_SET);
-                                                break;
-                                            } else {
-                                                RWARN("Invalid UPN in Subject Alt Name (should be UTF-8)\n");
-                                                break;
-                                            }
-                                        }
+                                       /* look for a MS UPN */
+                                       if (NID_ms_upn == OBJ_obj2nid(name->d.otherName->type_id)) {
+                                           /* we've got a UPN - Must be ASN1-encoded UTF8 string */
+                                           if (name->d.otherName->value->type == V_ASN1_UTF8STRING) {
+                                               pairmake(NULL, certs, cert_attr_names[FR_TLS_SAN_UPN][lookup],
+                                                        (char *) ASN1_STRING_data(name->d.otherName->value->value.utf8string), T_OP_SET);
+                                               break;
+                                           } else {
+                                               RWARN("Invalid UPN in Subject Alt Name (should be UTF-8)\n");
+                                               break;
+                                           }
+                                       }
                                        break;
 #endif /* GEN_OTHERNAME */
                                default:
index f77abc0..af1c62f 100644 (file)
@@ -54,19 +54,19 @@ To generate the 'calledStationSSID' fields you will need to use the ```rewrite_c
     ## split user@domain and domain\user formats
     strip_user_domain {
       if(User-Name && (User-Name =~ /${policy.simple_nt_regexp}/)){
-        update request {
-          Stripped-User-Domain = "%{1}"
-          Stripped-User-Name = "%{3}"
-        }
+       update request {
+         Stripped-User-Domain = "%{1}"
+         Stripped-User-Name = "%{3}"
+       }
       }
       elsif(User-Name && (User-Name =~ /${policy.simple_nai_regexp}/)){
-        update request {
-          Stripped-User-Name = "%{1}"
-          Stripped-User-Domain = "%{3}"
-        }
+       update request {
+         Stripped-User-Name = "%{1}"
+         Stripped-User-Domain = "%{3}"
+       }
       }
       else {
-        noop
+       noop
       }
     }
 
@@ -87,16 +87,16 @@ The document structure is straight forward and flexible:
       "docType": "raduser",
       "userName": "test",
       "config": {
-        "SHA-Password": {
-          "value": "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3",
-          "op": ":="
-        }
+       "SHA-Password": {
+         "value": "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3",
+         "op": ":="
+       }
       },
       "reply": {
-        "Reply-Message": {
-          "value": "Hidey Ho!",
-          "op": "="
-        }
+       "Reply-Message": {
+         "value": "Hidey Ho!",
+         "op": "="
+       }
       }
     }
 
@@ -115,118 +115,118 @@ Configuration
 -------------
 
     couchbase {
-        #
-        # List of Couchbase hosts (hosts may be space, tab, comma or semi-colon separated).
-        # Ports are optional if servers are listening on the standard port.
-        # Complete pool urls are preferred.
-        #
-        server = "http://cb01.blargs.com:8091/pools/ http://cb04.blargs.com:8091/pools/"
-
-        # Couchbase bucket name
-        bucket = "radius"
-
-        # Couchbase bucket password (optional)
-        #password = "password"
-
-        # Couchbase accounting document key (unlang supported)
-        acct_key = "radacct_%{%{Acct-Unique-Session-Id}:-%{Acct-Session-Id}}"
-
-        # Value for the 'docType' element in the json body for accounting documents
-        doctype = "radacct"
-
-        ## Accounting document expire time in seconds (0 = never)
-        expire = 2592000
-
-        #
-        # Map attribute names to json element names for accounting.
-        #
-        # Configuration items are in the format:
-        # <element name> = '<radius attribute>'
-        #
-        # Attribute names should be single quoted.
-        #
-        # Note: Atrributes not in this map will not be recorded.
-        #
-        map {
-            sessionId           = 'Acct-Session-Id'
-            uniqueId            = 'Acct-Unique-Session-Id'
-            lastStatus          = 'Acct-Status-Type'
-            authentic           = 'Acct-Authentic'
-            userName            = 'User-Name'
-            strippedUserName    = 'Stripped-User-Name'
-            strippedUserDomain  = 'Stripped-User-Domain'
-            realm               = 'Realm'
-            nasIpAddress        = 'NAS-IP-Address'
-            nasIdentifier       = 'NAS-Identifier'
-            nasPort             = 'NAS-Port'
-            calledStationId     = 'Called-Station-Id'
-            calledStationSSID   = 'Called-Station-SSID'
-            callingStationId    = 'Calling-Station-Id'
-            framedIpAddress     = 'Framed-IP-Address'
-            nasPortType         = 'NAS-Port-Type'
-            connectInfo         = 'Connect-Info'
-            sessionTime         = 'Acct-Session-Time'
-            inputPackets        = 'Acct-Input-Packets'
-            outputPackets       = 'Acct-Output-Packets'
-            inputOctets         = 'Acct-Input-Octets'
-            outputOctets        = 'Acct-Output-Octets'
-            inputGigawords      = 'Acct-Input-Gigawords'
-            outputGigawords     = 'Acct-Output-Gigawords'
-            lastUpdated         = 'Event-Timestamp'
-        }
-
-        # Couchbase document key for user documents (unlang supported)
-        user_key = "raduser_%{md5:%{tolower:%{%{Stripped-User-Name}:-%{User-Name}}}}"
-
-        #
-        #  The connection pool is new for 3.0, and will be used in many
-        #  modules, for all kinds of connection-related activity.
-        #
-        pool {
-            # Number of connections to start
-            start = 5
-
-            # Minimum number of connections to keep open
-            min = 5
-
-            # Maximum number of connections
-            #
-            # If these connections are all in use and a new one
-            # is requested, the request will NOT get a connection.
-            #
-            # NOTE: This should be greater than or equal to "min" above.
-            max = 20
-
-            # Spare connections to be left idle
-            #
-            # NOTE: Idle connections WILL be closed if "idle_timeout"
-            # is set.  This should be less than or equal to "max" above.
-            spare = 15
-
-            # Number of uses before the connection is closed
-            #
-            # NOTE: A setting of 0 means infinite (no limit).
-            uses = 0
-
-            # The lifetime (in seconds) of the connection
-            #
-            # NOTE: A setting of 0 means infinite (no limit).
-            lifetime = 0
-
-            # The idle timeout (in seconds).  A connection which is
-            # unused for this length of time will be closed.
-            #
-            # NOTE: A setting of 0 means infinite (no timeout).
-            idle_timeout = 1200
-
-            # NOTE: All configuration settings are enforced.  If a
-            # connection is closed because of "idle_timeout",
-            # "uses", or "lifetime", then the total number of
-            # connections MAY fall below "min".  When that
-            # happens, it will open a new connection.  It will
-            # also log a WARNING message.
-            #
-            # The solution is to either lower the "min" connections,
-            # or increase lifetime/idle_timeout.
-        }
+       #
+       # List of Couchbase hosts (hosts may be space, tab, comma or semi-colon separated).
+       # Ports are optional if servers are listening on the standard port.
+       # Complete pool urls are preferred.
+       #
+       server = "http://cb01.blargs.com:8091/pools/ http://cb04.blargs.com:8091/pools/"
+
+       # Couchbase bucket name
+       bucket = "radius"
+
+       # Couchbase bucket password (optional)
+       #password = "password"
+
+       # Couchbase accounting document key (unlang supported)
+       acct_key = "radacct_%{%{Acct-Unique-Session-Id}:-%{Acct-Session-Id}}"
+
+       # Value for the 'docType' element in the json body for accounting documents
+       doctype = "radacct"
+
+       ## Accounting document expire time in seconds (0 = never)
+       expire = 2592000
+
+       #
+       # Map attribute names to json element names for accounting.
+       #
+       # Configuration items are in the format:
+       # <element name> = '<radius attribute>'
+       #
+       # Attribute names should be single quoted.
+       #
+       # Note: Atrributes not in this map will not be recorded.
+       #
+       map {
+           sessionId           = 'Acct-Session-Id'
+           uniqueId            = 'Acct-Unique-Session-Id'
+           lastStatus          = 'Acct-Status-Type'
+           authentic           = 'Acct-Authentic'
+           userName            = 'User-Name'
+           strippedUserName    = 'Stripped-User-Name'
+           strippedUserDomain  = 'Stripped-User-Domain'
+           realm               = 'Realm'
+           nasIpAddress        = 'NAS-IP-Address'
+           nasIdentifier       = 'NAS-Identifier'
+           nasPort             = 'NAS-Port'
+           calledStationId     = 'Called-Station-Id'
+           calledStationSSID   = 'Called-Station-SSID'
+           callingStationId    = 'Calling-Station-Id'
+           framedIpAddress     = 'Framed-IP-Address'
+           nasPortType         = 'NAS-Port-Type'
+           connectInfo         = 'Connect-Info'
+           sessionTime         = 'Acct-Session-Time'
+           inputPackets        = 'Acct-Input-Packets'
+           outputPackets       = 'Acct-Output-Packets'
+           inputOctets         = 'Acct-Input-Octets'
+           outputOctets        = 'Acct-Output-Octets'
+           inputGigawords      = 'Acct-Input-Gigawords'
+           outputGigawords     = 'Acct-Output-Gigawords'
+           lastUpdated         = 'Event-Timestamp'
+       }
+
+       # Couchbase document key for user documents (unlang supported)
+       user_key = "raduser_%{md5:%{tolower:%{%{Stripped-User-Name}:-%{User-Name}}}}"
+
+       #
+       #  The connection pool is new for 3.0, and will be used in many
+       #  modules, for all kinds of connection-related activity.
+       #
+       pool {
+           # Number of connections to start
+           start = 5
+
+           # Minimum number of connections to keep open
+           min = 5
+
+           # Maximum number of connections
+           #
+           # If these connections are all in use and a new one
+           # is requested, the request will NOT get a connection.
+           #
+           # NOTE: This should be greater than or equal to "min" above.
+           max = 20
+
+           # Spare connections to be left idle
+           #
+           # NOTE: Idle connections WILL be closed if "idle_timeout"
+           # is set.  This should be less than or equal to "max" above.
+           spare = 15
+
+           # Number of uses before the connection is closed
+           #
+           # NOTE: A setting of 0 means infinite (no limit).
+           uses = 0
+
+           # The lifetime (in seconds) of the connection
+           #
+           # NOTE: A setting of 0 means infinite (no limit).
+           lifetime = 0
+
+           # The idle timeout (in seconds).  A connection which is
+           # unused for this length of time will be closed.
+           #
+           # NOTE: A setting of 0 means infinite (no timeout).
+           idle_timeout = 1200
+
+           # NOTE: All configuration settings are enforced.  If a
+           # connection is closed because of "idle_timeout",
+           # "uses", or "lifetime", then the total number of
+           # connections MAY fall below "min".  When that
+           # happens, it will open a new connection.  It will
+           # also log a WARNING message.
+           #
+           # The solution is to either lower the "min" connections,
+           # or increase lifetime/idle_timeout.
+       }
     }
index 9125443..6369068 100755 (executable)
@@ -157,7 +157,7 @@ $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
 as_fn_exit 255
   fi
   # We don't want this to propagate to other subprocesses.
-          { _as_can_reexec=; unset _as_can_reexec;}
+         { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -237,7 +237,7 @@ IFS=$as_save_IFS
 
       if test "x$CONFIG_SHELL" != x; then :
   export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
+            # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
 # works around shells that cannot unset nonexistent variables.
 # Preserve -v and -x to the replacement shell.
@@ -1215,9 +1215,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
+                         [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
+                         [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1260,27 +1260,27 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-jsonc-include-dir=DIR
-                          Directory where the json-c includes may be found
+                         Directory where the json-c includes may be found
   --with-jsonc-lib-dir=DIR
-                          Directory where the json-c libraries may be found
+                         Directory where the json-c libraries may be found
   --with-jsonc-dir=DIR    Base directory where json-c is installed
   --with-libcouchbase-include-dir=DIR
-                          Directory where the libcouchbase includes may be
-                          found
+                         Directory where the libcouchbase includes may be
+                         found
   --with-libcouchbase-lib-dir=DIR
-                          Directory where the libcouchbase libraries may be
-                          found
+                         Directory where the libcouchbase libraries may be
+                         found
   --with-libcouchbase-dir=DIR
-                          Base directory where libcouchbase is installed
+                         Base directory where libcouchbase is installed
 
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
+             nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
+             you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
 
 Use these variables to override the choices made by `configure' or to help
@@ -2007,7 +2007,7 @@ else
 fi
 
 if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
+         if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -2229,7 +2229,7 @@ $as_echo "$ac_try_echo"; } >&5
   if test -s conftest.err; then
     sed '10a\
 ... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
+        10q' conftest.err >conftest.er1
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
@@ -2972,22 +2972,22 @@ if test "x$smart_include" = "x"; then
 
 
 if test "x$LOCATE" != "x"; then
-        DIRS=
+       DIRS=
   file=json/json.h
 
   for x in `${LOCATE} $file 2>/dev/null`; do
-                                        base=`echo $x | sed "s%/${file}%%"`
+                                       base=`echo $x | sed "s%/${file}%%"`
     if test "x$x" = "x$base"; then
       continue;
     fi
 
     dir=`${DIRNAME} $x 2>/dev/null`
-                exclude=`echo ${dir} | ${GREP} /home`
+               exclude=`echo ${dir} | ${GREP} /home`
     if test "x$exclude" != "x"; then
       continue
     fi
 
-                    already=`echo \$smart_include_dir ${DIRS} | ${GREP} ${dir}`
+                   already=`echo \$smart_include_dir ${DIRS} | ${GREP} ${dir}`
     if test "x$already" = "x"; then
       DIRS="$DIRS $dir"
     fi
@@ -3109,8 +3109,8 @@ json_c_version()
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-               smart_lib="-ljson-c"
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+               smart_lib="-ljson-c"
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 else
@@ -3126,22 +3126,22 @@ if test "x$smart_lib" = "x"; then
 
 
 if test "x$LOCATE" != "x"; then
-        DIRS=
+       DIRS=
   file=libjson-c${libltdl_cv_shlibext}
 
   for x in `${LOCATE} $file 2>/dev/null`; do
-                                        base=`echo $x | sed "s%/${file}%%"`
+                                       base=`echo $x | sed "s%/${file}%%"`
     if test "x$x" = "x$base"; then
       continue;
     fi
 
     dir=`${DIRNAME} $x 2>/dev/null`
-                exclude=`echo ${dir} | ${GREP} /home`
+               exclude=`echo ${dir} | ${GREP} /home`
     if test "x$exclude" != "x"; then
       continue
     fi
 
-                    already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
+                   already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
     if test "x$already" = "x"; then
       DIRS="$DIRS $dir"
     fi
@@ -3153,22 +3153,22 @@ eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
 if test "x$LOCATE" != "x"; then
-        DIRS=
+       DIRS=
   file=libjson-c.a
 
   for x in `${LOCATE} $file 2>/dev/null`; do
-                                        base=`echo $x | sed "s%/${file}%%"`
+                                       base=`echo $x | sed "s%/${file}%%"`
     if test "x$x" = "x$base"; then
       continue;
     fi
 
     dir=`${DIRNAME} $x 2>/dev/null`
-                exclude=`echo ${dir} | ${GREP} /home`
+               exclude=`echo ${dir} | ${GREP} /home`
     if test "x$exclude" != "x"; then
       continue
     fi
 
-                    already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
+                   already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
     if test "x$already" = "x"; then
       DIRS="$DIRS $dir"
     fi
@@ -3285,8 +3285,8 @@ json_tokener_new()
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-               smart_lib="-ljson"
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+               smart_lib="-ljson"
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 else
@@ -3302,22 +3302,22 @@ if test "x$smart_lib" = "x"; then
 
 
 if test "x$LOCATE" != "x"; then
-        DIRS=
+       DIRS=
   file=libjson${libltdl_cv_shlibext}
 
   for x in `${LOCATE} $file 2>/dev/null`; do
-                                        base=`echo $x | sed "s%/${file}%%"`
+                                       base=`echo $x | sed "s%/${file}%%"`
     if test "x$x" = "x$base"; then
       continue;
     fi
 
     dir=`${DIRNAME} $x 2>/dev/null`
-                exclude=`echo ${dir} | ${GREP} /home`
+               exclude=`echo ${dir} | ${GREP} /home`
     if test "x$exclude" != "x"; then
       continue
     fi
 
-                    already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
+                   already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
     if test "x$already" = "x"; then
       DIRS="$DIRS $dir"
     fi
@@ -3329,22 +3329,22 @@ eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
 if test "x$LOCATE" != "x"; then
-        DIRS=
+       DIRS=
   file=libjson.a
 
   for x in `${LOCATE} $file 2>/dev/null`; do
-                                        base=`echo $x | sed "s%/${file}%%"`
+                                       base=`echo $x | sed "s%/${file}%%"`
     if test "x$x" = "x$base"; then
       continue;
     fi
 
     dir=`${DIRNAME} $x 2>/dev/null`
-                exclude=`echo ${dir} | ${GREP} /home`
+               exclude=`echo ${dir} | ${GREP} /home`
     if test "x$exclude" != "x"; then
       continue
     fi
 
-                    already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
+                   already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
     if test "x$already" = "x"; then
       DIRS="$DIRS $dir"
     fi
@@ -3562,22 +3562,22 @@ if test "x$smart_include" = "x"; then
 
 
 if test "x$LOCATE" != "x"; then
-        DIRS=
+       DIRS=
   file=libcouchbase/couchbase.h
 
   for x in `${LOCATE} $file 2>/dev/null`; do
-                                        base=`echo $x | sed "s%/${file}%%"`
+                                       base=`echo $x | sed "s%/${file}%%"`
     if test "x$x" = "x$base"; then
       continue;
     fi
 
     dir=`${DIRNAME} $x 2>/dev/null`
-                exclude=`echo ${dir} | ${GREP} /home`
+               exclude=`echo ${dir} | ${GREP} /home`
     if test "x$exclude" != "x"; then
       continue
     fi
 
-                    already=`echo \$smart_include_dir ${DIRS} | ${GREP} ${dir}`
+                   already=`echo \$smart_include_dir ${DIRS} | ${GREP} ${dir}`
     if test "x$already" = "x"; then
       DIRS="$DIRS $dir"
     fi
@@ -3699,8 +3699,8 @@ lcb_get_version()
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-               smart_lib="-lcouchbase"
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+               smart_lib="-lcouchbase"
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 else
@@ -3716,22 +3716,22 @@ if test "x$smart_lib" = "x"; then
 
 
 if test "x$LOCATE" != "x"; then
-        DIRS=
+       DIRS=
   file=libcouchbase${libltdl_cv_shlibext}
 
   for x in `${LOCATE} $file 2>/dev/null`; do
-                                        base=`echo $x | sed "s%/${file}%%"`
+                                       base=`echo $x | sed "s%/${file}%%"`
     if test "x$x" = "x$base"; then
       continue;
     fi
 
     dir=`${DIRNAME} $x 2>/dev/null`
-                exclude=`echo ${dir} | ${GREP} /home`
+               exclude=`echo ${dir} | ${GREP} /home`
     if test "x$exclude" != "x"; then
       continue
     fi
 
-                    already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
+                   already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
     if test "x$already" = "x"; then
       DIRS="$DIRS $dir"
     fi
@@ -3743,22 +3743,22 @@ eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\""
 
 
 if test "x$LOCATE" != "x"; then
-        DIRS=
+       DIRS=
   file=libcouchbase.a
 
   for x in `${LOCATE} $file 2>/dev/null`; do
-                                        base=`echo $x | sed "s%/${file}%%"`
+                                       base=`echo $x | sed "s%/${file}%%"`
     if test "x$x" = "x$base"; then
       continue;
     fi
 
     dir=`${DIRNAME} $x 2>/dev/null`
-                exclude=`echo ${dir} | ${GREP} /home`
+               exclude=`echo ${dir} | ${GREP} /home`
     if test "x$exclude" != "x"; then
       continue
     fi
 
-                    already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
+                   already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}`
     if test "x$already" = "x"; then
       DIRS="$DIRS $dir"
     fi
@@ -3926,11 +3926,11 @@ $as_echo "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
        cat confcache >"$cache_file"
       else
-        case $cache_file in #(
-        */* | ?:*)
+       case $cache_file in #(
+       */* | ?:*)
          mv -f confcache "$cache_file"$$ &&
          mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
+       *)
          mv -f confcache "$cache_file" ;;
        esac
       fi
@@ -4404,13 +4404,13 @@ Usage: $0 [OPTION]... [TAG]...
   -V, --version    print version number and configuration settings, then exit
       --config     print configuration, then exit
   -q, --quiet, --silent
-                   do not print progress messages
+                  do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
       --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
+                  instantiate the configuration file FILE
       --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
+                  instantiate the configuration header FILE
 
 Configuration files:
 $config_files
index 604bfd0..def73bf 100644 (file)
@@ -195,7 +195,7 @@ static void add_vp_tuple(TALLOC_CTX *ctx, REQUEST *request, VALUE_PAIR **vpp, VA
 
 #define BUF_SIZE 1024
 static rlm_rcode_t CC_HINT(nonnull (4)) do_ruby(REQUEST *request, unsigned long func,
-                                               VALUE module, char const *function_name)
+                                               VALUE module, char const *function_name)
 {
        rlm_rcode_t rcode = RLM_MODULE_OK;
        vp_cursor_t cursor;