Some mods for recent coding conventions

diff --git a/source3/winbindd/winbindd_async.c b/source3/winbindd/winbindd_async.c
index 56175e2659866e23a7f7ce4c4e67fb0708fd41e6..f53875f6171f89c7751561d74c996e1da2b0f807 100644 (file)
--- 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 2d59942e17e4fc2076d6ad2b3124d629a23f65b4..0967afcf5c1bcecff3d6cbd07d424847710daf9f 100644 (file)
--- 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;
                }