s3-proto: move remaining krb5 protos to krb5_protos.h

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Tue May  3 15:38:40 CEST 2011 on sn-devel-104

diff --git a/source3/include/krb5_protos.h b/source3/include/krb5_protos.h
index d80e77d2eb6236a46f58f3116dc4d89d2adab9f7..c53588890c5a512742fe2c77b5d0a5cc83287024 100644 (file)
--- a/source3/include/krb5_protos.h
+++ b/source3/include/krb5_protos.h
@@ -131,3 +131,9 @@ int cli_krb5_get_ticket(TALLOC_CTX *mem_ctx,
                        time_t *tgs_expire,
                        const char *impersonate_princ_s);
 
                        time_t *tgs_expire,
                        const char *impersonate_princ_s);
 

+/* The following definitions come from libsmb/clikrb5.c  */
+
+bool unwrap_edata_ntstatus(TALLOC_CTX *mem_ctx,
+                          DATA_BLOB *edata,
+                          DATA_BLOB *edata_out);
+bool unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_pac_data);

diff --git a/source3/include/proto.h b/source3/include/proto.h
index e8ce418ab28c8b7edb5ea6a4dd53cac71bb3abe1..bb2c64b671a96e88599854355914ed954d739f11 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1620,13 +1620,6 @@ NTSTATUS cli_force_encryption(struct cli_state *c,
                        const char *password,
                        const char *domain);
 
                        const char *password,
                        const char *domain);
 

-/* The following definitions come from libsmb/clikrb5.c  */
-
-bool unwrap_edata_ntstatus(TALLOC_CTX *mem_ctx, 
-                          DATA_BLOB *edata, 
-                          DATA_BLOB *edata_out);
-bool unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_pac_data);
-

 /* The following definitions come from libsmb/clilist.c  */
 
 NTSTATUS cli_list_old(struct cli_state *cli,const char *Mask,uint16 attribute,
 /* The following definitions come from libsmb/clilist.c  */
 
 NTSTATUS cli_list_old(struct cli_state *cli,const char *Mask,uint16 attribute,