summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-01-13 02:01:15 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:50:57 -0500
commitf2df13958c70d9853cbe7d322716eb323a331b39 (patch)
treebd995d8b5f2ca0e0be42f45d1a80b274fa956e50
parente15136af9e208072137cb58fd6a0de894ce10505 (diff)
downloadsamba-f2df13958c70d9853cbe7d322716eb323a331b39.tar.gz
samba-f2df13958c70d9853cbe7d322716eb323a331b39.tar.bz2
samba-f2df13958c70d9853cbe7d322716eb323a331b39.zip
r12883: Fix the build...
Andrew Bartlett (This used to be commit 8f7d14048fe29fd2c8b3e3c7aa73b4a854615016)
-rw-r--r--source4/libnet/libnet_join.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 65d264d0f3..f7f2851309 100644
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -1158,7 +1158,7 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx,
return NT_STATUS_INVALID_PARAMETER;
}
- if (r->in.netbios_name != NULL)
+ if (r->in.netbios_name != NULL) {
netbios_name = r->in.netbios_name;
} else {
netbios_name = talloc_reference(tmp_mem, lp_netbios_name());
@@ -1442,5 +1442,3 @@ NTSTATUS libnet_Join(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, struct lib
r->in.secure_channel_type, r->in.domain_name);
return NT_STATUS_INVALID_PARAMETER;
}
-
-