[SCM] Samba Shared Repository - branch master updated

[Nadezhda Ivanova]

The branch, master has been updated
       via  54991cd... Fixed incorrect indentation.
      from  e28545e... s3: Fix some nonempty blank lines

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


- Log -----------------------------------------------------------------
commit 54991cd2e15b797360c112c801b98ec24188da9e
Author: Nadezhda Ivanova <nadezhda.ivanova at postpath.com>
Date:   Sun Nov 22 13:36:35 2009 +0200

    Fixed incorrect indentation.

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

Summary of changes:
 source4/dsdb/samdb/ldb_modules/descriptor.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c
index c3413e1..f9992e3 100644
--- a/source4/dsdb/samdb/ldb_modules/descriptor.c
+++ b/source4/dsdb/samdb/ldb_modules/descriptor.c
@@ -537,12 +537,12 @@ static int descriptor_search_callback(struct ldb_request *req, struct ldb_reply
 	}
 
 	sd_control = ldb_request_get_control(ac->req, LDB_CONTROL_SD_FLAGS_OID);
-		if (sd_control) {
-			struct ldb_sd_flags_control *sdctr = (struct ldb_sd_flags_control *)sd_control->data;
-			sd_flags = sdctr->secinfo_flags;
-			/* we only care for the last 4 bits */
-			sd_flags = sd_flags & 0x0000000F;
-		}
+	if (sd_control) {
+		struct ldb_sd_flags_control *sdctr = (struct ldb_sd_flags_control *)sd_control->data;
+		sd_flags = sdctr->secinfo_flags;
+		/* we only care for the last 4 bits */
+		sd_flags = sd_flags & 0x0000000F;
+	}
 
 	switch (ares->type) {
 	case LDB_REPLY_ENTRY:
@@ -572,7 +572,6 @@ static int descriptor_search_callback(struct ldb_request *req, struct ldb_reply
 		break;
 
 	case LDB_REPLY_DONE:
-
 		return ldb_module_done(ac->req, ares->controls,
 					ares->response, ares->error);
 	}


-- 
Samba Shared Repository