r5364: Rename string fields called 'domain' and 'name' to be 'domain_name'.

(This used to be commit 6749b9404d4e9876ecd964e038c608f05d2c0b69)

diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 42c041aa83e839a7cec4d1c4b9054e5cfe4d319f..9257b8db3db1bff15afc9625de99b7751ddc9738 100644 (file)
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -111,7 +111,7 @@ static NTSTATUS libnet_JoinDomain_samr(struct libnet_context *ctx,
        /* prepare samr_LookupDomain */
        d_name.string = r->samr.in.domain_name;
        ld.in.connect_handle = &p_handle;
-       ld.in.domain = &d_name;
+       ld.in.domain_name = &d_name;
 
        /* 3. do a samr_LookupDomain to get the domain sid */
        status = dcerpc_samr_LookupDomain(c.pdc.out.dcerpc_pipe, mem_ctx, &ld);

diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c
index fb75f0eaaf5a1d731db438e1c39df88c0a53ffe6..41d70d8208c8c03a709c8443dc930f6a8b398f30 100644 (file)
--- a/source4/libnet/libnet_passwd.c
+++ b/source4/libnet/libnet_passwd.c
@@ -548,7 +548,7 @@ static NTSTATUS libnet_SetPassword_samr(struct libnet_context *ctx, TALLOC_CTX *
        /* prepare samr_LookupDomain */
        d_name.string = r->samr.in.domain_name;
        ld.in.connect_handle = &p_handle;
-       ld.in.domain = &d_name;
+       ld.in.domain_name = &d_name;
 
        /* 3. do a samr_LookupDomain to get the domain sid */
        status = dcerpc_samr_LookupDomain(c.pdc.out.dcerpc_pipe, mem_ctx, &ld);

diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl
index 9b93b5bdce40dc67d9026a9b2b4a0246330cbb8c..bf158fadb7c1c290af895062b0123b3cf9f80ed8 100644 (file)
--- a/source4/librpc/idl/samr.idl
+++ b/source4/librpc/idl/samr.idl
@@ -84,7 +84,7 @@
 
        NTSTATUS samr_LookupDomain (
                [in,ref]  policy_handle *connect_handle,                
-               [in,ref]  samr_String *domain,
+               [in,ref]  samr_String *domain_name,
                [out]     dom_sid2 *sid
                );
 
@@ -142,7 +142,7 @@
        typedef struct {
                NTTIME force_logoff_time;
                samr_String comment;
-               samr_String domain;  /* domain name */
+               samr_String domain_name;
                samr_String primary; /* PDC name if this is a BDC */
                udlong sequence_num;
                uint32 unknown2;
@@ -1087,7 +1087,7 @@
        /************************/
        /* Function    0x38     */
        NTSTATUS samr_GetDomPwInfo(
-               [in]        samr_String *name,
+               [in]        samr_String *domain_name,
                [out]       samr_PwInfo info
                );
 

diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index d498d951d55403dba6656c043f5f0d1c53b7aac5..518ad02f4c0f060c26cc97777038cc9f2afe2091 100644 (file)
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -169,14 +169,14 @@ static NTSTATUS samr_LookupDomain(struct dcesrv_call_state *dce_call, TALLOC_CTX
 
        c_state = h->data;
 
-       if (r->in.domain->string == NULL) {
+       if (r->in.domain_name->string == NULL) {
                return NT_STATUS_INVALID_PARAMETER;
        }
 
        sidstr = samdb_search_string(c_state->sam_ctx,
                                     mem_ctx, NULL, "objectSid",
                                     "(&(name=%s)(objectclass=domain))",
-                                    r->in.domain->string);
+                                    r->in.domain_name->string);
        if (sidstr == NULL) {
                return NT_STATUS_NO_SUCH_DOMAIN;
        }
@@ -184,7 +184,7 @@ static NTSTATUS samr_LookupDomain(struct dcesrv_call_state *dce_call, TALLOC_CTX
        sid = dom_sid_parse_talloc(mem_ctx, sidstr);
        if (sid == NULL) {
                DEBUG(0,("samdb: Invalid sid '%s' for domain %s\n",
-                        sidstr, r->in.domain->string));
+                        sidstr, r->in.domain_name->string));
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
 
@@ -383,7 +383,7 @@ static NTSTATUS samr_info_DomInfo2(struct samr_domain_state *state, TALLOC_CTX *
        info->force_logoff_time = 0x8000000000000000LL;
 
        info->comment.string = samdb_result_string(res[0], "comment", NULL);
-       info->domain.string  = samdb_result_string(res[0], "name", NULL);
+       info->domain_name.string  = samdb_result_string(res[0], "name", NULL);
 
        info->primary.string = lp_netbios_name();
        info->sequence_num = 0;

diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 31380c109a6cb817b2388c0e9a0fdf585e1826f8..49c18ea0f47816be4bbb21dca33a50b2437e85d0 100644 (file)
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -685,8 +685,8 @@ static BOOL test_GetDomPwInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        struct samr_GetDomPwInfo r;
        BOOL ret = True;
 
-       r.in.name = domain_name;
-       printf("Testing GetDomPwInfo with name %s\n", r.in.name->string);
+       r.in.domain_name = domain_name;
+       printf("Testing GetDomPwInfo with name %s\n", r.in.domain_name->string);
 
        status = dcerpc_samr_GetDomPwInfo(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -694,8 +694,8 @@ static BOOL test_GetDomPwInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                ret = False;
        }
 
-       r.in.name->string = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
-       printf("Testing GetDomPwInfo with name %s\n", r.in.name->string);
+       r.in.domain_name->string = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
+       printf("Testing GetDomPwInfo with name %s\n", r.in.domain_name->string);
 
        status = dcerpc_samr_GetDomPwInfo(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -703,8 +703,8 @@ static BOOL test_GetDomPwInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                ret = False;
        }
 
-       r.in.name->string = "\\\\__NONAME__";
-       printf("Testing GetDomPwInfo with name %s\n", r.in.name->string);
+       r.in.domain_name->string = "\\\\__NONAME__";
+       printf("Testing GetDomPwInfo with name %s\n", r.in.domain_name->string);
 
        status = dcerpc_samr_GetDomPwInfo(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -712,8 +712,8 @@ static BOOL test_GetDomPwInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                ret = False;
        }
 
-       r.in.name->string = "\\\\Builtin";
-       printf("Testing GetDomPwInfo with name %s\n", r.in.name->string);
+       r.in.domain_name->string = "\\\\Builtin";
+       printf("Testing GetDomPwInfo with name %s\n", r.in.domain_name->string);
 
        status = dcerpc_samr_GetDomPwInfo(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -958,7 +958,7 @@ static BOOL test_OemChangePasswordUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_c
 
        struct samr_String domain_name;
        domain_name.string = "";
-       dom_pw_info.in.name = &domain_name;
+       dom_pw_info.in.domain_name = &domain_name;
 
        printf("Testing OemChangePasswordUser2\n");
 
@@ -1015,7 +1015,7 @@ static BOOL test_ChangePasswordUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        struct samr_String domain_name;
        domain_name.string = "";
-       dom_pw_info.in.name = &domain_name;
+       dom_pw_info.in.domain_name = &domain_name;
 
        printf("Testing ChangePasswordUser2\n");
 
@@ -2966,7 +2966,7 @@ static BOOL test_LookupDomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        /* check for correct error codes */
        r.in.connect_handle = handle;
-       r.in.domain = &n2;
+       r.in.domain_name = &n2;
        n2.string = NULL;
 
        status = dcerpc_samr_LookupDomain(p, mem_ctx, &r);
@@ -2984,7 +2984,7 @@ static BOOL test_LookupDomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        }
 
        r.in.connect_handle = handle;
-       r.in.domain = domain;
+       r.in.domain_name = domain;
 
        status = dcerpc_samr_LookupDomain(p, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {

diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index 3fc916450f7923b7a944431070f6407d140291c8..f1cbad2f05659dce0609f19bfeee8957a511c2dd 100644 (file)
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -143,7 +143,7 @@ static struct policy_handle *samsync_open_domain(TALLOC_CTX *mem_ctx,
 
        name.string = domain;
        l.in.connect_handle = samsync_state->connect_handle;
-       l.in.domain = &name;
+       l.in.domain_name = &name;
 
        nt_status = dcerpc_samr_LookupDomain(samsync_state->p_samr, mem_ctx, &l);
        if (!NT_STATUS_IS_OK(nt_status)) {

diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index 26f186e912a28a89d60866cc667ca0dacc9ff0a2..820dfaf4a5d9a72ecc3abdde9587b4196839d59f 100644 (file)
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -37,9 +37,9 @@ static BOOL test_samr_ops(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        struct samr_String name;
 
        name.string = lp_workgroup();
-       r.in.name = &name;
+       r.in.domain_name = &name;
 
-       printf("Testing GetDomPwInfo with name %s\n", r.in.name->string);
+       printf("Testing GetDomPwInfo with name %s\n", r.in.domain_name->string);
        
        /* do several ops to test credential chaining */
        for (i=0;i<5;i++) {

diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 866863217983b9f67346113d7226b2c8b2ad02aa..3921afb074dc65492b6305409acfaddbd95bb179 100644 (file)
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -142,7 +142,7 @@ struct test_join *torture_join_domain(const char *machine_name,
 
        name.string = domain;
        l.in.connect_handle = &handle;
-       l.in.domain = &name;
+       l.in.domain_name = &name;
 
        status = dcerpc_samr_LookupDomain(join->p, join, &l);
        if (!NT_STATUS_IS_OK(status)) {

diff --git a/source4/torture/rpc/xplogin.c b/source4/torture/rpc/xplogin.c
index 89154179953f0923f635b8edc48c02cd0ddbdacb..c64825852cf1e48057ee4ead7cd8a9a82878656e 100644 (file)
--- a/source4/torture/rpc/xplogin.c
+++ b/source4/torture/rpc/xplogin.c
@@ -659,7 +659,7 @@ static NTSTATUS test_getgroups(struct smbcli_transport *transport,
                                continue;
 
                        l.in.connect_handle = &connect_handle;
-                       l.in.domain = &e.out.sam->entries[i].name;
+                       l.in.domain_name = &e.out.sam->entries[i].name;
 
                        status = dcerpc_samr_LookupDomain(p, mem_ctx, &l);
 
@@ -823,7 +823,7 @@ static NTSTATUS test_getallsids(struct smbcli_transport *transport,
                                continue;
 
                        l.in.connect_handle = &connect_handle;
-                       l.in.domain = &e.out.sam->entries[i].name;
+                       l.in.domain_name = &e.out.sam->entries[i].name;
 
                        status = dcerpc_samr_LookupDomain(p, mem_ctx, &l);