git.samba.org / metze / samba / wip.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6165f46)
werror: replace WERR_INVALID_PARAM with WERR_INVALID_PARAMETER in source4/rpc_server/
authorGünther Deschner <gd@samba.org>
Thu, 3 Dec 2015 14:24:27 +0000 (15:24 +0100)
committerJeremy Allison <jra@samba.org>
Tue, 27 Sep 2016 22:04:23 +0000 (00:04 +0200)
Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source4/rpc_server/backupkey/dcesrv_backupkey.c patch | blob | history
source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c patch | blob | history
source4/rpc_server/browser/dcesrv_browser.c patch | blob | history
source4/rpc_server/drsuapi/dcesrv_drsuapi.c patch | blob | history
source4/rpc_server/lsa/dcesrv_lsa.c patch | blob | history
source4/rpc_server/srvsvc/dcesrv_srvsvc.c patch | blob | history
source4/rpc_server/winreg/rpc_winreg.c patch | blob | history

diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey.c b/source4/rpc_server/backupkey/dcesrv_backupkey.c
index 119bc84557afe35348019703add13ffcf2ee1c96..444910bf4090fbb62447cba365c98834b07c5827 100644 (file)
--- a/source4/rpc_server/backupkey/dcesrv_backupkey.c
+++ b/source4/rpc_server/backupkey/dcesrv_backupkey.c
@@ -537,7 +537,7 @@ static WERROR bkrp_client_wrap_decrypt_data(struct dcesrv_call_state *dce_call,
        blob.length = r->in.data_in_len;
 
        if (r->in.data_in_len < 4 || r->in.data_in == NULL) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        /*
@@ -554,7 +554,7 @@ static WERROR bkrp_client_wrap_decrypt_data(struct dcesrv_call_state *dce_call,
        ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, &uncrypt_request,
                                       (ndr_pull_flags_fn_t)ndr_pull_bkrp_client_side_wrapped);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        if ((uncrypt_request.version != BACKUPKEY_CLIENT_WRAP_VERSION2)
@@ -871,7 +871,7 @@ static WERROR self_sign_cert(TALLOC_CTX *mem_ctx,
                        gnutls_strerror(rc),
                        error_string);
                gnutls_x509_crt_deinit(issuer_cert);
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        rc = gnutls_x509_crt_set_issuer_dn(issuer_cert, dn, &error_string);
@@ -880,7 +880,7 @@ static WERROR self_sign_cert(TALLOC_CTX *mem_ctx,
                        gnutls_strerror(rc),
                        error_string);
                gnutls_x509_crt_deinit(issuer_cert);
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        /* Get x509 privkey for subjectPublicKeyInfo */
@@ -889,7 +889,7 @@ static WERROR self_sign_cert(TALLOC_CTX *mem_ctx,
                DBG_ERR("gnutls_x509_privkey_init failed - %s\n",
                        gnutls_strerror(rc));
                gnutls_x509_crt_deinit(issuer_cert);
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        rc = gnutls_privkey_export_x509(issuer_privkey,
@@ -899,7 +899,7 @@ static WERROR self_sign_cert(TALLOC_CTX *mem_ctx,
                        gnutls_strerror(rc));
                gnutls_x509_privkey_deinit(x509_issuer_privkey);
                gnutls_x509_crt_deinit(issuer_cert);
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        /* Set subjectPublicKeyInfo */
@@ -909,7 +909,7 @@ static WERROR self_sign_cert(TALLOC_CTX *mem_ctx,
                DBG_ERR("gnutls_x509_crt_set_pubkey failed - %s\n",
                        gnutls_strerror(rc));
                gnutls_x509_crt_deinit(issuer_cert);
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        rc = gnutls_x509_crt_set_activation_time(issuer_cert, activation);
@@ -917,7 +917,7 @@ static WERROR self_sign_cert(TALLOC_CTX *mem_ctx,
                DBG_ERR("gnutls_x509_crt_set_activation_time failed - %s\n",
                        gnutls_strerror(rc));
                gnutls_x509_crt_deinit(issuer_cert);
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        rc = gnutls_x509_crt_set_expiration_time(issuer_cert, expiry);
@@ -925,7 +925,7 @@ static WERROR self_sign_cert(TALLOC_CTX *mem_ctx,
                DBG_ERR("gnutls_x509_crt_set_expiration_time failed - %s\n",
                        gnutls_strerror(rc));
                gnutls_x509_crt_deinit(issuer_cert);
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        rc = gnutls_x509_crt_set_version(issuer_cert, 3);
@@ -933,7 +933,7 @@ static WERROR self_sign_cert(TALLOC_CTX *mem_ctx,
                DBG_ERR("gnutls_x509_crt_set_version failed - %s\n",
                        gnutls_strerror(rc));
                gnutls_x509_crt_deinit(issuer_cert);
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        rc = gnutls_x509_crt_set_subject_unique_id(issuer_cert,
@@ -943,7 +943,7 @@ static WERROR self_sign_cert(TALLOC_CTX *mem_ctx,
                DBG_ERR("gnutls_x509_crt_set_subject_key_id failed - %s\n",
                        gnutls_strerror(rc));
                gnutls_x509_crt_deinit(issuer_cert);
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        rc = gnutls_x509_crt_set_issuer_unique_id(issuer_cert,
@@ -953,7 +953,7 @@ static WERROR self_sign_cert(TALLOC_CTX *mem_ctx,
                DBG_ERR("gnutls_x509_crt_set_issuer_unique_id failed - %s\n",
                        gnutls_strerror(rc));
                gnutls_x509_crt_deinit(issuer_cert);
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        rc = gnutls_x509_crt_set_serial(issuer_cert,
@@ -963,7 +963,7 @@ static WERROR self_sign_cert(TALLOC_CTX *mem_ctx,
                DBG_ERR("gnutls_x509_crt_set_serial failed - %s\n",
                        gnutls_strerror(rc));
                gnutls_x509_crt_deinit(issuer_cert);
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        rc = gnutls_x509_crt_privkey_sign(issuer_cert,
@@ -974,7 +974,7 @@ static WERROR self_sign_cert(TALLOC_CTX *mem_ctx,
        if (rc != GNUTLS_E_SUCCESS) {
                DBG_ERR("gnutls_x509_crt_privkey_sign failed - %s\n",
                        gnutls_strerror(rc));
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        *certificate = issuer_cert;
@@ -1406,17 +1406,17 @@ static WERROR bkrp_server_wrap_decrypt_data(struct dcesrv_call_state *dce_call,
        blob.length = r->in.data_in_len;
 
        if (r->in.data_in_len == 0 || r->in.data_in == NULL) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        ndr_err = ndr_pull_struct_blob_all(&blob, mem_ctx, &decrypt_request,
                                           (ndr_pull_flags_fn_t)ndr_pull_bkrp_server_side_wrapped);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        if (decrypt_request.magic != BACKUPKEY_SERVER_WRAP_VERSION) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        werr = bkrp_do_retrieve_server_wrap_key(mem_ctx, ldb_ctx, &server_key,
@@ -1459,7 +1459,7 @@ static WERROR bkrp_server_wrap_decrypt_data(struct dcesrv_call_state *dce_call,
        if (rc != GNUTLS_E_SUCCESS) {
                DBG_ERR("gnutls_cipher_init failed - %s\n",
                        gnutls_strerror(rc));
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
        rc = gnutls_cipher_encrypt2(cipher_hnd,
                                    encrypted_blob.data,
@@ -1470,17 +1470,17 @@ static WERROR bkrp_server_wrap_decrypt_data(struct dcesrv_call_state *dce_call,
        if (rc != GNUTLS_E_SUCCESS) {
                DBG_ERR("gnutls_cipher_encrypt2 failed - %s\n",
                        gnutls_strerror(rc));
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        ndr_err = ndr_pull_struct_blob_all(&encrypted_blob, mem_ctx, &rc4payload,
                                           (ndr_pull_flags_fn_t)ndr_pull_bkrp_rc4encryptedpayload);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        if (decrypt_request.payload_length != rc4payload.secret_data.length) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        dump_data_pw("r3: \n", rc4payload.r3, sizeof(rc4payload.r3));
@@ -1546,7 +1546,7 @@ static WERROR bkrp_generic_decrypt_data(struct dcesrv_call_state *dce_call, TALL
                                        struct bkrp_BackupKey *r, struct ldb_context *ldb_ctx)
 {
        if (r->in.data_in_len < 4 || r->in.data_in == NULL) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        if (IVAL(r->in.data_in, 0) == BACKUPKEY_SERVER_WRAP_VERSION) {
@@ -1592,7 +1592,7 @@ static WERROR bkrp_server_wrap_encrypt_data(struct dcesrv_call_state *dce_call,
        int rc;
 
        if (r->in.data_in_len == 0 || r->in.data_in == NULL) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        werr = bkrp_do_retrieve_default_server_wrap_key(mem_ctx,
@@ -1716,7 +1716,7 @@ static WERROR bkrp_server_wrap_encrypt_data(struct dcesrv_call_state *dce_call,
        if (rc != GNUTLS_E_SUCCESS) {
                DBG_ERR("gnutls_cipher_init failed - %s\n",
                        gnutls_strerror(rc));
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
        rc = gnutls_cipher_encrypt2(cipher_hnd,
                                    encrypted_blob.data,
@@ -1727,7 +1727,7 @@ static WERROR bkrp_server_wrap_encrypt_data(struct dcesrv_call_state *dce_call,
        if (rc != GNUTLS_E_SUCCESS) {
                DBG_ERR("gnutls_cipher_encrypt2 failed - %s\n",
                        gnutls_strerror(rc));
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        /* create server wrap structure */
@@ -1752,7 +1752,7 @@ static WERROR bkrp_server_wrap_encrypt_data(struct dcesrv_call_state *dce_call,
 static WERROR dcesrv_bkrp_BackupKey(struct dcesrv_call_state *dce_call,
                                    TALLOC_CTX *mem_ctx, struct bkrp_BackupKey *r)
 {
-       WERROR error = WERR_INVALID_PARAM;
+       WERROR error = WERR_INVALID_PARAMETER;
        struct ldb_context *ldb_ctx;
        bool is_rodc;
        const char *addr = "unknown";
@@ -1780,7 +1780,7 @@ static WERROR dcesrv_bkrp_BackupKey(struct dcesrv_call_state *dce_call,
 
        if (samdb_rodc(ldb_ctx, &is_rodc) != LDB_SUCCESS) {
                talloc_unlink(mem_ctx, ldb_ctx);
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        if (!is_rodc) {
diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c b/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c
index 00b06cd6cdbb45c02d05e2a80e7044e4334209ea..5985d52c99b2857f3f2cbe3c7107cd851c1200a7 100644 (file)
--- a/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c
+++ b/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c
@@ -601,7 +601,7 @@ static WERROR bkrp_client_wrap_decrypt_data(struct dcesrv_call_state *dce_call,
        blob.length = r->in.data_in_len;
 
        if (r->in.data_in_len < 4 || r->in.data_in == NULL) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        /*
@@ -618,7 +618,7 @@ static WERROR bkrp_client_wrap_decrypt_data(struct dcesrv_call_state *dce_call,
        ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, &uncrypt_request,
                                       (ndr_pull_flags_fn_t)ndr_pull_bkrp_client_side_wrapped);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        if ((uncrypt_request.version != BACKUPKEY_CLIENT_WRAP_VERSION2)
@@ -1514,17 +1514,17 @@ static WERROR bkrp_server_wrap_decrypt_data(struct dcesrv_call_state *dce_call,
        blob.length = r->in.data_in_len;
 
        if (r->in.data_in_len == 0 || r->in.data_in == NULL) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        ndr_err = ndr_pull_struct_blob_all(&blob, mem_ctx, &decrypt_request,
                                           (ndr_pull_flags_fn_t)ndr_pull_bkrp_server_side_wrapped);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        if (decrypt_request.magic != BACKUPKEY_SERVER_WRAP_VERSION) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        werr = bkrp_do_retrieve_server_wrap_key(mem_ctx, ldb_ctx, &server_key,
@@ -1558,11 +1558,11 @@ static WERROR bkrp_server_wrap_decrypt_data(struct dcesrv_call_state *dce_call,
        ndr_err = ndr_pull_struct_blob_all(&encrypted_blob, mem_ctx, &rc4payload,
                                           (ndr_pull_flags_fn_t)ndr_pull_bkrp_rc4encryptedpayload);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        if (decrypt_request.payload_length != rc4payload.secret_data.length) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        dump_data_pw("r3: \n", rc4payload.r3, sizeof(rc4payload.r3));
@@ -1622,7 +1622,7 @@ static WERROR bkrp_generic_decrypt_data(struct dcesrv_call_state *dce_call, TALL
                                        struct bkrp_BackupKey *r, struct ldb_context *ldb_ctx)
 {
        if (r->in.data_in_len < 4 || r->in.data_in == NULL) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        if (IVAL(r->in.data_in, 0) == BACKUPKEY_SERVER_WRAP_VERSION) {
@@ -1666,7 +1666,7 @@ static WERROR bkrp_server_wrap_encrypt_data(struct dcesrv_call_state *dce_call,
        struct GUID guid;
 
        if (r->in.data_in_len == 0 || r->in.data_in == NULL) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        werr = bkrp_do_retrieve_default_server_wrap_key(mem_ctx,
@@ -1794,7 +1794,7 @@ static WERROR bkrp_server_wrap_encrypt_data(struct dcesrv_call_state *dce_call,
 static WERROR dcesrv_bkrp_BackupKey(struct dcesrv_call_state *dce_call,
                                    TALLOC_CTX *mem_ctx, struct bkrp_BackupKey *r)
 {
-       WERROR error = WERR_INVALID_PARAM;
+       WERROR error = WERR_INVALID_PARAMETER;
        struct ldb_context *ldb_ctx;
        bool is_rodc;
        const char *addr = "unknown";
@@ -1820,7 +1820,7 @@ static WERROR dcesrv_bkrp_BackupKey(struct dcesrv_call_state *dce_call,
 
        if (samdb_rodc(ldb_ctx, &is_rodc) != LDB_SUCCESS) {
                talloc_unlink(mem_ctx, ldb_ctx);
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        if (!is_rodc) {
diff --git a/source4/rpc_server/browser/dcesrv_browser.c b/source4/rpc_server/browser/dcesrv_browser.c
index 1ce4652df70ad26b16e065ef05f2bb43dcd8dfb6..1b2fbe37ea13d362449421f9eb97203a8a948940 100644 (file)
--- a/source4/rpc_server/browser/dcesrv_browser.c
+++ b/source4/rpc_server/browser/dcesrv_browser.c
@@ -55,7 +55,7 @@ static WERROR dcesrv_BrowserrQueryOtherDomains(struct dcesrv_call_state *dce_cal
        switch (r->in.info->level) {
        case 100:
                if (!r->in.info->info.info100) {
-                       return WERR_INVALID_PARAM;
+                       return WERR_INVALID_PARAMETER;
                }
 
                ctr100 = talloc(mem_ctx, struct BrowserrSrvInfo100Ctr);
diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
index 16a611aa6c5a3824ac2e12bf1601f9db362fd171..efa338d82d58c23dc98067fba31be3bef1a12a03 100644 (file)
--- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
+++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
@@ -972,7 +972,7 @@ static WERROR dcesrv_drsuapi_DsExecuteKCC(struct dcesrv_call_state *dce_call, TA
                return status;
        }
        if (r->in.req->ctr1.taskID != 0) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
        if (r->in.req->ctr1.flags & DRSUAPI_DS_EXECUTE_KCC_ASYNCHRONOUS_OPERATION) {
                timeout = IRPC_CALL_TIMEOUT;
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index 41311ed87cf2b67c9e61216c9aadbedfd0348d39..c7a2c407a58e629c113c683c5d550e647fcd5a40 100644 (file)
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -529,7 +529,7 @@ static WERROR dcesrv_dssetup_DsRoleGetPrimaryDomainInformation(struct dcesrv_cal
                return WERR_OK;
        }
        default:
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 }
 
diff --git a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
index 71b62bf2d0a485d6bf17e6cb49ffe1b522fd526e..104948c640176a5edbec250acc1ce0bc08f4b37e 100644 (file)
--- a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
+++ b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
@@ -441,7 +441,7 @@ static WERROR dcesrv_srvsvc_NetShareAdd(struct dcesrv_call_state *dce_call, TALL
                        info[i].value = talloc_strdup(info, "IPC");
                        break;
                default:
-                       return WERR_INVALID_PARAM;
+                       return WERR_INVALID_PARAMETER;
                }
                W_ERROR_HAVE_NO_MEMORY(info[i].value);
                i++;
@@ -539,7 +539,7 @@ static WERROR dcesrv_srvsvc_NetShareAdd(struct dcesrv_call_state *dce_call, TALL
                        info[i].value = talloc_strdup(info, "IPC");
                        break;
                default:
-                       return WERR_INVALID_PARAM;
+                       return WERR_INVALID_PARAMETER;
                }
                W_ERROR_HAVE_NO_MEMORY(info[i].value);
                i++;
@@ -947,7 +947,7 @@ static WERROR dcesrv_srvsvc_NetShareGetInfo(struct dcesrv_call_state *dce_call,
         */
 
        if (strcmp("", r->in.share_name) == 0) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        nterr = share_get_context_by_name(mem_ctx, lpcfg_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
@@ -1142,7 +1142,7 @@ static WERROR dcesrv_srvsvc_fill_share_info(struct share_info *info, int *count,
                        info[i].value = talloc_strdup(info, "IPC");
                        break;
                default:
-                       return WERR_INVALID_PARAM;
+                       return WERR_INVALID_PARAMETER;
                }
                W_ERROR_HAVE_NO_MEMORY(info[i].value);
                i++;
@@ -1197,7 +1197,7 @@ static WERROR dcesrv_srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call,
        W_ERROR_HAVE_NO_MEMORY(info);
 
        if (strcmp("", r->in.share_name) == 0) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        nterr = share_get_context_by_name(mem_ctx, lpcfg_share_backend(dce_call->conn->dce_ctx->lp_ctx), dce_call->event_ctx, dce_call->conn->dce_ctx->lp_ctx, &sctx);
@@ -1753,7 +1753,7 @@ static WERROR dcesrv_srvsvc_NetNameValidate(struct dcesrv_call_state *dce_call,
        case 13:
                return WERR_NOT_SUPPORTED;
        default:
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 }
 
diff --git a/source4/rpc_server/winreg/rpc_winreg.c b/source4/rpc_server/winreg/rpc_winreg.c
index dfc1d2133b85e153324d21c5b68fc52023a5b8ee..6cbd1a321abf06d011de2aafb45970408acf42e4 100644 (file)
--- a/source4/rpc_server/winreg/rpc_winreg.c
+++ b/source4/rpc_server/winreg/rpc_winreg.c
@@ -139,12 +139,12 @@ static WERROR dcesrv_winreg_CreateKey(struct dcesrv_call_state *dce_call,
                        sdblob.data = r->in.secdesc->sd.data;
                        sdblob.length = r->in.secdesc->sd.len;
                        if (sdblob.data == NULL) {
-                               return WERR_INVALID_PARAM;
+                               return WERR_INVALID_PARAMETER;
                        }
                        ndr_err = ndr_pull_struct_blob_all(&sdblob, mem_ctx, &sd,
                                                           (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
                        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-                               return WERR_INVALID_PARAM;
+                               return WERR_INVALID_PARAMETER;
                        }
                }
                
@@ -512,7 +512,7 @@ static WERROR dcesrv_winreg_QueryValue(struct dcesrv_call_state *dce_call,
        case SECURITY_USER:
                if ((r->in.type == NULL) || (r->in.data_length == NULL) ||
                    (r->in.data_size == NULL)) {
-                       return WERR_INVALID_PARAM;
+                       return WERR_INVALID_PARAMETER;
                }
 
                result = reg_key_get_value_by_name(mem_ctx, key, 
Work in progress branches