[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-758-g62fec96

[Volker Lendecke]

The branch, master has been updated
       via  62fec968193e8a96ccffef216aba30ffb681d33a (commit)
      from  ac94a8b0e3248dac63d7bc7d0f7aef370c725763 (commit)

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


- Log -----------------------------------------------------------------
commit 62fec968193e8a96ccffef216aba30ffb681d33a
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jul 31 22:42:50 2009 +0200

    Some mods for recent coding conventions

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

Summary of changes:
 source3/winbindd/winbindd_async.c |    3 ++-
 source3/winbindd/winbindd_user.c  |    6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_async.c b/source3/winbindd/winbindd_async.c
index 56175e2..f53875f 100644
--- a/source3/winbindd/winbindd_async.c
+++ b/source3/winbindd/winbindd_async.c
@@ -382,7 +382,8 @@ void winbindd_lookupname_async(TALLOC_CTX *mem_ctx,
 	struct winbindd_domain *domain;
 	struct lookupname_state *s;
 
-	if ( (domain = find_lookup_domain_from_name(dom_name)) == NULL ) {
+	domain = find_lookup_domain_from_name(dom_name);
+	if (domain == NULL) {
 		DEBUG(5, ("Could not find domain for name '%s'\n", dom_name));
 		cont(private_data, False, NULL, SID_NAME_UNKNOWN);
 		return;
diff --git a/source3/winbindd/winbindd_user.c b/source3/winbindd/winbindd_user.c
index 2d59942..0967afc 100644
--- a/source3/winbindd/winbindd_user.c
+++ b/source3/winbindd/winbindd_user.c
@@ -462,8 +462,10 @@ void winbindd_getpwnam(struct winbindd_cli_state *state)
 	if (domain == NULL) {
 		DEBUG(7, ("could not find domain entry for domain %s.  "
 			  "Using primary domain\n", domname));
-		if ( (domain = find_our_domain()) == NULL ) {
-			DEBUG(0,("Cannot find my primary domain structure!\n"));
+		domain = find_our_domain();
+		if (domain == NULL) {
+			DEBUG(0, ("Cannot find my primary domain "
+				  "structure!\n"));
 			request_error(state);
 			return;
 		}


-- 
Samba Shared Repository