krb5_wrap: Rename cli_krb5_get_ticket()
authorAndreas Schneider <asn@samba.org>
Fri, 26 Aug 2016 14:38:53 +0000 (16:38 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 31 Aug 2016 18:59:14 +0000 (20:59 +0200)
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
lib/krb5_wrap/krb5_samba.c
lib/krb5_wrap/krb5_samba.h
source3/libads/authdata.c

index e2a29dd..6cde81d 100644 (file)
@@ -3049,13 +3049,14 @@ cleanup_princ:
 /*
   get a kerberos5 ticket for the given service
 */
-int cli_krb5_get_ticket(TALLOC_CTX *mem_ctx,
-                       const char *principal, time_t time_offset,
-                       DATA_BLOB *ticket, DATA_BLOB *session_key_krb5,
-                       uint32_t extra_ap_opts, const char *ccname,
-                       time_t *tgs_expire,
-                       const char *impersonate_princ_s)
-
+int ads_krb5_cli_get_ticket(TALLOC_CTX *mem_ctx,
+                           const char *principal,
+                           time_t time_offset,
+                           DATA_BLOB *ticket,
+                           DATA_BLOB *session_key_krb5,
+                           uint32_t extra_ap_opts, const char *ccname,
+                           time_t *tgs_expire,
+                           const char *impersonate_princ_s)
 {
        krb5_error_code retval;
        krb5_data packet;
@@ -3128,13 +3129,15 @@ failed:
 }
 
 #else /* HAVE_KRB5 */
- /* this saves a few linking headaches */
- int cli_krb5_get_ticket(TALLOC_CTX *mem_ctx,
-                       const char *principal, time_t time_offset,
-                       DATA_BLOB *ticket, DATA_BLOB *session_key_krb5,
-                       uint32_t extra_ap_opts,
-                       const char *ccname, time_t *tgs_expire,
-                       const char *impersonate_princ_s)
+/* This saves a few linking headaches */
+int ads_krb5_cli_get_ticket(TALLOC_CTX *mem_ctx,
+                           const char *principal,
+                           time_t time_offset,
+                           DATA_BLOB *ticket,
+                           DATA_BLOB *session_key_krb5,
+                           uint32_t extra_ap_opts, const char *ccname,
+                           time_t *tgs_expire,
+                           const char *impersonate_princ_s)
 {
         DEBUG(0,("NO KERBEROS SUPPORT\n"));
         return 1;
index 7840631..92ad48d 100644 (file)
@@ -404,11 +404,13 @@ krb5_error_code smb_krb5_cc_copy_creds(krb5_context context,
 
 #endif /* HAVE_KRB5 */
 
-int cli_krb5_get_ticket(TALLOC_CTX *mem_ctx,
-                       const char *principal, time_t time_offset,
-                       DATA_BLOB *ticket, DATA_BLOB *session_key_krb5,
-                       uint32_t extra_ap_opts, const char *ccname,
-                       time_t *tgs_expire,
-                       const char *impersonate_princ_s);
+int ads_krb5_cli_get_ticket(TALLOC_CTX *mem_ctx,
+                           const char *principal,
+                           time_t time_offset,
+                           DATA_BLOB *ticket,
+                           DATA_BLOB *session_key_krb5,
+                           uint32_t extra_ap_opts, const char *ccname,
+                           time_t *tgs_expire,
+                           const char *impersonate_princ_s);
 
 #endif /* _KRB5_SAMBA_H */
index b4a1b84..f4f4b4f 100644 (file)
@@ -197,15 +197,15 @@ NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx,
                return NT_STATUS_INVALID_LOGON_TYPE;
        }
 
-       ret = cli_krb5_get_ticket(mem_ctx,
-                                 local_service,
-                                 time_offset,
-                                 &tkt,
-                                 &sesskey1,
-                                 0,
-                                 cc,
-                                 NULL,
-                                 impersonate_princ_s);
+       ret = ads_krb5_cli_get_ticket(mem_ctx,
+                                     local_service,
+                                     time_offset,
+                                     &tkt,
+                                     &sesskey1,
+                                     0,
+                                     cc,
+                                     NULL,
+                                     impersonate_princ_s);
        if (ret) {
                DEBUG(1,("failed to get ticket for %s: %s\n",
                        local_service, error_message(ret)));