From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 19 Dec 2023 22:08:57 +0000 (+1300)
Subject: s4-auth/kerberos: Rename create_keytab() to smb_krb5_fill_keytab()
X-Git-Tag: tdb-1.4.11~1468
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=6b3ce044d2d426d3e90d63744ef81c5e96eeb67b;p=thirdparty%2Fsamba.git

s4-auth/kerberos: Rename create_keytab() to smb_krb5_fill_keytab()

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

diff --git a/source4/auth/kerberos/srv_keytab.c b/source4/auth/kerberos/srv_keytab.c
index 7b28c37a5c6..024fab54729 100644
--- a/source4/auth/kerberos/srv_keytab.c
+++ b/source4/auth/kerberos/srv_keytab.c
@@ -114,18 +114,22 @@ static krb5_error_code keytab_add_keys(TALLOC_CTX *parent_ctx,
 	return 0;
 }
 
-static krb5_error_code create_keytab(TALLOC_CTX *parent_ctx,
-				     const char *saltPrincipal,
-				     int kvno,
-				     const char *new_secret,
-				     const char *old_secret,
-				     uint32_t supp_enctypes,
-				     uint32_t num_principals,
-				     krb5_principal *principals,
-				     krb5_context context,
-				     krb5_keytab keytab,
-				     bool add_old,
-				     const char **perror_string)
+/*
+ * This is the inner part of smb_krb5_update_keytab on an open keytab
+ * and without the deletion
+ */
+static krb5_error_code smb_krb5_fill_keytab(TALLOC_CTX *parent_ctx,
+					    const char *saltPrincipal,
+					    int kvno,
+					    const char *new_secret,
+					    const char *old_secret,
+					    uint32_t supp_enctypes,
+					    uint32_t num_principals,
+					    krb5_principal *principals,
+					    krb5_context context,
+					    krb5_keytab keytab,
+					    bool add_old,
+					    const char **perror_string)
 {
 	krb5_error_code ret;
 	krb5_principal salt_princ = NULL;
@@ -314,7 +318,7 @@ krb5_error_code smb_krb5_update_keytab(TALLOC_CTX *parent_ctx,
 			goto done;
 		}
 
-		ret = create_keytab(tmp_ctx,
+		ret = smb_krb5_fill_keytab(tmp_ctx,
 				    saltPrincipal,
 				    kvno, new_secret, old_secret,
 				    supp_enctypes,