Rename structures to better match the names in the WSPP IDL.

The 'comment' element in a number of domain structures is called
oem_information.  This was picked up actually because with OpenLDAP
doing the schema checking, it noticed that 'comment' was not a valid
attribute.

The rename tries to keep this consistant in both the LDB mappings and
IDL, so we don't make the same mistake in future.

This has no real schema impact, as this value isn't actually used for
anything, as 'comment' was not used in the provision.

Andrew Bartlett

diff --git a/source/libnet/libnet_samsync_ldb.c b/source/libnet/libnet_samsync_ldb.c
index b223a74a31ed4debb20bdcce0183f35bb8eb0ccc..c72aef7d7025b2ed3a894375e81116e69f26c246 100644 (file)
--- a/source/libnet/libnet_samsync_ldb.c
+++ b/source/libnet/libnet_samsync_ldb.c
@@ -198,7 +198,7 @@ static NTSTATUS samsync_ldb_handle_domain(TALLOC_CTX *mem_ctx,
        }
 
        samdb_msg_add_string(state->sam_ldb, mem_ctx, 
-                            msg, "oEMInformation", domain->comment.string);
+                            msg, "oEMInformation", domain->oem_information.string);
 
        samdb_msg_add_int64(state->sam_ldb, mem_ctx, 
                            msg, "forceLogoff", domain->force_logoff_time);

diff --git a/source/librpc/idl/netlogon.idl b/source/librpc/idl/netlogon.idl
index 6da496a4863f212ec2c5311d88b3a9e0aa689204..d8f7d2f7e60b20dd779a9aacfe9c8d97ea624aa2 100644 (file)
--- a/source/librpc/idl/netlogon.idl
+++ b/source/librpc/idl/netlogon.idl
@@ -403,7 +403,7 @@ interface netlogon
 
        typedef struct {
                lsa_String domain_name;
-               lsa_String comment;
+               lsa_String oem_information; /* comment */
                dlong force_logoff_time;
                uint16 min_password_length;
                uint16 password_history_length;

diff --git a/source/librpc/idl/samr.idl b/source/librpc/idl/samr.idl
index 3a11ab752ce52b95792425bcc7c4d74603870a9e..b6cce3819604b674577280148853a621aa33c7e2 100644 (file)
--- a/source/librpc/idl/samr.idl
+++ b/source/librpc/idl/samr.idl
@@ -208,7 +208,7 @@ import "misc.idl", "lsa.idl", "security.idl";
 
        typedef struct {
                NTTIME force_logoff_time;
-               lsa_String comment;
+               lsa_String oem_information; /* comment */
                lsa_String domain_name;
                lsa_String primary; /* PDC name if this is a BDC */
                udlong sequence_num;
@@ -218,15 +218,15 @@ import "misc.idl", "lsa.idl", "security.idl";
                uint32 num_users;
                uint32 num_groups;
                uint32 num_aliases;
-       } samr_DomInfo2;
+       } samr_DomGeneralInformation;
 
        typedef struct {
                NTTIME force_logoff_time;
        } samr_DomInfo3;
 
        typedef struct {
-               lsa_String comment;
-       } samr_DomInfo4;
+               lsa_String oem_information; /* comment */
+       } samr_DomOEMInformation;
 
        typedef struct {
                lsa_String domain_name;
@@ -250,11 +250,11 @@ import "misc.idl", "lsa.idl", "security.idl";
        } samr_DomInfo9;
 
        typedef struct {
-               samr_DomInfo2 info2;
+               samr_DomGeneralInformation general;
                hyper lockout_duration;
                hyper lockout_window;
                uint16 lockout_threshold;
-       } samr_DomInfo11;
+       } samr_DomGeneralInformation2;
 
        typedef struct {
                hyper lockout_duration;
@@ -271,15 +271,15 @@ import "misc.idl", "lsa.idl", "security.idl";
 
        typedef [switch_type(uint16)] union {
                [case(1)] samr_DomInfo1 info1;
-               [case(2)] samr_DomInfo2 info2;
+               [case(2)] samr_DomGeneralInformation general;
                [case(3)] samr_DomInfo3 info3;
-               [case(4)] samr_DomInfo4 info4;
+               [case(4)] samr_DomOEMInformation oem;
                [case(5)] samr_DomInfo5 info5;
                [case(6)] samr_DomInfo6 info6;
                [case(7)] samr_DomInfo7 info7;
                [case(8)] samr_DomInfo8 info8;
                [case(9)] samr_DomInfo9 info9;
-               [case(11)] samr_DomInfo11 info11;
+               [case(11)] samr_DomGeneralInformation2 general2;
                [case(12)] samr_DomInfo12 info12;
                [case(13)] samr_DomInfo13 info13;
        } samr_DomainInfo;

diff --git a/source/rpc_server/samr/dcesrv_samr.c b/source/rpc_server/samr/dcesrv_samr.c
index 8ee77a6a30068342ed520be9ff5a4e5e854fce98..e54d518f766406b893db852a574a9d73244e689b 100644 (file)
--- a/source/rpc_server/samr/dcesrv_samr.c
+++ b/source/rpc_server/samr/dcesrv_samr.c
@@ -521,10 +521,10 @@ static NTSTATUS dcesrv_samr_info_DomInfo1(struct samr_domain_state *state,
 /*
   return DomInfo2
 */
-static NTSTATUS dcesrv_samr_info_DomInfo2(struct samr_domain_state *state, 
-                                         TALLOC_CTX *mem_ctx,
-                                         struct ldb_message **dom_msgs,
-                                         struct samr_DomInfo2 *info)
+static NTSTATUS dcesrv_samr_info_DomGeneralInformation(struct samr_domain_state *state, 
+                                                      TALLOC_CTX *mem_ctx,
+                                                      struct ldb_message **dom_msgs,
+                                                      struct samr_DomGeneralInformation *info)
 {
        /* This pulls the NetBIOS name from the 
           cn=NTDS Settings,cn=<NETBIOS name of PDC>,....
@@ -538,7 +538,7 @@ static NTSTATUS dcesrv_samr_info_DomInfo2(struct samr_domain_state *state,
        info->force_logoff_time = ldb_msg_find_attr_as_uint64(dom_msgs[0], "forceLogoff", 
                                                            0x8000000000000000LL);
 
-       info->comment.string = samdb_result_string(dom_msgs[0], "comment", NULL);
+       info->oem_information.string = samdb_result_string(dom_msgs[0], "oEMInformation", NULL);
        info->domain_name.string  = state->domain_name;
 
        info->sequence_num = ldb_msg_find_attr_as_uint64(dom_msgs[0], "modifiedCount", 
@@ -592,12 +592,12 @@ static NTSTATUS dcesrv_samr_info_DomInfo3(struct samr_domain_state *state,
 /*
   return DomInfo4
 */
-static NTSTATUS dcesrv_samr_info_DomInfo4(struct samr_domain_state *state,
+static NTSTATUS dcesrv_samr_info_DomOEMInformation(struct samr_domain_state *state,
                                   TALLOC_CTX *mem_ctx,
                                    struct ldb_message **dom_msgs,
-                                  struct samr_DomInfo4 *info)
+                                  struct samr_DomOEMInformation *info)
 {
-       info->comment.string = samdb_result_string(dom_msgs[0], "comment", NULL);
+       info->oem_information.string = samdb_result_string(dom_msgs[0], "oEMInformation", NULL);
 
        return NT_STATUS_OK;
 }
@@ -700,13 +700,13 @@ static NTSTATUS dcesrv_samr_info_DomInfo9(struct samr_domain_state *state,
 /*
   return DomInfo11
 */
-static NTSTATUS dcesrv_samr_info_DomInfo11(struct samr_domain_state *state,
+static NTSTATUS dcesrv_samr_info_DomGeneralInformation2(struct samr_domain_state *state,
                                    TALLOC_CTX *mem_ctx,
                                    struct ldb_message **dom_msgs,
-                                   struct samr_DomInfo11 *info)
+                                   struct samr_DomGeneralInformation2 *info)
 {
        NTSTATUS status;
-       status = dcesrv_samr_info_DomInfo2(state, mem_ctx, dom_msgs, &info->info2);
+       status = dcesrv_samr_info_DomGeneralInformation(state, mem_ctx, dom_msgs, &info->general);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -792,7 +792,7 @@ static NTSTATUS dcesrv_samr_QueryDomainInfo(struct dcesrv_call_state *dce_call,
        case 2:
        {
                static const char * const attrs2[] = {"forceLogoff",
-                                                     "comment", 
+                                                     "oEMInformation", 
                                                      "modifiedCount", 
                                                      "fSMORoleOwner",
                                                      NULL};
@@ -808,7 +808,7 @@ static NTSTATUS dcesrv_samr_QueryDomainInfo(struct dcesrv_call_state *dce_call,
        }
        case 4:
        {
-               static const char * const attrs2[] = {"comment", 
+               static const char * const attrs2[] = {"oEMInformation", 
                                                      NULL};
                attrs = attrs2;
                break;
@@ -843,7 +843,7 @@ static NTSTATUS dcesrv_samr_QueryDomainInfo(struct dcesrv_call_state *dce_call,
                break;          
        case 11:
        {
-               static const char * const attrs2[] = { "comment", "forceLogoff", 
+               static const char * const attrs2[] = { "oEMInformation", "forceLogoff", 
                                                       "modifiedCount", 
                                                       "lockoutDuration", 
                                                       "lockOutObservationWindow", 
@@ -886,42 +886,42 @@ static NTSTATUS dcesrv_samr_QueryDomainInfo(struct dcesrv_call_state *dce_call,
        switch (r->in.level) {
        case 1:
                return dcesrv_samr_info_DomInfo1(d_state, mem_ctx, dom_msgs, 
-                                         &r->out.info->info1);
+                                                &r->out.info->info1);
        case 2:
-               return dcesrv_samr_info_DomInfo2(d_state, mem_ctx, dom_msgs, 
-                                         &r->out.info->info2);
+               return dcesrv_samr_info_DomGeneralInformation(d_state, mem_ctx, dom_msgs, 
+                                                             &r->out.info->general);
        case 3:
                return dcesrv_samr_info_DomInfo3(d_state, mem_ctx, dom_msgs, 
-                                         &r->out.info->info3);
+                                                &r->out.info->info3);
        case 4:
-               return dcesrv_samr_info_DomInfo4(d_state, mem_ctx, dom_msgs, 
-                                         &r->out.info->info4);
+               return dcesrv_samr_info_DomOEMInformation(d_state, mem_ctx, dom_msgs, 
+                                                         &r->out.info->oem);
        case 5:
                return dcesrv_samr_info_DomInfo5(d_state, mem_ctx, dom_msgs, 
-                                         &r->out.info->info5);
+                                                &r->out.info->info5);
        case 6:
                return dcesrv_samr_info_DomInfo6(d_state, mem_ctx, dom_msgs, 
-                                         &r->out.info->info6);
+                                                &r->out.info->info6);
        case 7:
                return dcesrv_samr_info_DomInfo7(d_state, mem_ctx, dom_msgs, 
-                                         &r->out.info->info7);
+                                                &r->out.info->info7);
        case 8:
                return dcesrv_samr_info_DomInfo8(d_state, mem_ctx, dom_msgs, 
-                                         &r->out.info->info8);
+                                                &r->out.info->info8);
        case 9:
                return dcesrv_samr_info_DomInfo9(d_state, mem_ctx, dom_msgs, 
-                                         &r->out.info->info9);
+                                                &r->out.info->info9);
        case 11:
-               return dcesrv_samr_info_DomInfo11(d_state, mem_ctx, dom_msgs, 
-                                         &r->out.info->info11);
+               return dcesrv_samr_info_DomGeneralInformation2(d_state, mem_ctx, dom_msgs, 
+                                                              &r->out.info->general2);
        case 12:
                return dcesrv_samr_info_DomInfo12(d_state, mem_ctx, dom_msgs, 
-                                         &r->out.info->info12);
+                                                 &r->out.info->info12);
        case 13:
                return dcesrv_samr_info_DomInfo13(d_state, mem_ctx, dom_msgs, 
-                                         &r->out.info->info13);
+                                                 &r->out.info->info13);
        }
-
+       
        return NT_STATUS_INVALID_INFO_CLASS;
 }
 
@@ -962,10 +962,10 @@ static NTSTATUS dcesrv_samr_SetDomainInfo(struct dcesrv_call_state *dce_call, TA
                SET_INT64  (msg, info1.min_password_age,       "minPwdAge");
                break;
        case 3:
-               SET_UINT64  (msg, info3.force_logoff_time,      "forceLogoff");
+               SET_UINT64  (msg, info3.force_logoff_time,     "forceLogoff");
                break;
        case 4:
-               SET_STRING(msg, info4.comment,          "comment");
+               SET_STRING(msg, oem.oem_information,           "oEMInformation");
                break;
 
        case 6:
@@ -2997,7 +2997,7 @@ static NTSTATUS dcesrv_samr_QueryUserInfo(struct dcesrv_call_state *dce_call, TA
        case 1:
        {
                static const char * const attrs2[] = {"sAMAccountName", "displayName",
-                                                     "primaryGroupID", "description",
+                                                     "primaryroupID", "description",
                                                      "comment", NULL};
                attrs = attrs2;
                break;

diff --git a/source/torture/rpc/samr.c b/source/torture/rpc/samr.c
index 55c75ba270eb415cc0227e8986516ea18e32fbcc..6afda6e9b5239e811b8f6919abed13150b1d20d4 100644 (file)
--- a/source/torture/rpc/samr.c
+++ b/source/torture/rpc/samr.c
@@ -3595,17 +3595,17 @@ static bool test_QueryDisplayInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                switch (r.in.level) {
                case 1:
                case 4:
-                       if (dom_info.out.info->info2.num_users < r.in.start_idx) {
+                       if (dom_info.out.info->general.num_users < r.in.start_idx) {
                                printf("QueryDomainInfo indicates that QueryDisplayInfo returned more users (%d/%d) than the domain %s is said to contain!\n",
-                                      r.in.start_idx, dom_info.out.info->info2.num_groups,
-                                      dom_info.out.info->info2.domain_name.string);
+                                      r.in.start_idx, dom_info.out.info->general.num_groups,
+                                      dom_info.out.info->general.domain_name.string);
                                ret = false;
                        }
                        if (!seen_testuser) {
                                struct policy_handle user_handle;
                                if (NT_STATUS_IS_OK(test_OpenUser_byname(p, mem_ctx, handle, TEST_ACCOUNT_NAME, &user_handle))) {
                                        printf("Didn't find test user " TEST_ACCOUNT_NAME " in enumeration of %s\n", 
-                                              dom_info.out.info->info2.domain_name.string);
+                                              dom_info.out.info->general.domain_name.string);
                                        ret = false;
                                        test_samr_handle_Close(p, mem_ctx, &user_handle);
                                }
@@ -3613,10 +3613,10 @@ static bool test_QueryDisplayInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                        break;
                case 3:
                case 5:
-                       if (dom_info.out.info->info2.num_groups != r.in.start_idx) {
+                       if (dom_info.out.info->general.num_groups != r.in.start_idx) {
                                printf("QueryDomainInfo indicates that QueryDisplayInfo didn't return all (%d/%d) the groups in %s\n",
-                                      r.in.start_idx, dom_info.out.info->info2.num_groups,
-                                      dom_info.out.info->info2.domain_name.string);
+                                      r.in.start_idx, dom_info.out.info->general.num_groups,
+                                      dom_info.out.info->general.domain_name.string);
                                ret = false;
                        }
                        
@@ -3745,7 +3745,7 @@ static bool test_QueryDomainInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        s.in.level = 4;
        s.in.info = talloc(mem_ctx, union samr_DomainInfo);
        
-       s.in.info->info4.comment.string = domain_comment;
+       s.in.info->oem.oem_information.string = domain_comment;
        status = dcerpc_samr_SetDomainInfo(p, mem_ctx, &s);
        if (!NT_STATUS_IS_OK(status)) {
                printf("SetDomainInfo level %u (set comment) failed - %s\n", 
@@ -3769,26 +3769,26 @@ static bool test_QueryDomainInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
                switch (levels[i]) {
                case 2:
-                       if (strcmp(r.out.info->info2.comment.string, domain_comment) != 0) {
-                               printf("QueryDomainInfo level %u returned different comment (%s, expected %s)\n",
-                                      levels[i], r.out.info->info2.comment.string, domain_comment);
+                       if (strcmp(r.out.info->general.oem_information.string, domain_comment) != 0) {
+                               printf("QueryDomainInfo level %u returned different oem_information (comment) (%s, expected %s)\n",
+                                      levels[i], r.out.info->general.oem_information.string, domain_comment);
                                ret = false;
                        }
-                       if (!r.out.info->info2.primary.string) {
+                       if (!r.out.info->general.primary.string) {
                                printf("QueryDomainInfo level %u returned no PDC name\n",
                                       levels[i]);
                                ret = false;
-                       } else if (r.out.info->info2.role == SAMR_ROLE_DOMAIN_PDC) {
-                               if (dcerpc_server_name(p) && strcasecmp_m(dcerpc_server_name(p), r.out.info->info2.primary.string) != 0) {
+                       } else if (r.out.info->general.role == SAMR_ROLE_DOMAIN_PDC) {
+                               if (dcerpc_server_name(p) && strcasecmp_m(dcerpc_server_name(p), r.out.info->general.primary.string) != 0) {
                                        printf("QueryDomainInfo level %u returned different PDC name (%s) compared to server name (%s), despite claiming to be the PDC\n",
-                                              levels[i], r.out.info->info2.primary.string, dcerpc_server_name(p));
+                                              levels[i], r.out.info->general.primary.string, dcerpc_server_name(p));
                                }
                        }
                        break;
                case 4:
-                       if (strcmp(r.out.info->info4.comment.string, domain_comment) != 0) {
-                               printf("QueryDomainInfo level %u returned different comment (%s, expected %s)\n",
-                                      levels[i], r.out.info->info4.comment.string, domain_comment);
+                       if (strcmp(r.out.info->oem.oem_information.string, domain_comment) != 0) {
+                               printf("QueryDomainInfo level %u returned different oem_information (comment) (%s, expected %s)\n",
+                                      levels[i], r.out.info->oem.oem_information.string, domain_comment);
                                ret = false;
                        }
                        break;
@@ -3800,9 +3800,9 @@ static bool test_QueryDomainInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                        }
                        break;
                case 11:
-                       if (strcmp(r.out.info->info11.info2.comment.string, domain_comment) != 0) {
+                       if (strcmp(r.out.info->general2.general.oem_information.string, domain_comment) != 0) {
                                printf("QueryDomainInfo level %u returned different comment (%s, expected %s)\n",
-                                      levels[i], r.out.info->info11.info2.comment.string, domain_comment);
+                                      levels[i], r.out.info->general2.general.oem_information.string, domain_comment);
                                ret = false;
                        }
                        break;

diff --git a/source/torture/rpc/samsync.c b/source/torture/rpc/samsync.c
index 7114756460776ab9bc1e4ce1245f7572325c5738..1e76de1dd2b0fbdcafea8222f8b514357818e170 100644 (file)
--- a/source/torture/rpc/samsync.c
+++ b/source/torture/rpc/samsync.c
@@ -346,9 +346,9 @@ static bool samsync_handle_domain(TALLOC_CTX *mem_ctx, struct samsync_state *sam
 
        TEST_STRING_EQUAL(q[5].out.info->info5.domain_name, domain->domain_name);
        
-       TEST_STRING_EQUAL(q[2].out.info->info2.comment, domain->comment);
-       TEST_STRING_EQUAL(q[4].out.info->info4.comment, domain->comment);
-       TEST_TIME_EQUAL(q[2].out.info->info2.force_logoff_time, domain->force_logoff_time);
+       TEST_STRING_EQUAL(q[2].out.info->general.oem_information, domain->oem_information);
+       TEST_STRING_EQUAL(q[4].out.info->oem.oem_information, domain->oem_information);
+       TEST_TIME_EQUAL(q[2].out.info->general.force_logoff_time, domain->force_logoff_time);
        TEST_TIME_EQUAL(q[3].out.info->info3.force_logoff_time, domain->force_logoff_time);
 
        TEST_TIME_EQUAL(q[1].out.info->info1.min_password_length, domain->min_password_length);
@@ -1487,7 +1487,7 @@ bool torture_rpc_samsync(struct torture_context *torture)
        s.in.level = 4;
        s.in.info = talloc(mem_ctx, union samr_DomainInfo);
        
-       s.in.info->info4.comment.string
+       s.in.info->oem.oem_information.string
                = talloc_asprintf(mem_ctx, 
                                  "Tortured by Samba4: %s", 
                                  timestring(mem_ctx, time(NULL)));