summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-07-31 22:42:50 +0200
committerVolker Lendecke <vl@samba.org>2009-08-01 10:35:01 +0200
commit62fec968193e8a96ccffef216aba30ffb681d33a (patch)
treea4bd9877a3ec066f11da5116657f135fd546429f /source3
parentac94a8b0e3248dac63d7bc7d0f7aef370c725763 (diff)
downloadsamba-62fec968193e8a96ccffef216aba30ffb681d33a.tar.gz
samba-62fec968193e8a96ccffef216aba30ffb681d33a.tar.bz2
samba-62fec968193e8a96ccffef216aba30ffb681d33a.zip
Some mods for recent coding conventions
Diffstat (limited to 'source3')
-rw-r--r--source3/winbindd/winbindd_async.c3
-rw-r--r--source3/winbindd/winbindd_user.c6
2 files changed, 6 insertions, 3 deletions
diff --git a/source3/winbindd/winbindd_async.c b/source3/winbindd/winbindd_async.c
index 56175e2659..f53875f617 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 2d59942e17..0967afcf5c 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;
}