git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f4f4dcf
)
r12883: Fix the build...
author
Andrew Bartlett
<abartlet@samba.org>
Fri, 13 Jan 2006 02:01:15 +0000
(
02:01
+0000)
committer
Gerald (Jerry) Carter
<jerry@samba.org>
Wed, 10 Oct 2007 18:50:57 +0000
(13:50 -0500)
Andrew Bartlett
source/libnet/libnet_join.c
patch
|
blob
|
history
diff --git
a/source/libnet/libnet_join.c
b/source/libnet/libnet_join.c
index 65d264d0f30e15a258fb66dc575f25ff49bbb23e..f7f285130926754d6e76a897f3f8e8da23800659 100644
(file)
--- a/
source/libnet/libnet_join.c
+++ b/
source/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;
}
-
-