]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s4:kdc: Remove duplicate function signature
authorJoseph Sutton <josephsutton@catalyst.net.nz>
Fri, 18 Aug 2023 03:00:04 +0000 (15:00 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 14 Sep 2023 21:35:29 +0000 (21:35 +0000)
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
source4/kdc/pac-glue.c

index 05e9ed584bfdfa0fecdfdbf5d6cbac7d743432dd..f64260cc3b0bc731b3658878751ed91cb9c11af9 100644 (file)
@@ -353,13 +353,13 @@ NTSTATUS samba_get_cred_info_ndr_blob(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
-#ifdef SAMBA4_USES_HEIMDAL
 krb5_error_code samba_kdc_encrypt_pac_credentials(krb5_context context,
                                                  const krb5_keyblock *pkreplykey,
                                                  const DATA_BLOB *cred_ndr_blob,
                                                  TALLOC_CTX *mem_ctx,
                                                  DATA_BLOB *cred_info_blob)
 {
+#ifdef SAMBA4_USES_HEIMDAL
        krb5_crypto cred_crypto;
        krb5_enctype cred_enctype;
        krb5_data cred_ndr_crypt;
@@ -428,14 +428,7 @@ krb5_error_code samba_kdc_encrypt_pac_credentials(krb5_context context,
                      cred_info_blob->data, cred_info_blob->length);
 
        return 0;
-}
 #else /* SAMBA4_USES_HEIMDAL */
-krb5_error_code samba_kdc_encrypt_pac_credentials(krb5_context context,
-                                                 const krb5_keyblock *pkreplykey,
-                                                 const DATA_BLOB *cred_ndr_blob,
-                                                 TALLOC_CTX *mem_ctx,
-                                                 DATA_BLOB *cred_info_blob)
-{
        krb5_key cred_key;
        krb5_enctype cred_enctype;
        struct PAC_CREDENTIAL_INFO pac_cred_info = { .version = 0, };
@@ -526,8 +519,8 @@ krb5_error_code samba_kdc_encrypt_pac_credentials(krb5_context context,
                      cred_info_blob->data, cred_info_blob->length);
 
        return 0;
-}
 #endif /* SAMBA4_USES_HEIMDAL */
+}
 
 
 /**