[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  4ef82ac... s4:netlogon RPC - fix the indentation
      from  0c8608b... s3 Fix the build

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4ef82accfe41eebabf26714d0a074d48d7134a26
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Tue Feb 23 09:51:25 2010 +0100

    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).

-----------------------------------------------------------------------

Summary of changes:
 source4/rpc_server/netlogon/dcerpc_netlogon.c |   30 ++++++++++++------------
 1 files changed, 15 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index a5308bb..65d8c7b 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);
 


-- 
Samba Shared Repository