[SCM] Samba Shared Repository - branch master updated

[Nadezhda Ivanova]

The branch, master has been updated
       via  961f503 security: Fixed incorrect indentation in create_descriptor.c
      from  a556896 s3-build: remove RPCCLI_WINREG subsystem.

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


- Log -----------------------------------------------------------------
commit 961f503f0dd7a03696460b482da4fa7e08daa78d
Author: Nadezhda Ivanova <nivanova at samba.org>
Date:   Thu Jan 13 15:22:15 2011 +0200

    security: Fixed incorrect indentation in create_descriptor.c
    
    Autobuild-User: Nadezhda Ivanova <nivanova at samba.org>
    Autobuild-Date: Thu Jan 13 15:53:16 CET 2011 on sn-devel-104

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

Summary of changes:
 libcli/security/create_descriptor.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/security/create_descriptor.c b/libcli/security/create_descriptor.c
index 2228e48..e5fa9b8 100644
--- a/libcli/security/create_descriptor.c
+++ b/libcli/security/create_descriptor.c
@@ -253,18 +253,18 @@ static struct security_acl *process_user_acl(TALLOC_CTX *mem_ctx,
 						    owner,
 						    group);
 			} else {
-			/*The original ACE becomes read only */
-			tmp_acl->aces[tmp_acl->num_aces-1].flags |= SEC_ACE_FLAG_INHERIT_ONLY;
-			tmp_acl->aces = talloc_realloc(tmp_acl, tmp_acl->aces,
-						       struct security_ace,
-						       tmp_acl->num_aces+1);
-			/* add a new ACE with expanded generic info */
-			tmp_acl->aces[tmp_acl->num_aces] = *ace;
-			desc_expand_generic(tmp_ctx,
-					    &tmp_acl->aces[tmp_acl->num_aces],
-					    owner,
-					    group);
-			tmp_acl->num_aces++;
+				/*The original ACE becomes read only */
+				tmp_acl->aces[tmp_acl->num_aces-1].flags |= SEC_ACE_FLAG_INHERIT_ONLY;
+				tmp_acl->aces = talloc_realloc(tmp_acl, tmp_acl->aces,
+							       struct security_ace,
+							       tmp_acl->num_aces+1);
+				/* add a new ACE with expanded generic info */
+				tmp_acl->aces[tmp_acl->num_aces] = *ace;
+				desc_expand_generic(tmp_ctx,
+						    &tmp_acl->aces[tmp_acl->num_aces],
+						    owner,
+						    group);
+				tmp_acl->num_aces++;
 			}
 		}
 	}


-- 
Samba Shared Repository