git.samba.org
/
idra
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
afb163e
)
Fix some indents.
author
Günther Deschner
<gd@samba.org>
Sat, 12 Jan 2008 01:24:55 +0000
(
02:24
+0100)
committer
Günther Deschner
<gd@samba.org>
Sat, 12 Jan 2008 01:26:08 +0000
(
02:26
+0100)
Guenther
(This used to be commit
57368f883fb217b4196858bb2255c0eea59a8917
)
source3/libnet/libnet_join.c
patch
|
blob
|
history
diff --git
a/source3/libnet/libnet_join.c
b/source3/libnet/libnet_join.c
index 6ec89de15ca3a40cb55cb8f2d039c16569045a80..9b62286ecb14e730f26d7c3f450339a94875bbda 100644
(file)
--- a/
source3/libnet/libnet_join.c
+++ b/
source3/libnet/libnet_join.c
@@
-671,7
+671,8
@@
static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
0xe005000b, &user_pol,
&user_rid);
if (NT_STATUS_EQUAL(status, NT_STATUS_USER_EXISTS)) {
- if (!(r->in.join_flags & WKSSVC_JOIN_FLAGS_DOMAIN_JOIN_IF_JOINED)) {
+ if (!(r->in.join_flags &
+ WKSSVC_JOIN_FLAGS_DOMAIN_JOIN_IF_JOINED)) {
goto done;
}
}
@@
-908,7
+909,7
@@
static WERROR do_join_modify_vals_config(struct libnet_JoinCtx *r)
W_ERROR_NOT_OK_RETURN(werr);
werr = libnet_conf_set_global_parameter("realm",
- r->out.dns_domain_name);
+
r->out.dns_domain_name);
W_ERROR_NOT_OK_RETURN(werr);
}