diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2006-10-12 14:32:06 +0200 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2006-10-12 14:32:06 +0200 |
| commit | f1de6decf34b37672e2c4cc3d191b689a95d07d1 (patch) | |
| tree | 4a20e4a3761d319f2e9d698170c9b7d5f1b80065 /dnsconfig.c | |
| parent | fc7cea9f90281ecc8fe97eb3e1767ea814c99a8f (diff) | |
some more small cleanups of code for non-supported systems and convert tabs to spaces
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/libnss_ldapd@13 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'dnsconfig.c')
| -rw-r--r-- | dnsconfig.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/dnsconfig.c b/dnsconfig.c index 59adc4b..92e4795 100644 --- a/dnsconfig.c +++ b/dnsconfig.c @@ -57,7 +57,7 @@ /* map gnu.org into DC=gnu,DC=org */ enum nss_status _nss_ldap_getdnsdn (char *src_domain, - char **rval, char **buffer, size_t * buflen) + char **rval, char **buffer, size_t * buflen) { char *p; int len = 0; @@ -90,26 +90,26 @@ _nss_ldap_getdnsdn (char *src_domain, len = strlen (p); if (*buflen < (size_t) (len + DC_ATTR_AVA_LEN + 1 /* D C = [,|\0] */ )) - { - free (domain_copy); - return NSS_TRYAGAIN; - } + { + free (domain_copy); + return NSS_TRYAGAIN; + } if (domain == NULL) - { - strcpy (bptr, ","); - bptr++; - } + { + strcpy (bptr, ","); + bptr++; + } else - { - domain = NULL; - } + { + domain = NULL; + } strcpy (bptr, DC_ATTR_AVA); bptr += DC_ATTR_AVA_LEN; strcpy (bptr, p); - bptr += len; /* don't include comma */ + bptr += len; /* don't include comma */ *buffer += len + DC_ATTR_AVA_LEN + 1; *buflen -= len + DC_ATTR_AVA_LEN + 1; } @@ -126,7 +126,7 @@ _nss_ldap_getdnsdn (char *src_domain, enum nss_status _nss_ldap_mergeconfigfromdns (ldap_config_t * result, - char **buffer, size_t *buflen) + char **buffer, size_t *buflen) { enum nss_status stat = NSS_SUCCESS; struct dns_reply *r; @@ -158,18 +158,18 @@ _nss_ldap_mergeconfigfromdns (ldap_config_t * result, for (rr = r->head; rr != NULL; rr = rr->next) { if (rr->type == T_SRV) - { - snprintf (uribuf, sizeof(uribuf), "ldap%s:%s:%d", - (rr->u.srv->port == LDAPS_PORT) ? "s" : "", - rr->u.srv->target, - rr->u.srv->port); - - stat = _nss_ldap_add_uri (result, uribuf, buffer, buflen); - if (stat != NSS_SUCCESS) - { - break; - } - } + { + snprintf (uribuf, sizeof(uribuf), "ldap%s:%s:%d", + (rr->u.srv->port == LDAPS_PORT) ? "s" : "", + rr->u.srv->target, + rr->u.srv->port); + + stat = _nss_ldap_add_uri (result, uribuf, buffer, buflen); + if (stat != NSS_SUCCESS) + { + break; + } + } } dns_free_data (r); @@ -178,7 +178,7 @@ _nss_ldap_mergeconfigfromdns (ldap_config_t * result, if (result->ldc_base == NULL) { stat = _nss_ldap_getdnsdn (_res.defdname, &result->ldc_base, - buffer, buflen); + buffer, buflen); } return stat; |