Merge branch 'master' of ssh://git.samba.org/data/git/samba

diff --git a/librpc/idl/srvsvc.idl b/librpc/idl/srvsvc.idl
index dcdd1ac546629bffacf3c62dbac7ba794790ea5e..3f24402c3f68ce590a24a41a772cd8a5294ed8e0 100644 (file)
--- a/librpc/idl/srvsvc.idl
+++ b/librpc/idl/srvsvc.idl
@@ -727,7 +727,7 @@ import "security.idl", "svcctl.idl";
                uint32 numbigbufs;
                uint32 numfiletasks;
                uint32 alertsched;
-               uint32 eroralert;
+               uint32 erroralert;
                uint32 logonalert;
                uint32 accessalert;
                uint32 diskalert;

diff --git a/source3/librpc/gen_ndr/ndr_srvsvc.c b/source3/librpc/gen_ndr/ndr_srvsvc.c
index 6017202133ef1d7e45a6693ab2a66e3646800dcf..9ac3aa82c9125c35e5b02389556192025b12a73d 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_srvsvc.c
+++ b/source3/librpc/gen_ndr/ndr_srvsvc.c
@@ -6920,7 +6920,7 @@ static enum ndr_err_code ndr_push_srvsvc_NetSrvInfo403(struct ndr_push *ndr, int
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->numbigbufs));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->numfiletasks));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->alertsched));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->eroralert));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->erroralert));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->logonalert));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->accessalert));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->diskalert));
@@ -7006,7 +7006,7 @@ static enum ndr_err_code ndr_pull_srvsvc_NetSrvInfo403(struct ndr_pull *ndr, int
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->numbigbufs));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->numfiletasks));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->alertsched));
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->eroralert));
+               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->erroralert));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->logonalert));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->accessalert));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->diskalert));
@@ -7118,7 +7118,7 @@ _PUBLIC_ void ndr_print_srvsvc_NetSrvInfo403(struct ndr_print *ndr, const char *
        ndr_print_uint32(ndr, "numbigbufs", r->numbigbufs);
        ndr_print_uint32(ndr, "numfiletasks", r->numfiletasks);
        ndr_print_uint32(ndr, "alertsched", r->alertsched);
-       ndr_print_uint32(ndr, "eroralert", r->eroralert);
+       ndr_print_uint32(ndr, "erroralert", r->erroralert);
        ndr_print_uint32(ndr, "logonalert", r->logonalert);
        ndr_print_uint32(ndr, "accessalert", r->accessalert);
        ndr_print_uint32(ndr, "diskalert", r->diskalert);

diff --git a/source3/librpc/gen_ndr/srvsvc.h b/source3/librpc/gen_ndr/srvsvc.h
index 9125d0ae707555d0bcb9bb42b31c7676c42d076c..b50213bb966c38794d881a9982f57d91113ff1c2 100644 (file)
--- a/source3/librpc/gen_ndr/srvsvc.h
+++ b/source3/librpc/gen_ndr/srvsvc.h
@@ -517,7 +517,7 @@ struct srvsvc_NetSrvInfo403 {
        uint32_t numbigbufs;
        uint32_t numfiletasks;
        uint32_t alertsched;
-       uint32_t eroralert;
+       uint32_t erroralert;
        uint32_t logonalert;
        uint32_t accessalert;
        uint32_t diskalert;