s4:netlogon RPC - fix the indentation
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>
Tue, 23 Feb 2010 08:51:25 +0000 (09:51 +0100)
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>
Tue, 23 Feb 2010 08:53:17 +0000 (09:53 +0100)
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).

source4/rpc_server/netlogon/dcerpc_netlogon.c

index a5308bb84e59d10063481579c91ae94ad892fd2d..65d8c7b8df3c9b011e113c7485ab5732ff985ef2 100644 (file)
@@ -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);