A bit more comments and spaces for better readability.

rafal

git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@11815 0c0555d6-39d7-0310-84fc-f1cc0bd64818

diff --git a/source/libnet/libnet.c b/source/libnet/libnet.c
index ba995854b239d337911c4093668f6ad33ae3d26d..4b2551b872e61fb6f81807529339b80f47206dc4 100644 (file)
--- a/source/libnet/libnet.c
+++ b/source/libnet/libnet.c
@@ -45,6 +45,7 @@ struct libnet_context *libnet_context_init(struct event_context *ev)
        }
        ctx->event_ctx = ev;
 
+       /* name resolution methods */
        ctx->name_res_methods = str_list_copy(ctx, nr_methods);
        
        return ctx;

diff --git a/source/libnet/libnet_rpc.c b/source/libnet/libnet_rpc.c
index 9917b172557295b09a9cb6eeefe0e6c1082ddfc1..e926fc3778c415eb58968c252cae779253d86fc5 100644 (file)
--- a/source/libnet/libnet_rpc.c
+++ b/source/libnet/libnet_rpc.c
@@ -36,17 +36,22 @@ static NTSTATUS libnet_RpcConnectSrv(struct libnet_context *ctx, TALLOC_CTX *mem
 {
        NTSTATUS status;
        const char *binding = NULL;
+
+       /* prepare binding string */
        switch (r->level) {
+       case LIBNET_RPC_CONNECT_PDC:
        case LIBNET_RPC_CONNECT_SERVER:
                binding = talloc_asprintf(mem_ctx, "ncacn_np:%s", r->in.domain_name);
                break;
+
        case LIBNET_RPC_CONNECT_BINDING:
                binding = r->in.binding;
                break;
        }
 
+       /* connect to remote dcerpc pipe */
        status = dcerpc_pipe_connect(mem_ctx, &r->out.dcerpc_pipe,
-                                    binding, r->in.dcerpc_iface_uuid,r->in.dcerpc_iface_version,
+                                    binding, r->in.dcerpc_iface_uuid, r->in.dcerpc_iface_version,
                                     ctx->cred, ctx->event_ctx);
 
        if (!NT_STATUS_IS_OK(status)) {
@@ -82,6 +87,7 @@ static NTSTATUS libnet_RpcConnectPdc(struct libnet_context *ctx, TALLOC_CTX *mem
        f.in.methods   = NULL;
        f.out.address  = NULL;
 
+       /* find the domain pdc first */
        status = libnet_LookupPdc(ctx, mem_ctx, &f);
        if (!NT_STATUS_IS_OK(status)) {
                r->out.error_string = talloc_asprintf(mem_ctx, "libnet_LookupPdc failed: %s",
@@ -89,6 +95,7 @@ static NTSTATUS libnet_RpcConnectPdc(struct libnet_context *ctx, TALLOC_CTX *mem
                return status;
        }
 
+       /* ok, pdc has been found so do attempt to rpc connect */
        r2.level                    = LIBNET_RPC_CONNECT_SERVER;
        r2.in.domain_name           = talloc_strdup(mem_ctx, f.out.address[0]);
        r2.in.dcerpc_iface_name     = r->in.dcerpc_iface_name;
@@ -120,8 +127,10 @@ NTSTATUS libnet_RpcConnect(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru
        switch (r->level) {
                case LIBNET_RPC_CONNECT_SERVER:
                        return libnet_RpcConnectSrv(ctx, mem_ctx, r);
+
                case LIBNET_RPC_CONNECT_BINDING:
                        return libnet_RpcConnectSrv(ctx, mem_ctx, r);
+
                case LIBNET_RPC_CONNECT_PDC:
                        return libnet_RpcConnectPdc(ctx, mem_ctx, r);
        }