CVE-2020-25719 mit-samba: Make ks_get_principal() internally public

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14561

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/kdc/mit-kdb/kdb_samba.h b/source4/kdc/mit-kdb/kdb_samba.h
index 8a29334bcea5e94057f544e92c61e3620881c170..d666216b0c1dd5cf905b47b8951aa9c55af077ee 100644 (file)
--- a/source4/kdc/mit-kdb/kdb_samba.h
+++ b/source4/kdc/mit-kdb/kdb_samba.h
@@ -41,6 +41,11 @@
 
 struct mit_samba_context *ks_get_context(krb5_context kcontext);
 
+krb5_error_code ks_get_principal(krb5_context context,
+                                krb5_const_principal principal,
+                                unsigned int kflags,
+                                krb5_db_entry **kentry);
+
 bool ks_data_eq_string(krb5_data d, const char *s);
 
 krb5_data ks_make_data(void *data, unsigned int len);

diff --git a/source4/kdc/mit-kdb/kdb_samba_principals.c b/source4/kdc/mit-kdb/kdb_samba_principals.c
index a8c99b025c9a0c6f9c5f5365faccdddc341d4f8a..b543600a360b1a7d03e72b31f093f230bfebd98b 100644 (file)
--- a/source4/kdc/mit-kdb/kdb_samba_principals.c
+++ b/source4/kdc/mit-kdb/kdb_samba_principals.c
@@ -36,10 +36,10 @@
 #define ADMIN_LIFETIME 60*60*3 /* 3 hours */
 #define CHANGEPW_LIFETIME 60*5 /* 5 minutes */
 
-static krb5_error_code ks_get_principal(krb5_context context,
-                                       krb5_const_principal principal,
-                                       unsigned int kflags,
-                                       krb5_db_entry **kentry)
+krb5_error_code ks_get_principal(krb5_context context,
+                                krb5_const_principal principal,
+                                unsigned int kflags,
+                                krb5_db_entry **kentry)
 {
        struct mit_samba_context *mit_ctx;
        krb5_error_code code;