git.samba.org / idra / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d822b96)
r19664: fix compiler warnings...
authorStefan Metzmacher <metze@samba.org>
Sat, 11 Nov 2006 15:11:21 +0000 (15:11 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 19:25:27 +0000 (14:25 -0500)
should _krb5_find_type_in_ad() also take a const?

metze
(This used to be commit addc31bd9309cb2b41cbb548c82c80de1cf96c4f)

source4/auth/kerberos/kerberos.h patch | blob | history
source4/auth/kerberos/kerberos_pac.c patch | blob | history
source4/kdc/pac-glue.c patch | blob | history
source4/kdc/pac-glue.h patch | blob | history

diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h
index b82dd3f75a12baf991b3555ead5008979352778c..ca2833f1610af51b6623c168acbf8c5e43606e81 100644 (file)
--- a/source4/auth/kerberos/kerberos.h
+++ b/source4/auth/kerberos/kerberos.h
@@ -124,8 +124,8 @@ NTSTATUS kerberos_decode_pac(TALLOC_CTX *mem_ctx,
                             struct PAC_DATA **pac_data_out,
                             DATA_BLOB blob,
                             krb5_context context,
-                            krb5_keyblock *krbtgt_keyblock,
-                            krb5_keyblock *service_keyblock,
+                            const krb5_keyblock *krbtgt_keyblock,
+                            const krb5_keyblock *service_keyblock,
                             krb5_const_principal client_principal,
                             time_t tgs_authtime,
                             krb5_error_code *k5ret);
@@ -133,22 +133,22 @@ NTSTATUS kerberos_decode_pac(TALLOC_CTX *mem_ctx,
                                  struct PAC_LOGON_INFO **logon_info,
                                  DATA_BLOB blob,
                                  krb5_context context,
-                                 krb5_keyblock *krbtgt_keyblock,
-                                 krb5_keyblock *service_keyblock,
+                                 const krb5_keyblock *krbtgt_keyblock,
+                                 const krb5_keyblock *service_keyblock,
                                  krb5_const_principal client_principal,
                                  time_t tgs_authtime, 
                                  krb5_error_code *k5ret);
  krb5_error_code kerberos_encode_pac(TALLOC_CTX *mem_ctx,
                                    struct PAC_DATA *pac_data,
                                    krb5_context context,
-                                   krb5_keyblock *krbtgt_keyblock,
-                                   krb5_keyblock *service_keyblock,
-                                    DATA_BLOB *pac) ;
+                                   const krb5_keyblock *krbtgt_keyblock,
+                                   const krb5_keyblock *service_keyblock,
+                                   DATA_BLOB *pac);
  krb5_error_code kerberos_create_pac(TALLOC_CTX *mem_ctx,
                                     struct auth_serversupplied_info *server_info,
                                     krb5_context context,
-                                    krb5_keyblock *krbtgt_keyblock,
-                                    krb5_keyblock *service_keyblock,
+                                    const krb5_keyblock *krbtgt_keyblock,
+                                    const krb5_keyblock *service_keyblock,
                                     krb5_principal client_principal,
                                     time_t tgs_authtime,
                                     DATA_BLOB *pac);
diff --git a/source4/auth/kerberos/kerberos_pac.c b/source4/auth/kerberos/kerberos_pac.c
index 8e1801f745c1ec648fb8531da7f81206ae9f34a4..f3af0e1b6d5e6bc457bad31e828f9e2f2e204264 100644 (file)
--- a/source4/auth/kerberos/kerberos_pac.c
+++ b/source4/auth/kerberos/kerberos_pac.c
@@ -35,7 +35,7 @@ static krb5_error_code check_pac_checksum(TALLOC_CTX *mem_ctx,
                                          DATA_BLOB pac_data,
                                          struct PAC_SIGNATURE_DATA *sig,
                                          krb5_context context,
-                                         krb5_keyblock *keyblock)
+                                         const krb5_keyblock *keyblock)
 {
        krb5_error_code ret;
        krb5_crypto crypto;
@@ -69,8 +69,8 @@ static krb5_error_code check_pac_checksum(TALLOC_CTX *mem_ctx,
                              struct PAC_DATA **pac_data_out,
                              DATA_BLOB blob,
                              krb5_context context,
-                             krb5_keyblock *krbtgt_keyblock,
-                             krb5_keyblock *service_keyblock,
+                             const krb5_keyblock *krbtgt_keyblock,
+                             const krb5_keyblock *service_keyblock,
                              krb5_const_principal client_principal,
                              time_t tgs_authtime,
                              krb5_error_code *k5ret)
@@ -317,8 +317,8 @@ _PUBLIC_  NTSTATUS kerberos_pac_logon_info(TALLOC_CTX *mem_ctx,
                                  struct PAC_LOGON_INFO **logon_info,
                                  DATA_BLOB blob,
                                  krb5_context context,
-                                 krb5_keyblock *krbtgt_keyblock,
-                                 krb5_keyblock *service_keyblock,
+                                 const krb5_keyblock *krbtgt_keyblock,
+                                 const krb5_keyblock *service_keyblock,
                                  krb5_const_principal client_principal,
                                  time_t tgs_authtime, 
                                  krb5_error_code *k5ret)
@@ -355,7 +355,7 @@ static krb5_error_code make_pac_checksum(TALLOC_CTX *mem_ctx,
                                         DATA_BLOB *pac_data,
                                         struct PAC_SIGNATURE_DATA *sig,
                                         krb5_context context,
-                                        krb5_keyblock *keyblock)
+                                        const krb5_keyblock *keyblock)
 {
        krb5_error_code ret;
        krb5_crypto crypto;
@@ -399,8 +399,8 @@ static krb5_error_code make_pac_checksum(TALLOC_CTX *mem_ctx,
  krb5_error_code kerberos_encode_pac(TALLOC_CTX *mem_ctx,
                                    struct PAC_DATA *pac_data,
                                    krb5_context context,
-                                   krb5_keyblock *krbtgt_keyblock,
-                                   krb5_keyblock *service_keyblock,
+                                   const krb5_keyblock *krbtgt_keyblock,
+                                   const krb5_keyblock *service_keyblock,
                                    DATA_BLOB *pac) 
 {
        NTSTATUS nt_status;
@@ -496,8 +496,8 @@ static krb5_error_code make_pac_checksum(TALLOC_CTX *mem_ctx,
  krb5_error_code kerberos_create_pac(TALLOC_CTX *mem_ctx,
                                     struct auth_serversupplied_info *server_info,
                                     krb5_context context,
-                                    krb5_keyblock *krbtgt_keyblock,
-                                    krb5_keyblock *service_keyblock,
+                                    const krb5_keyblock *krbtgt_keyblock,
+                                    const krb5_keyblock *service_keyblock,
                                     krb5_principal client_principal,
                                     time_t tgs_authtime,
                                     DATA_BLOB *pac)
diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index 143690ff0d479bcf8b315194700473a1071fd885..da920c5fd6ca5ac7861e5e3aac4b9a15a43e4552 100644 (file)
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -38,8 +38,8 @@ struct _krb5_krb_auth_data;
 static krb5_error_code samba_get_pac(krb5_context context, 
                                     struct hdb_ldb_private *private,
                                     krb5_principal client, 
-                                    krb5_keyblock *krbtgt_keyblock, 
-                                    krb5_keyblock *server_keyblock, 
+                                    const krb5_keyblock *krbtgt_keyblock, 
+                                    const krb5_keyblock *server_keyblock, 
                                     time_t tgs_authtime,
                                     krb5_data *pac)
 {
@@ -150,11 +150,11 @@ static krb5_error_code wrap_pac(krb5_context context, krb5_data *pac, Authorizat
 */
 
 krb5_error_code hdb_ldb_authz_data_as_req(krb5_context context, struct hdb_entry_ex *entry_ex, 
-                                          METHOD_DATA* pa_data_seq,
-                                          time_t authtime,
-                                          EncryptionKey *tgtkey,
-                                          EncryptionKey *sessionkey,
-                                          AuthorizationData **out)
+                                         METHOD_DATA* pa_data_seq,
+                                         time_t authtime,
+                                         const EncryptionKey *tgtkey,
+                                         const EncryptionKey *sessionkey,
+                                         AuthorizationData **out)
 {
        krb5_error_code ret;
        int i;
@@ -210,13 +210,13 @@ krb5_error_code hdb_ldb_authz_data_as_req(krb5_context context, struct hdb_entry
 /* Resign (and reform, including possibly new groups) a PAC */
 
 krb5_error_code hdb_ldb_authz_data_tgs_req(krb5_context context, struct hdb_entry_ex *entry_ex, 
-                                           krb5_principal client, 
-                                           AuthorizationData *in, 
-                                           time_t authtime,
-                                           EncryptionKey *tgtkey,
-                                           EncryptionKey *servicekey,
-                                           EncryptionKey *sessionkey,
-                                           AuthorizationData **out)
+                                          krb5_principal client, 
+                                          AuthorizationData *in, 
+                                          time_t authtime,
+                                          const EncryptionKey *tgtkey,
+                                          const EncryptionKey *servicekey,
+                                          const EncryptionKey *sessionkey,
+                                          AuthorizationData **out)
 {
        NTSTATUS nt_status;
        krb5_error_code ret;
diff --git a/source4/kdc/pac-glue.h b/source4/kdc/pac-glue.h
index e5b1960209ee44e6e4a63ca6de3aa80a751f0e63..1cda3e4d555f24b75bdeed840f6b7bc6b3379e62 100644 (file)
--- a/source4/kdc/pac-glue.h
+++ b/source4/kdc/pac-glue.h
@@ -31,17 +31,17 @@
  krb5_error_code hdb_ldb_authz_data_as_req(krb5_context context, struct hdb_entry_ex *entry_ex, 
                                           METHOD_DATA* pa_data_seq,
                                           time_t authtime,
-                                          EncryptionKey *tgtkey,
-                                          EncryptionKey *sessionkey,
+                                          const EncryptionKey *tgtkey,
+                                          const EncryptionKey *sessionkey,
                                           AuthorizationData **out);
 
  krb5_error_code hdb_ldb_authz_data_tgs_req(krb5_context context, struct hdb_entry_ex *entry_ex, 
                                            krb5_principal client, 
                                            AuthorizationData *in, 
                                            time_t authtime,
-                                           EncryptionKey *tgtkey,
-                                           EncryptionKey *servicekey,
-                                           EncryptionKey *sessionkey,
+                                           const EncryptionKey *tgtkey,
+                                           const EncryptionKey *servicekey,
+                                           const EncryptionKey *sessionkey,
                                            AuthorizationData **out);
  krb5_error_code hdb_ldb_check_client_access(krb5_context context, hdb_entry_ex *entry_ex, 
                                             HostAddresses *addresses);
Work In Progress