s3-build: re-run make samba3-idl.

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 313f32a2608ba53672f9e786639b78be6dcd642e..860d33a4a4f6609e58975efeef35530aef9b9be2 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3066,15 +3066,15 @@ _PUBLIC_ enum ndr_err_code ndr_push_samr_PasswordProperties(struct ndr_push *ndr
 _PUBLIC_ enum ndr_err_code ndr_pull_samr_PasswordProperties(struct ndr_pull *ndr, int ndr_flags, uint32_t *r);
 _PUBLIC_ void ndr_print_samr_PasswordProperties(struct ndr_print *ndr, const char *name, uint32_t r);
 _PUBLIC_ void ndr_print_samr_DomInfo1(struct ndr_print *ndr, const char *name, const struct samr_DomInfo1 *r);
 _PUBLIC_ enum ndr_err_code ndr_pull_samr_PasswordProperties(struct ndr_pull *ndr, int ndr_flags, uint32_t *r);
 _PUBLIC_ void ndr_print_samr_PasswordProperties(struct ndr_print *ndr, const char *name, uint32_t r);
 _PUBLIC_ void ndr_print_samr_DomInfo1(struct ndr_print *ndr, const char *name, const struct samr_DomInfo1 *r);

-_PUBLIC_ void ndr_print_samr_DomInfo2(struct ndr_print *ndr, const char *name, const struct samr_DomInfo2 *r);
+_PUBLIC_ void ndr_print_samr_DomGeneralInformation(struct ndr_print *ndr, const char *name, const struct samr_DomGeneralInformation *r);

 _PUBLIC_ void ndr_print_samr_DomInfo3(struct ndr_print *ndr, const char *name, const struct samr_DomInfo3 *r);
 _PUBLIC_ void ndr_print_samr_DomInfo3(struct ndr_print *ndr, const char *name, const struct samr_DomInfo3 *r);

-_PUBLIC_ void ndr_print_samr_DomInfo4(struct ndr_print *ndr, const char *name, const struct samr_DomInfo4 *r);
+_PUBLIC_ void ndr_print_samr_DomOEMInformation(struct ndr_print *ndr, const char *name, const struct samr_DomOEMInformation *r);

 _PUBLIC_ void ndr_print_samr_DomInfo5(struct ndr_print *ndr, const char *name, const struct samr_DomInfo5 *r);
 _PUBLIC_ void ndr_print_samr_DomInfo6(struct ndr_print *ndr, const char *name, const struct samr_DomInfo6 *r);
 _PUBLIC_ void ndr_print_samr_DomInfo7(struct ndr_print *ndr, const char *name, const struct samr_DomInfo7 *r);
 _PUBLIC_ void ndr_print_samr_DomInfo8(struct ndr_print *ndr, const char *name, const struct samr_DomInfo8 *r);
 _PUBLIC_ void ndr_print_samr_DomInfo9(struct ndr_print *ndr, const char *name, const struct samr_DomInfo9 *r);
 _PUBLIC_ void ndr_print_samr_DomInfo5(struct ndr_print *ndr, const char *name, const struct samr_DomInfo5 *r);
 _PUBLIC_ void ndr_print_samr_DomInfo6(struct ndr_print *ndr, const char *name, const struct samr_DomInfo6 *r);
 _PUBLIC_ void ndr_print_samr_DomInfo7(struct ndr_print *ndr, const char *name, const struct samr_DomInfo7 *r);
 _PUBLIC_ void ndr_print_samr_DomInfo8(struct ndr_print *ndr, const char *name, const struct samr_DomInfo8 *r);
 _PUBLIC_ void ndr_print_samr_DomInfo9(struct ndr_print *ndr, const char *name, const struct samr_DomInfo9 *r);

-_PUBLIC_ void ndr_print_samr_DomInfo11(struct ndr_print *ndr, const char *name, const struct samr_DomInfo11 *r);
+_PUBLIC_ void ndr_print_samr_DomGeneralInformation2(struct ndr_print *ndr, const char *name, const struct samr_DomGeneralInformation2 *r);

 _PUBLIC_ void ndr_print_samr_DomInfo12(struct ndr_print *ndr, const char *name, const struct samr_DomInfo12 *r);
 _PUBLIC_ void ndr_print_samr_DomInfo13(struct ndr_print *ndr, const char *name, const struct samr_DomInfo13 *r);
 _PUBLIC_ void ndr_print_samr_DomainInfo(struct ndr_print *ndr, const char *name, const union samr_DomainInfo *r);
 _PUBLIC_ void ndr_print_samr_DomInfo12(struct ndr_print *ndr, const char *name, const struct samr_DomInfo12 *r);
 _PUBLIC_ void ndr_print_samr_DomInfo13(struct ndr_print *ndr, const char *name, const struct samr_DomInfo13 *r);
 _PUBLIC_ void ndr_print_samr_DomainInfo(struct ndr_print *ndr, const char *name, const union samr_DomainInfo *r);


@@ -7287,22 +7287,22 @@ void init_samr_DomInfo1(struct samr_DomInfo1 *r,
                        uint32_t password_properties,
                        int64_t max_password_age,
                        int64_t min_password_age);
                        uint32_t password_properties,
                        int64_t max_password_age,
                        int64_t min_password_age);

-void init_samr_DomInfo2(struct samr_DomInfo2 *r,
-                       NTTIME force_logoff_time,
-                       const char *comment,
-                       const char *domain_name,
-                       const char *primary,
-                       uint64_t sequence_num,
-                       uint32_t unknown2,
-                       enum samr_Role role,
-                       uint32_t unknown3,
-                       uint32_t num_users,
-                       uint32_t num_groups,
-                       uint32_t num_aliases);
+void init_samr_DomGeneralInformation(struct samr_DomGeneralInformation *r,
+                                    NTTIME force_logoff_time,
+                                    const char *oem_information,
+                                    const char *domain_name,
+                                    const char *primary,
+                                    uint64_t sequence_num,
+                                    uint32_t unknown2,
+                                    enum samr_Role role,
+                                    uint32_t unknown3,
+                                    uint32_t num_users,
+                                    uint32_t num_groups,
+                                    uint32_t num_aliases);

 void init_samr_DomInfo3(struct samr_DomInfo3 *r,
                        NTTIME force_logoff_time);
 void init_samr_DomInfo3(struct samr_DomInfo3 *r,
                        NTTIME force_logoff_time);

-void init_samr_DomInfo4(struct samr_DomInfo4 *r,
-                       const char *comment);
+void init_samr_DomOEMInformation(struct samr_DomOEMInformation *r,
+                                const char *oem_information);

 void init_samr_DomInfo5(struct samr_DomInfo5 *r,
                        const char *domain_name);
 void init_samr_DomInfo6(struct samr_DomInfo6 *r,
 void init_samr_DomInfo5(struct samr_DomInfo5 *r,
                        const char *domain_name);
 void init_samr_DomInfo6(struct samr_DomInfo6 *r,

diff --git a/source3/librpc/gen_ndr/ndr_samr.c b/source3/librpc/gen_ndr/ndr_samr.c
index 9c5a8863255d18941488e7f55b126a6765cb3a31..10055aef37b06d04caf698ef92a56addb3741b80 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_samr.c
+++ b/source3/librpc/gen_ndr/ndr_samr.c
@@ -406,12 +406,12 @@ _PUBLIC_ void ndr_print_samr_DomInfo1(struct ndr_print *ndr, const char *name, c
        ndr->depth--;
 }
 
        ndr->depth--;
 }
 

-static enum ndr_err_code ndr_push_samr_DomInfo2(struct ndr_push *ndr, int ndr_flags, const struct samr_DomInfo2 *r)
+static enum ndr_err_code ndr_push_samr_DomGeneralInformation(struct ndr_push *ndr, int ndr_flags, const struct samr_DomGeneralInformation *r)

 {
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_push_align(ndr, 4));
                NDR_CHECK(ndr_push_NTTIME(ndr, NDR_SCALARS, r->force_logoff_time));
 {
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_push_align(ndr, 4));
                NDR_CHECK(ndr_push_NTTIME(ndr, NDR_SCALARS, r->force_logoff_time));

-               NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS, &r->comment));
+               NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS, &r->oem_information));

                NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS, &r->domain_name));
                NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS, &r->primary));
                NDR_CHECK(ndr_push_udlong(ndr, NDR_SCALARS, r->sequence_num));
                NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS, &r->domain_name));
                NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS, &r->primary));
                NDR_CHECK(ndr_push_udlong(ndr, NDR_SCALARS, r->sequence_num));


@@ -423,19 +423,19 @@ static enum ndr_err_code ndr_push_samr_DomInfo2(struct ndr_push *ndr, int ndr_fl
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_aliases));
        }
        if (ndr_flags & NDR_BUFFERS) {
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_aliases));
        }
        if (ndr_flags & NDR_BUFFERS) {

-               NDR_CHECK(ndr_push_lsa_String(ndr, NDR_BUFFERS, &r->comment));
+               NDR_CHECK(ndr_push_lsa_String(ndr, NDR_BUFFERS, &r->oem_information));

                NDR_CHECK(ndr_push_lsa_String(ndr, NDR_BUFFERS, &r->domain_name));
                NDR_CHECK(ndr_push_lsa_String(ndr, NDR_BUFFERS, &r->primary));
        }
        return NDR_ERR_SUCCESS;
 }
 
                NDR_CHECK(ndr_push_lsa_String(ndr, NDR_BUFFERS, &r->domain_name));
                NDR_CHECK(ndr_push_lsa_String(ndr, NDR_BUFFERS, &r->primary));
        }
        return NDR_ERR_SUCCESS;
 }
 

-static enum ndr_err_code ndr_pull_samr_DomInfo2(struct ndr_pull *ndr, int ndr_flags, struct samr_DomInfo2 *r)
+static enum ndr_err_code ndr_pull_samr_DomGeneralInformation(struct ndr_pull *ndr, int ndr_flags, struct samr_DomGeneralInformation *r)

 {
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_NTTIME(ndr, NDR_SCALARS, &r->force_logoff_time));
 {
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_NTTIME(ndr, NDR_SCALARS, &r->force_logoff_time));

-               NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_SCALARS, &r->comment));
+               NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_SCALARS, &r->oem_information));

                NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_SCALARS, &r->domain_name));
                NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_SCALARS, &r->primary));
                NDR_CHECK(ndr_pull_udlong(ndr, NDR_SCALARS, &r->sequence_num));
                NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_SCALARS, &r->domain_name));
                NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_SCALARS, &r->primary));
                NDR_CHECK(ndr_pull_udlong(ndr, NDR_SCALARS, &r->sequence_num));


@@ -447,19 +447,19 @@ static enum ndr_err_code ndr_pull_samr_DomInfo2(struct ndr_pull *ndr, int ndr_fl
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_aliases));
        }
        if (ndr_flags & NDR_BUFFERS) {
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_aliases));
        }
        if (ndr_flags & NDR_BUFFERS) {

-               NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_BUFFERS, &r->comment));
+               NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_BUFFERS, &r->oem_information));

                NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_BUFFERS, &r->domain_name));
                NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_BUFFERS, &r->primary));
        }
        return NDR_ERR_SUCCESS;
 }
 
                NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_BUFFERS, &r->domain_name));
                NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_BUFFERS, &r->primary));
        }
        return NDR_ERR_SUCCESS;
 }
 

-_PUBLIC_ void ndr_print_samr_DomInfo2(struct ndr_print *ndr, const char *name, const struct samr_DomInfo2 *r)
+_PUBLIC_ void ndr_print_samr_DomGeneralInformation(struct ndr_print *ndr, const char *name, const struct samr_DomGeneralInformation *r)

 {
 {

-       ndr_print_struct(ndr, name, "samr_DomInfo2");
+       ndr_print_struct(ndr, name, "samr_DomGeneralInformation");

        ndr->depth++;
        ndr_print_NTTIME(ndr, "force_logoff_time", r->force_logoff_time);
        ndr->depth++;
        ndr_print_NTTIME(ndr, "force_logoff_time", r->force_logoff_time);

-       ndr_print_lsa_String(ndr, "comment", &r->comment);
+       ndr_print_lsa_String(ndr, "oem_information", &r->oem_information);

        ndr_print_lsa_String(ndr, "domain_name", &r->domain_name);
        ndr_print_lsa_String(ndr, "primary", &r->primary);
        ndr_print_udlong(ndr, "sequence_num", r->sequence_num);
        ndr_print_lsa_String(ndr, "domain_name", &r->domain_name);
        ndr_print_lsa_String(ndr, "primary", &r->primary);
        ndr_print_udlong(ndr, "sequence_num", r->sequence_num);


@@ -502,35 +502,35 @@ _PUBLIC_ void ndr_print_samr_DomInfo3(struct ndr_print *ndr, const char *name, c
        ndr->depth--;
 }
 
        ndr->depth--;
 }
 

-static enum ndr_err_code ndr_push_samr_DomInfo4(struct ndr_push *ndr, int ndr_flags, const struct samr_DomInfo4 *r)
+static enum ndr_err_code ndr_push_samr_DomOEMInformation(struct ndr_push *ndr, int ndr_flags, const struct samr_DomOEMInformation *r)

 {
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_push_align(ndr, 4));
 {
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_push_align(ndr, 4));

-               NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS, &r->comment));
+               NDR_CHECK(ndr_push_lsa_String(ndr, NDR_SCALARS, &r->oem_information));

        }
        if (ndr_flags & NDR_BUFFERS) {
        }
        if (ndr_flags & NDR_BUFFERS) {

-               NDR_CHECK(ndr_push_lsa_String(ndr, NDR_BUFFERS, &r->comment));
+               NDR_CHECK(ndr_push_lsa_String(ndr, NDR_BUFFERS, &r->oem_information));

        }
        return NDR_ERR_SUCCESS;
 }
 
        }
        return NDR_ERR_SUCCESS;
 }
 

-static enum ndr_err_code ndr_pull_samr_DomInfo4(struct ndr_pull *ndr, int ndr_flags, struct samr_DomInfo4 *r)
+static enum ndr_err_code ndr_pull_samr_DomOEMInformation(struct ndr_pull *ndr, int ndr_flags, struct samr_DomOEMInformation *r)

 {
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
 {
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));

-               NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_SCALARS, &r->comment));
+               NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_SCALARS, &r->oem_information));

        }
        if (ndr_flags & NDR_BUFFERS) {
        }
        if (ndr_flags & NDR_BUFFERS) {

-               NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_BUFFERS, &r->comment));
+               NDR_CHECK(ndr_pull_lsa_String(ndr, NDR_BUFFERS, &r->oem_information));

        }
        return NDR_ERR_SUCCESS;
 }
 
        }
        return NDR_ERR_SUCCESS;
 }
 

-_PUBLIC_ void ndr_print_samr_DomInfo4(struct ndr_print *ndr, const char *name, const struct samr_DomInfo4 *r)
+_PUBLIC_ void ndr_print_samr_DomOEMInformation(struct ndr_print *ndr, const char *name, const struct samr_DomOEMInformation *r)

 {
 {

-       ndr_print_struct(ndr, name, "samr_DomInfo4");
+       ndr_print_struct(ndr, name, "samr_DomOEMInformation");

        ndr->depth++;
        ndr->depth++;

-       ndr_print_lsa_String(ndr, "comment", &r->comment);
+       ndr_print_lsa_String(ndr, "oem_information", &r->oem_information);

        ndr->depth--;
 }
 
        ndr->depth--;
 }
 


@@ -691,41 +691,41 @@ _PUBLIC_ void ndr_print_samr_DomInfo9(struct ndr_print *ndr, const char *name, c
        ndr->depth--;
 }
 
        ndr->depth--;
 }
 

-static enum ndr_err_code ndr_push_samr_DomInfo11(struct ndr_push *ndr, int ndr_flags, const struct samr_DomInfo11 *r)
+static enum ndr_err_code ndr_push_samr_DomGeneralInformation2(struct ndr_push *ndr, int ndr_flags, const struct samr_DomGeneralInformation2 *r)

 {
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_push_align(ndr, 8));
 {
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_push_align(ndr, 8));

-               NDR_CHECK(ndr_push_samr_DomInfo2(ndr, NDR_SCALARS, &r->info2));
+               NDR_CHECK(ndr_push_samr_DomGeneralInformation(ndr, NDR_SCALARS, &r->general));

                NDR_CHECK(ndr_push_hyper(ndr, NDR_SCALARS, r->lockout_duration));
                NDR_CHECK(ndr_push_hyper(ndr, NDR_SCALARS, r->lockout_window));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->lockout_threshold));
        }
        if (ndr_flags & NDR_BUFFERS) {
                NDR_CHECK(ndr_push_hyper(ndr, NDR_SCALARS, r->lockout_duration));
                NDR_CHECK(ndr_push_hyper(ndr, NDR_SCALARS, r->lockout_window));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->lockout_threshold));
        }
        if (ndr_flags & NDR_BUFFERS) {

-               NDR_CHECK(ndr_push_samr_DomInfo2(ndr, NDR_BUFFERS, &r->info2));
+               NDR_CHECK(ndr_push_samr_DomGeneralInformation(ndr, NDR_BUFFERS, &r->general));

        }
        return NDR_ERR_SUCCESS;
 }
 
        }
        return NDR_ERR_SUCCESS;
 }
 

-static enum ndr_err_code ndr_pull_samr_DomInfo11(struct ndr_pull *ndr, int ndr_flags, struct samr_DomInfo11 *r)
+static enum ndr_err_code ndr_pull_samr_DomGeneralInformation2(struct ndr_pull *ndr, int ndr_flags, struct samr_DomGeneralInformation2 *r)

 {
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 8));
 {
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 8));

-               NDR_CHECK(ndr_pull_samr_DomInfo2(ndr, NDR_SCALARS, &r->info2));
+               NDR_CHECK(ndr_pull_samr_DomGeneralInformation(ndr, NDR_SCALARS, &r->general));

                NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, &r->lockout_duration));
                NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, &r->lockout_window));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->lockout_threshold));
        }
        if (ndr_flags & NDR_BUFFERS) {
                NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, &r->lockout_duration));
                NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, &r->lockout_window));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->lockout_threshold));
        }
        if (ndr_flags & NDR_BUFFERS) {

-               NDR_CHECK(ndr_pull_samr_DomInfo2(ndr, NDR_BUFFERS, &r->info2));
+               NDR_CHECK(ndr_pull_samr_DomGeneralInformation(ndr, NDR_BUFFERS, &r->general));

        }
        return NDR_ERR_SUCCESS;
 }
 
        }
        return NDR_ERR_SUCCESS;
 }
 

-_PUBLIC_ void ndr_print_samr_DomInfo11(struct ndr_print *ndr, const char *name, const struct samr_DomInfo11 *r)
+_PUBLIC_ void ndr_print_samr_DomGeneralInformation2(struct ndr_print *ndr, const char *name, const struct samr_DomGeneralInformation2 *r)

 {
 {

-       ndr_print_struct(ndr, name, "samr_DomInfo11");
+       ndr_print_struct(ndr, name, "samr_DomGeneralInformation2");

        ndr->depth++;
        ndr->depth++;

-       ndr_print_samr_DomInfo2(ndr, "info2", &r->info2);
+       ndr_print_samr_DomGeneralInformation(ndr, "general", &r->general);

        ndr_print_hyper(ndr, "lockout_duration", r->lockout_duration);
        ndr_print_hyper(ndr, "lockout_window", r->lockout_window);
        ndr_print_uint16(ndr, "lockout_threshold", r->lockout_threshold);
        ndr_print_hyper(ndr, "lockout_duration", r->lockout_duration);
        ndr_print_hyper(ndr, "lockout_window", r->lockout_window);
        ndr_print_uint16(ndr, "lockout_threshold", r->lockout_threshold);


@@ -818,7 +818,7 @@ static enum ndr_err_code ndr_push_samr_DomainInfo(struct ndr_push *ndr, int ndr_
                        break; }
 
                        case 2: {
                        break; }
 
                        case 2: {

-                               NDR_CHECK(ndr_push_samr_DomInfo2(ndr, NDR_SCALARS, &r->info2));
+                               NDR_CHECK(ndr_push_samr_DomGeneralInformation(ndr, NDR_SCALARS, &r->general));

                        break; }
 
                        case 3: {
                        break; }
 
                        case 3: {


@@ -826,7 +826,7 @@ static enum ndr_err_code ndr_push_samr_DomainInfo(struct ndr_push *ndr, int ndr_
                        break; }
 
                        case 4: {
                        break; }
 
                        case 4: {

-                               NDR_CHECK(ndr_push_samr_DomInfo4(ndr, NDR_SCALARS, &r->info4));
+                               NDR_CHECK(ndr_push_samr_DomOEMInformation(ndr, NDR_SCALARS, &r->oem));

                        break; }
 
                        case 5: {
                        break; }
 
                        case 5: {


@@ -850,7 +850,7 @@ static enum ndr_err_code ndr_push_samr_DomainInfo(struct ndr_push *ndr, int ndr_
                        break; }
 
                        case 11: {
                        break; }
 
                        case 11: {

-                               NDR_CHECK(ndr_push_samr_DomInfo11(ndr, NDR_SCALARS, &r->info11));
+                               NDR_CHECK(ndr_push_samr_DomGeneralInformation2(ndr, NDR_SCALARS, &r->general2));

                        break; }
 
                        case 12: {
                        break; }
 
                        case 12: {


@@ -872,14 +872,14 @@ static enum ndr_err_code ndr_push_samr_DomainInfo(struct ndr_push *ndr, int ndr_
                        break;
 
                        case 2:
                        break;
 
                        case 2:

-                               NDR_CHECK(ndr_push_samr_DomInfo2(ndr, NDR_BUFFERS, &r->info2));
+                               NDR_CHECK(ndr_push_samr_DomGeneralInformation(ndr, NDR_BUFFERS, &r->general));

                        break;
 
                        case 3:
                        break;
 
                        case 4:
                        break;
 
                        case 3:
                        break;
 
                        case 4:

-                               NDR_CHECK(ndr_push_samr_DomInfo4(ndr, NDR_BUFFERS, &r->info4));
+                               NDR_CHECK(ndr_push_samr_DomOEMInformation(ndr, NDR_BUFFERS, &r->oem));

                        break;
 
                        case 5:
                        break;
 
                        case 5:


@@ -900,7 +900,7 @@ static enum ndr_err_code ndr_push_samr_DomainInfo(struct ndr_push *ndr, int ndr_
                        break;
 
                        case 11:
                        break;
 
                        case 11:

-                               NDR_CHECK(ndr_push_samr_DomInfo11(ndr, NDR_BUFFERS, &r->info11));
+                               NDR_CHECK(ndr_push_samr_DomGeneralInformation2(ndr, NDR_BUFFERS, &r->general2));

                        break;
 
                        case 12:
                        break;
 
                        case 12:


@@ -932,7 +932,7 @@ static enum ndr_err_code ndr_pull_samr_DomainInfo(struct ndr_pull *ndr, int ndr_
                        break; }
 
                        case 2: {
                        break; }
 
                        case 2: {

-                               NDR_CHECK(ndr_pull_samr_DomInfo2(ndr, NDR_SCALARS, &r->info2));
+                               NDR_CHECK(ndr_pull_samr_DomGeneralInformation(ndr, NDR_SCALARS, &r->general));

                        break; }
 
                        case 3: {
                        break; }
 
                        case 3: {


@@ -940,7 +940,7 @@ static enum ndr_err_code ndr_pull_samr_DomainInfo(struct ndr_pull *ndr, int ndr_
                        break; }
 
                        case 4: {
                        break; }
 
                        case 4: {

-                               NDR_CHECK(ndr_pull_samr_DomInfo4(ndr, NDR_SCALARS, &r->info4));
+                               NDR_CHECK(ndr_pull_samr_DomOEMInformation(ndr, NDR_SCALARS, &r->oem));

                        break; }
 
                        case 5: {
                        break; }
 
                        case 5: {


@@ -964,7 +964,7 @@ static enum ndr_err_code ndr_pull_samr_DomainInfo(struct ndr_pull *ndr, int ndr_
                        break; }
 
                        case 11: {
                        break; }
 
                        case 11: {

-                               NDR_CHECK(ndr_pull_samr_DomInfo11(ndr, NDR_SCALARS, &r->info11));
+                               NDR_CHECK(ndr_pull_samr_DomGeneralInformation2(ndr, NDR_SCALARS, &r->general2));

                        break; }
 
                        case 12: {
                        break; }
 
                        case 12: {


@@ -985,14 +985,14 @@ static enum ndr_err_code ndr_pull_samr_DomainInfo(struct ndr_pull *ndr, int ndr_
                        break;
 
                        case 2:
                        break;
 
                        case 2:

-                               NDR_CHECK(ndr_pull_samr_DomInfo2(ndr, NDR_BUFFERS, &r->info2));
+                               NDR_CHECK(ndr_pull_samr_DomGeneralInformation(ndr, NDR_BUFFERS, &r->general));

                        break;
 
                        case 3:
                        break;
 
                        case 4:
                        break;
 
                        case 3:
                        break;
 
                        case 4:

-                               NDR_CHECK(ndr_pull_samr_DomInfo4(ndr, NDR_BUFFERS, &r->info4));
+                               NDR_CHECK(ndr_pull_samr_DomOEMInformation(ndr, NDR_BUFFERS, &r->oem));

                        break;
 
                        case 5:
                        break;
 
                        case 5:


@@ -1013,7 +1013,7 @@ static enum ndr_err_code ndr_pull_samr_DomainInfo(struct ndr_pull *ndr, int ndr_
                        break;
 
                        case 11:
                        break;
 
                        case 11:

-                               NDR_CHECK(ndr_pull_samr_DomInfo11(ndr, NDR_BUFFERS, &r->info11));
+                               NDR_CHECK(ndr_pull_samr_DomGeneralInformation2(ndr, NDR_BUFFERS, &r->general2));

                        break;
 
                        case 12:
                        break;
 
                        case 12:


@@ -1040,7 +1040,7 @@ _PUBLIC_ void ndr_print_samr_DomainInfo(struct ndr_print *ndr, const char *name,
                break;
 
                case 2:
                break;
 
                case 2:

-                       ndr_print_samr_DomInfo2(ndr, "info2", &r->info2);
+                       ndr_print_samr_DomGeneralInformation(ndr, "general", &r->general);

                break;
 
                case 3:
                break;
 
                case 3:


@@ -1048,7 +1048,7 @@ _PUBLIC_ void ndr_print_samr_DomainInfo(struct ndr_print *ndr, const char *name,
                break;
 
                case 4:
                break;
 
                case 4:

-                       ndr_print_samr_DomInfo4(ndr, "info4", &r->info4);
+                       ndr_print_samr_DomOEMInformation(ndr, "oem", &r->oem);

                break;
 
                case 5:
                break;
 
                case 5:


@@ -1072,7 +1072,7 @@ _PUBLIC_ void ndr_print_samr_DomainInfo(struct ndr_print *ndr, const char *name,
                break;
 
                case 11:
                break;
 
                case 11:

-                       ndr_print_samr_DomInfo11(ndr, "info11", &r->info11);
+                       ndr_print_samr_DomGeneralInformation2(ndr, "general2", &r->general2);

                break;
 
                case 12:
                break;
 
                case 12:

diff --git a/source3/librpc/gen_ndr/ndr_samr.h b/source3/librpc/gen_ndr/ndr_samr.h
index c21b5455fb864faff7ef786dabe11d1e45009c48..1f582061f9325149011a064736463429063476d8 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_samr.h
+++ b/source3/librpc/gen_ndr/ndr_samr.h
@@ -163,15 +163,15 @@ enum ndr_err_code ndr_push_samr_PasswordProperties(struct ndr_push *ndr, int ndr
 enum ndr_err_code ndr_pull_samr_PasswordProperties(struct ndr_pull *ndr, int ndr_flags, uint32_t *r);
 void ndr_print_samr_PasswordProperties(struct ndr_print *ndr, const char *name, uint32_t r);
 void ndr_print_samr_DomInfo1(struct ndr_print *ndr, const char *name, const struct samr_DomInfo1 *r);
 enum ndr_err_code ndr_pull_samr_PasswordProperties(struct ndr_pull *ndr, int ndr_flags, uint32_t *r);
 void ndr_print_samr_PasswordProperties(struct ndr_print *ndr, const char *name, uint32_t r);
 void ndr_print_samr_DomInfo1(struct ndr_print *ndr, const char *name, const struct samr_DomInfo1 *r);

-void ndr_print_samr_DomInfo2(struct ndr_print *ndr, const char *name, const struct samr_DomInfo2 *r);
+void ndr_print_samr_DomGeneralInformation(struct ndr_print *ndr, const char *name, const struct samr_DomGeneralInformation *r);

 void ndr_print_samr_DomInfo3(struct ndr_print *ndr, const char *name, const struct samr_DomInfo3 *r);
 void ndr_print_samr_DomInfo3(struct ndr_print *ndr, const char *name, const struct samr_DomInfo3 *r);

-void ndr_print_samr_DomInfo4(struct ndr_print *ndr, const char *name, const struct samr_DomInfo4 *r);
+void ndr_print_samr_DomOEMInformation(struct ndr_print *ndr, const char *name, const struct samr_DomOEMInformation *r);

 void ndr_print_samr_DomInfo5(struct ndr_print *ndr, const char *name, const struct samr_DomInfo5 *r);
 void ndr_print_samr_DomInfo6(struct ndr_print *ndr, const char *name, const struct samr_DomInfo6 *r);
 void ndr_print_samr_DomInfo7(struct ndr_print *ndr, const char *name, const struct samr_DomInfo7 *r);
 void ndr_print_samr_DomInfo8(struct ndr_print *ndr, const char *name, const struct samr_DomInfo8 *r);
 void ndr_print_samr_DomInfo9(struct ndr_print *ndr, const char *name, const struct samr_DomInfo9 *r);
 void ndr_print_samr_DomInfo5(struct ndr_print *ndr, const char *name, const struct samr_DomInfo5 *r);
 void ndr_print_samr_DomInfo6(struct ndr_print *ndr, const char *name, const struct samr_DomInfo6 *r);
 void ndr_print_samr_DomInfo7(struct ndr_print *ndr, const char *name, const struct samr_DomInfo7 *r);
 void ndr_print_samr_DomInfo8(struct ndr_print *ndr, const char *name, const struct samr_DomInfo8 *r);
 void ndr_print_samr_DomInfo9(struct ndr_print *ndr, const char *name, const struct samr_DomInfo9 *r);

-void ndr_print_samr_DomInfo11(struct ndr_print *ndr, const char *name, const struct samr_DomInfo11 *r);
+void ndr_print_samr_DomGeneralInformation2(struct ndr_print *ndr, const char *name, const struct samr_DomGeneralInformation2 *r);

 void ndr_print_samr_DomInfo12(struct ndr_print *ndr, const char *name, const struct samr_DomInfo12 *r);
 void ndr_print_samr_DomInfo13(struct ndr_print *ndr, const char *name, const struct samr_DomInfo13 *r);
 void ndr_print_samr_DomainInfo(struct ndr_print *ndr, const char *name, const union samr_DomainInfo *r);
 void ndr_print_samr_DomInfo12(struct ndr_print *ndr, const char *name, const struct samr_DomInfo12 *r);
 void ndr_print_samr_DomInfo13(struct ndr_print *ndr, const char *name, const struct samr_DomInfo13 *r);
 void ndr_print_samr_DomainInfo(struct ndr_print *ndr, const char *name, const union samr_DomainInfo *r);

diff --git a/source3/librpc/gen_ndr/samr.h b/source3/librpc/gen_ndr/samr.h
index 522c6a9ceca842c2a5d81de1eff7483c598325c3..62f6bf8de6ed36e24d42dfdb119c525d16e7c5a3 100644 (file)
--- a/source3/librpc/gen_ndr/samr.h
+++ b/source3/librpc/gen_ndr/samr.h
@@ -125,9 +125,9 @@ struct samr_DomInfo1 {
        int64_t min_password_age;
 };
 
        int64_t min_password_age;
 };
 

-struct samr_DomInfo2 {
+struct samr_DomGeneralInformation {

        NTTIME force_logoff_time;
        NTTIME force_logoff_time;

-       struct lsa_String comment;
+       struct lsa_String oem_information;

        struct lsa_String domain_name;
        struct lsa_String primary;
        uint64_t sequence_num;
        struct lsa_String domain_name;
        struct lsa_String primary;
        uint64_t sequence_num;


@@ -143,8 +143,8 @@ struct samr_DomInfo3 {
        NTTIME force_logoff_time;
 };
 
        NTTIME force_logoff_time;
 };
 

-struct samr_DomInfo4 {
-       struct lsa_String comment;
+struct samr_DomOEMInformation {
+       struct lsa_String oem_information;

 };
 
 struct samr_DomInfo5 {
 };
 
 struct samr_DomInfo5 {


@@ -168,8 +168,8 @@ struct samr_DomInfo9 {
        uint32_t unknown;
 };
 
        uint32_t unknown;
 };
 

-struct samr_DomInfo11 {
-       struct samr_DomInfo2 info2;
+struct samr_DomGeneralInformation2 {
+       struct samr_DomGeneralInformation general;

        uint64_t lockout_duration;
        uint64_t lockout_window;
        uint16_t lockout_threshold;
        uint64_t lockout_duration;
        uint64_t lockout_window;
        uint16_t lockout_threshold;


@@ -190,15 +190,15 @@ struct samr_DomInfo13 {
 
 union samr_DomainInfo {
        struct samr_DomInfo1 info1;/* [case] */
 
 union samr_DomainInfo {
        struct samr_DomInfo1 info1;/* [case] */

-       struct samr_DomInfo2 info2;/* [case(2)] */
+       struct samr_DomGeneralInformation general;/* [case(2)] */

        struct samr_DomInfo3 info3;/* [case(3)] */
        struct samr_DomInfo3 info3;/* [case(3)] */

-       struct samr_DomInfo4 info4;/* [case(4)] */
+       struct samr_DomOEMInformation oem;/* [case(4)] */

        struct samr_DomInfo5 info5;/* [case(5)] */
        struct samr_DomInfo6 info6;/* [case(6)] */
        struct samr_DomInfo7 info7;/* [case(7)] */
        struct samr_DomInfo8 info8;/* [case(8)] */
        struct samr_DomInfo9 info9;/* [case(9)] */
        struct samr_DomInfo5 info5;/* [case(5)] */
        struct samr_DomInfo6 info6;/* [case(6)] */
        struct samr_DomInfo7 info7;/* [case(7)] */
        struct samr_DomInfo8 info8;/* [case(8)] */
        struct samr_DomInfo9 info9;/* [case(9)] */

-       struct samr_DomInfo11 info11;/* [case(11)] */
+       struct samr_DomGeneralInformation2 general2;/* [case(11)] */

        struct samr_DomInfo12 info12;/* [case(12)] */
        struct samr_DomInfo13 info13;/* [case(13)] */
 }/* [switch_type(uint16)] */;
        struct samr_DomInfo12 info12;/* [case(12)] */
        struct samr_DomInfo13 info13;/* [case(13)] */
 }/* [switch_type(uint16)] */;