s4:kdc: Make some parameters const

As these parameters are not assigned to, make them const.

Const specifiers for non-pointer types, such as in 'const
krb5_principal', don't do anything in function declarations. Remove
them.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index a9a5fbb99f3cc3c7e17f78af19aa227df723c5cb..cb36408bc811ab5da4972034abe40211c4085644 100644 (file)
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -686,7 +686,7 @@ krb5_error_code samba_make_krb5_pac(krb5_context context,
        return ret;
 }
 
-bool samba_princ_needs_pac(struct samba_kdc_entry *skdc_entry)
+bool samba_princ_needs_pac(const struct samba_kdc_entry *skdc_entry)
 {
 
        uint32_t userAccountControl;
@@ -701,7 +701,7 @@ bool samba_princ_needs_pac(struct samba_kdc_entry *skdc_entry)
 }
 
 int samba_client_requested_pac(krb5_context context,
-                              const krb5_pac *pac,
+                              const krb5_const_pac pac,
                               TALLOC_CTX *mem_ctx,
                               bool *requested_pac)
 {
@@ -713,7 +713,7 @@ int samba_client_requested_pac(krb5_context context,
 
        *requested_pac = true;
 
-       ret = krb5_pac_get_buffer(context, *pac, PAC_TYPE_ATTRIBUTES_INFO,
+       ret = krb5_pac_get_buffer(context, pac, PAC_TYPE_ATTRIBUTES_INFO,
                                  &k5pac_attrs_in);
        if (ret != 0) {
                return ret == ENOENT ? 0 : ret;
@@ -1104,7 +1104,7 @@ NTSTATUS samba_kdc_update_pac_blob(TALLOC_CTX *mem_ctx,
 
 NTSTATUS samba_kdc_update_delegation_info_blob(TALLOC_CTX *mem_ctx,
                                krb5_context context,
-                               const krb5_pac pac,
+                               const krb5_const_pac pac,
                                const krb5_principal server_principal,
                                const krb5_principal proxy_principal,
                                DATA_BLOB *new_blob)
@@ -1485,11 +1485,11 @@ krb5_error_code samba_kdc_update_pac(TALLOC_CTX *mem_ctx,
                                     uint32_t flags,
                                     struct samba_kdc_entry *client,
                                     const krb5_principal server_principal,
-                                    struct samba_kdc_entry *server,
-                                    struct samba_kdc_entry *krbtgt,
+                                    const struct samba_kdc_entry *server,
+                                    const struct samba_kdc_entry *krbtgt,
                                     const krb5_principal delegated_proxy_principal,
                                     const krb5_pac old_pac,
-                                    krb5_pac new_pac)
+                                    const krb5_pac new_pac)
 {
        krb5_error_code code = EINVAL;
        NTSTATUS nt_status;
@@ -1877,7 +1877,7 @@ krb5_error_code samba_kdc_update_pac(TALLOC_CTX *mem_ctx,
                bool requested_pac = false;
 
                code = samba_client_requested_pac(context,
-                                                 &old_pac,
+                                                 old_pac,
                                                  mem_ctx,
                                                  &requested_pac);
                if (code != 0 || !requested_pac) {

diff --git a/source4/kdc/pac-glue.h b/source4/kdc/pac-glue.h
index ab3683f64e16cf1c57b329b00a9c44dd1b46dd04..c797a389c209d92da8585f22d10ee80573911959 100644 (file)
--- a/source4/kdc/pac-glue.h
+++ b/source4/kdc/pac-glue.h
@@ -55,10 +55,10 @@ krb5_error_code samba_make_krb5_pac(krb5_context context,
                                    const DATA_BLOB *device_claims_blob,
                                    krb5_pac pac);
 
-bool samba_princ_needs_pac(struct samba_kdc_entry *skdc_entry);
+bool samba_princ_needs_pac(const struct samba_kdc_entry *skdc_entry);
 
 int samba_client_requested_pac(krb5_context context,
-                              const krb5_pac *pac,
+                              krb5_const_pac pac,
                               TALLOC_CTX *mem_ctx,
                               bool *requested_pac);
 
@@ -91,9 +91,9 @@ NTSTATUS samba_kdc_update_pac_blob(TALLOC_CTX *mem_ctx,
 
 NTSTATUS samba_kdc_update_delegation_info_blob(TALLOC_CTX *mem_ctx,
                                krb5_context context,
-                               const krb5_pac pac,
-                               const krb5_principal server_principal,
-                               const krb5_principal proxy_principal,
+                               krb5_const_pac pac,
+                               krb5_principal server_principal,
+                               krb5_principal proxy_principal,
                                DATA_BLOB *pac_blob);
 
 krb5_error_code samba_kdc_map_policy_err(NTSTATUS nt_status);
@@ -106,7 +106,7 @@ NTSTATUS samba_kdc_check_client_access(struct samba_kdc_entry *kdc_entry,
 krb5_error_code samba_kdc_validate_pac_blob(
                krb5_context context,
                const struct samba_kdc_entry *client_skdc_entry,
-               const krb5_const_pac pac);
+               krb5_const_pac pac);
 
 /*
  * In the RODC case, to confirm that the returned user is permitted to
@@ -122,9 +122,9 @@ krb5_error_code samba_kdc_update_pac(TALLOC_CTX *mem_ctx,
                                     struct ldb_context *samdb,
                                     uint32_t flags,
                                     struct samba_kdc_entry *client,
-                                    const krb5_principal server_principal,
-                                    struct samba_kdc_entry *server,
-                                    struct samba_kdc_entry *krbtgt,
-                                    const krb5_principal delegated_proxy_principal,
-                                    const krb5_pac old_pac,
+                                    krb5_principal server_principal,
+                                    const struct samba_kdc_entry *server,
+                                    const struct samba_kdc_entry *krbtgt,
+                                    krb5_principal delegated_proxy_principal,
+                                    krb5_pac old_pac,
                                     krb5_pac new_pac);

diff --git a/source4/kdc/wdc-samba4.c b/source4/kdc/wdc-samba4.c
index 08b69c1bf894693be6628c792d748b14f365dc82..57ba99403e52ea5ba6c2544d1cbc8dfe1c62eac9 100644 (file)
--- a/source4/kdc/wdc-samba4.c
+++ b/source4/kdc/wdc-samba4.c
@@ -226,8 +226,8 @@ static krb5_error_code samba_wdc_get_pac(void *priv,
 
 static krb5_error_code samba_wdc_reget_pac2(astgs_request_t r,
                                            const krb5_principal delegated_proxy_principal,
-                                           hdb_entry *client,
-                                           hdb_entry *server,
+                                           const hdb_entry *client,
+                                           const hdb_entry *server,
                                            hdb_entry *krbtgt,
                                            krb5_pac *pac,
                                            krb5_cksumtype ctype,