summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2010-02-23 09:51:25 +0100
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2010-02-23 09:53:17 +0100
commit4ef82accfe41eebabf26714d0a074d48d7134a26 (patch)
treefcd7e36f37d6809fc3d25c321f25515583e77de3
parent0c8608bbab93b0d00255424335deed27738d69c6 (diff)
downloadsamba-4ef82accfe41eebabf26714d0a074d48d7134a26.tar.gz
samba-4ef82accfe41eebabf26714d0a074d48d7134a26.tar.bz2
samba-4ef82accfe41eebabf26714d0a074d48d7134a26.zip
s4:netlogon RPC - fix the indentation
Simo, I'm not really sure that those checks are valid. I read MS-NRPC section 3.5.4.1 about LOGONSRV_HANDLEs ("server_name" is of this type). There isn't stated that the server name has necessarily to be in the DNS form and should also be valid when it's NULL (if DCE server and client are the same - I don't know if me make use of it in s4).
-rw-r--r--source4/rpc_server/netlogon/dcerpc_netlogon.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index a5308bb84e..65d8c7b8df 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -1715,25 +1715,25 @@ static WERROR dcesrv_netr_DsrEnumerateDomainTrusts(struct dcesrv_call_state *dce
}
/* TODO: turn to hard check once we are sure this is 100% correct */
- if (!r->in.server_name) {
+ if (!r->in.server_name) {
DEBUG(3, ("Invalid domain! Expected name in domain [%s]. "
"But received NULL!\n", dnsdomain));
- } else {
- p = strchr(r->in.server_name, '.');
- if (!p) {
- DEBUG(3, ("Invalid domain! Expected name in domain "
- "[%s]. But received [%s]!\n",
- dnsdomain, r->in.server_name));
- p = r->in.server_name;
- } else {
- p++;
+ } else {
+ p = strchr(r->in.server_name, '.');
+ if (!p) {
+ DEBUG(3, ("Invalid domain! Expected name in domain "
+ "[%s]. But received [%s]!\n",
+ dnsdomain, r->in.server_name));
+ p = r->in.server_name;
+ } else {
+ p++;
}
if (strcasecmp(p, dnsdomain)) {
- DEBUG(3, ("Invalid domain! Expected name in domain "
- "[%s]. But received [%s]!\n",
- dnsdomain, r->in.server_name));
- }
- }
+ DEBUG(3, ("Invalid domain! Expected name in domain "
+ "[%s]. But received [%s]!\n",
+ dnsdomain, r->in.server_name));
+ }
+ }
ZERO_STRUCT(r->out);