[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  632e4af... s3:idmap_ldap: fix indentation: tab/space mixup
      from  7ebe5b1... Fix bug #6898 - Samba duplicates file content on 
appending Clients using a Windows open call should not be able to set 
FILE_FLAG_POSIX_SEMANTICS in an open. Jeremy.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 632e4afc3611511f78a1d5c45e0a91cd00334d28
Author: Michael Adam <ob...@samba.org>
Date:   Fri Nov 20 15:03:59 2009 +0100

    s3:idmap_ldap: fix indentation: tab/space mixup
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source3/winbindd/idmap_ldap.c |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c
index cf32238..22736c6 100644
--- a/source3/winbindd/idmap_ldap.c
+++ b/source3/winbindd/idmap_ldap.c
@@ -571,9 +571,9 @@ static NTSTATUS idmap_ldap_get_hwm(struct unixid *xid)
        CHECK_ALLOC_DONE(attr_list);
 
        rc = smbldap_search(idmap_alloc_ldap->smbldap_state,
-                               idmap_alloc_ldap->suffix,
-                              LDAP_SCOPE_SUBTREE, filter,
-                              attr_list, 0, &result);
+                           idmap_alloc_ldap->suffix,
+                           LDAP_SCOPE_SUBTREE, filter,
+                           attr_list, 0, &result);
 
        if (rc != LDAP_SUCCESS) {
                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, '\"', '\"');
 
-        tmp = lp_parm_const_string(-1, config_option, "ldap_base_dn", NULL);
-        if ( ! tmp || ! *tmp) {
-                tmp = lp_ldap_idmap_suffix();
-                if ( ! tmp) {
-                        DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
-                        ret = NT_STATUS_UNSUCCESSFUL;
-                        goto done;
+       tmp = lp_parm_const_string(-1, config_option, "ldap_base_dn", NULL);
+       if ( ! tmp || ! *tmp) {
+               tmp = lp_ldap_idmap_suffix();
+               if ( ! tmp) {
+                       DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
+                       ret = NT_STATUS_UNSUCCESSFUL;
+                       goto done;
                }
-        }
+       }
 
        ctx->suffix = talloc_strdup(ctx, tmp);
        CHECK_ALLOC_DONE(ctx->suffix);
@@ -878,7 +878,7 @@ static NTSTATUS idmap_ldap_db_init(struct idmap_domain *dom,
                goto done;
        }
 
-        ret = get_credentials( ctx, ctx->smbldap_state, config_option,
+       ret = get_credentials( ctx, ctx->smbldap_state, config_option,
                               dom, &ctx->user_dn );
        if ( !NT_STATUS_IS_OK(ret) ) {
                DEBUG(1,("idmap_ldap_db_init: Failed to get connection "
@@ -1025,7 +1025,7 @@ again:
 
        for (i = 0; i < count; i++) {
                char *sidstr = NULL;
-               char *tmp = NULL;
+               char *tmp = NULL;
                enum id_type type;
                struct id_map *map;
                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,
                                           struct id_map **ids)
 {
-               LDAPMessage *entry = NULL;
+       LDAPMessage *entry = NULL;
        NTSTATUS ret;
        TALLOC_CTX *memctx;
        struct idmap_ldap_context *ctx;


-- 
Samba Shared Repository