mirror of
https://github.com/samba-team/samba.git
synced 2025-01-11 05:18:09 +03:00
s3:idmap_ldap: fix indentation: tab/space mixup
Michael
This commit is contained in:
parent
7ebe5b1641
commit
632e4afc36
@ -571,9 +571,9 @@ static NTSTATUS idmap_ldap_get_hwm(struct unixid *xid)
|
|||||||
CHECK_ALLOC_DONE(attr_list);
|
CHECK_ALLOC_DONE(attr_list);
|
||||||
|
|
||||||
rc = smbldap_search(idmap_alloc_ldap->smbldap_state,
|
rc = smbldap_search(idmap_alloc_ldap->smbldap_state,
|
||||||
idmap_alloc_ldap->suffix,
|
idmap_alloc_ldap->suffix,
|
||||||
LDAP_SCOPE_SUBTREE, filter,
|
LDAP_SCOPE_SUBTREE, filter,
|
||||||
attr_list, 0, &result);
|
attr_list, 0, &result);
|
||||||
|
|
||||||
if (rc != LDAP_SUCCESS) {
|
if (rc != LDAP_SUCCESS) {
|
||||||
DEBUG(0,("%s object not found\n", LDAP_OBJ_IDPOOL));
|
DEBUG(0,("%s object not found\n", LDAP_OBJ_IDPOOL));
|
||||||
@ -858,15 +858,15 @@ static NTSTATUS idmap_ldap_db_init(struct idmap_domain *dom,
|
|||||||
|
|
||||||
trim_char(ctx->url, '\"', '\"');
|
trim_char(ctx->url, '\"', '\"');
|
||||||
|
|
||||||
tmp = lp_parm_const_string(-1, config_option, "ldap_base_dn", NULL);
|
tmp = lp_parm_const_string(-1, config_option, "ldap_base_dn", NULL);
|
||||||
if ( ! tmp || ! *tmp) {
|
if ( ! tmp || ! *tmp) {
|
||||||
tmp = lp_ldap_idmap_suffix();
|
tmp = lp_ldap_idmap_suffix();
|
||||||
if ( ! tmp) {
|
if ( ! tmp) {
|
||||||
DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
|
DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
|
||||||
ret = NT_STATUS_UNSUCCESSFUL;
|
ret = NT_STATUS_UNSUCCESSFUL;
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx->suffix = talloc_strdup(ctx, tmp);
|
ctx->suffix = talloc_strdup(ctx, tmp);
|
||||||
CHECK_ALLOC_DONE(ctx->suffix);
|
CHECK_ALLOC_DONE(ctx->suffix);
|
||||||
@ -878,7 +878,7 @@ static NTSTATUS idmap_ldap_db_init(struct idmap_domain *dom,
|
|||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = get_credentials( ctx, ctx->smbldap_state, config_option,
|
ret = get_credentials( ctx, ctx->smbldap_state, config_option,
|
||||||
dom, &ctx->user_dn );
|
dom, &ctx->user_dn );
|
||||||
if ( !NT_STATUS_IS_OK(ret) ) {
|
if ( !NT_STATUS_IS_OK(ret) ) {
|
||||||
DEBUG(1,("idmap_ldap_db_init: Failed to get connection "
|
DEBUG(1,("idmap_ldap_db_init: Failed to get connection "
|
||||||
@ -1025,7 +1025,7 @@ again:
|
|||||||
|
|
||||||
for (i = 0; i < count; i++) {
|
for (i = 0; i < count; i++) {
|
||||||
char *sidstr = NULL;
|
char *sidstr = NULL;
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
enum id_type type;
|
enum id_type type;
|
||||||
struct id_map *map;
|
struct id_map *map;
|
||||||
uint32_t id;
|
uint32_t id;
|
||||||
@ -1164,7 +1164,7 @@ static struct id_map *find_map_by_sid(struct id_map **maps, DOM_SID *sid)
|
|||||||
static NTSTATUS idmap_ldap_sids_to_unixids(struct idmap_domain *dom,
|
static NTSTATUS idmap_ldap_sids_to_unixids(struct idmap_domain *dom,
|
||||||
struct id_map **ids)
|
struct id_map **ids)
|
||||||
{
|
{
|
||||||
LDAPMessage *entry = NULL;
|
LDAPMessage *entry = NULL;
|
||||||
NTSTATUS ret;
|
NTSTATUS ret;
|
||||||
TALLOC_CTX *memctx;
|
TALLOC_CTX *memctx;
|
||||||
struct idmap_ldap_context *ctx;
|
struct idmap_ldap_context *ctx;
|
||||||
|
Loading…
Reference in New Issue
Block a user