[SCM] Samba Shared Repository - branch v3-3-test updated

Karolin Seeger kseeger at samba.org
Wed Dec 2 01:19:29 MST 2009


The branch, v3-3-test has been updated
       via  0a16584... s3-kerberos: fix the build on Mac OS X 10.6.2.
       via  9acd239... s3-kerberos: add a missing reference to authdata headers.
       via  9329564... s3-kerberos: do not include authdata headers before including krb5 headers.
       via  6026236... s3-kerberos: only use krb5 headers where required.
       via  a6572bb... s3-kerberos: Fix Bug #6929: build with recent heimdal.
       via  d89231e... s3-kerberos: next step to resolve Bug #6929: build with recent heimdal.
       via  e559256... s3-kerberos: add check for prerequisite krb5/krb5.h header while checking for krb5/locate_plugin.h.
       via  dff3d01... nsswitch: fix compile of winbind_krb5_locator with recent Heimdal versions.
       via  1d5af51... cifs.upcall: 2nd part of fix for Bug #6868: support building with Heimdal we well as with MIT.
       via  3aaec6a... s3-build: really fix build of winbind_krb5_locator.
       via  087c41e... nsswitch: fix the build of the winbind krb5 locator plugin.
       via  cca1f7a... cifs.upcall: Fix Bug #6868: support building with Heimdal we well as with MIT.
       via  bddafc6... s3-kerberos: add smb_krb5_principal_get_realm().
       via  6664d01... s3-kerberos: fix some build warnings when building against heimdal.
       via  ce1bea7... kerberos: fix some heimdal build warnings.
      from  dc3d1f2... s3: Fix shadow copy display on Windows 7

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 0a165844459eb0e04fa14a33f338c80669e3a92c
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 27 20:08:44 2009 +0100

    s3-kerberos: fix the build on Mac OS X 10.6.2.
    
    Guenther
    (cherry picked from commit 51328a7056918bc75a7c1c442f47cf0271075542)

commit 9acd2394edf2504df23d0ce93f4bafc88c83323b
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 27 18:51:56 2009 +0100

    s3-kerberos: add a missing reference to authdata headers.
    
    Guenther
    (cherry picked from commit da79cbb0800dd647be864e8bbb5fe1132708174b)

commit 9329564e44a1432251acb7f0afaf1bd04b8cb957
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 27 18:30:18 2009 +0100

    s3-kerberos: do not include authdata headers before including krb5 headers.
    
    Guenther

commit 60262369fc2ae19f6d9263e35b5db9b09b603a1b
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 27 15:52:57 2009 +0100

    s3-kerberos: only use krb5 headers where required.
    
    This seems to be the only way to deal with mixed heimdal/MIT setups during
    merged build.
    
    Guenther

commit a6572bb03fcd323ce03b22ccd713181235f3b0e6
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 27 01:06:36 2009 +0100

    s3-kerberos: Fix Bug #6929: build with recent heimdal.
    
    Heimdal changed the KRB5_DEPRECATED define (which now may not take an identifier
    for activation) in new releases (like 1.3.1).
    
    Guenther
    (cherry picked from commit 1a8f8382740e352a83133b8c49aaedd4716210cd)

commit d89231e76c618c5d10244ed4bec68dac8fa9cb3c
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 26 10:15:45 2009 +0100

    s3-kerberos: next step to resolve Bug #6929: build with recent heimdal.
    
    Based on patch from Allan <allan at archlinux.org>.
    
    Also should fix the FreeBSD build on the buildfarm.
    
    Guenther
    (cherry picked from commit 5b3a32be97a37c119e837bdee8f049684565458c)

commit e5592560bb8f90446bd8cbe8019663cbf00e22ab
Author: Günther Deschner <gd at samba.org>
Date:   Wed Nov 25 21:33:48 2009 +0100

    s3-kerberos: add check for prerequisite krb5/krb5.h header while checking for krb5/locate_plugin.h.
    
    (Needed for new Heimdal versions).
    
    Guenther
    (cherry picked from commit c438b2b3923db66672ec82e795eef543de5fcb8a)

commit dff3d01119c91fbdac613508c64f3f8fc0b8a413
Author: Günther Deschner <gd at samba.org>
Date:   Wed Nov 25 15:21:54 2009 +0100

    nsswitch: fix compile of winbind_krb5_locator with recent Heimdal versions.
    
    Guenther
    (cherry picked from commit 51864219cc12ceb66c281355f3e1191d5e32842d)

commit 1d5af511dd6f88d211b6c63b1e2d9d7ec97b03ad
Author: Günther Deschner <gd at samba.org>
Date:   Wed Nov 25 15:06:19 2009 +0100

    cifs.upcall: 2nd part of fix for Bug #6868: support building with Heimdal we well as with MIT.
    
    Guenther
    (cherry picked from commit 660ee2e74523194e5f6b2b6428d76628beb74717)

commit 3aaec6a346a88b732e66796514bc21e47c23e850
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 19 13:44:33 2009 +0100

    s3-build: really fix build of winbind_krb5_locator.
    
    Guenther
    (cherry picked from commit fc9f199f2619635f73e8ee7f3b5359521d63f325)

commit 087c41e390b8be513016ca29a96d1702b0d03587
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 21 02:44:44 2009 +0200

    nsswitch: fix the build of the winbind krb5 locator plugin.
    
    Guenther
    (cherry picked from commit b9d9353b548d9b2ab684aa171f511174e6414762)

commit cca1f7a80317e09208a9e56ff2744b113e0dfbc5
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 12 00:52:38 2009 +0100

    cifs.upcall: Fix Bug #6868: support building with Heimdal we well as with MIT.
    
    Guenther
    (cherry picked from commit b29eed492f1c056adb0b53510be10e738276ca11)

commit bddafc6de8e37e014d7f074b6107dda6f76ebdc5
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 12 00:51:46 2009 +0100

    s3-kerberos: add smb_krb5_principal_get_realm().
    
    Guenther

commit 6664d015c986946c509f4f8d3524f84fb2f34ff1
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 6 10:25:53 2009 +0100

    s3-kerberos: fix some build warnings when building against heimdal.
    
    Guenther

commit ce1bea7d692dcf09faafa0941c15313d0d75a9c8
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 9 11:05:42 2008 +0200

    kerberos: fix some heimdal build warnings.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/Makefile.in                     |    2 +-
 source/client/cifs.upcall.c            |   37 ++++----
 source/configure.in                    |   23 +++++-
 source/include/ads.h                   |   59 -------------
 source/include/includes.h              |  138 +------------------------------
 source/include/krb5_protos.h           |  146 ++++++++++++++++++++++++++++++++
 source/include/smb_krb5.h              |   78 +++++++++++++++++
 source/libads/ads_status.c             |    1 +
 source/libads/authdata.c               |    3 +
 source/libads/kerberos.c               |    5 +-
 source/libads/kerberos_keytab.c        |    1 +
 source/libads/kerberos_verify.c        |    1 +
 source/libads/krb5_errs.c              |    1 +
 source/libads/krb5_setpw.c             |    9 +-
 source/libnet/libnet_keytab.h          |    2 +
 source/libsmb/cliconnect.c             |    1 +
 source/libsmb/clikrb5.c                |   30 ++++++-
 source/nsswitch/winbind_krb5_locator.c |    5 +
 source/rpc_client/cli_pipe.c           |    1 +
 source/utils/ntlm_auth.c               |    1 +
 source/winbindd/winbindd_cred_cache.c  |    2 +
 source/winbindd/winbindd_pam.c         |    2 +
 22 files changed, 323 insertions(+), 225 deletions(-)
 create mode 100644 source/include/krb5_protos.h
 create mode 100644 source/include/smb_krb5.h


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index 474bc1e..8b364e3 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -2207,7 +2207,7 @@ bin/vlp at EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
 
 bin/winbind_krb5_locator. at SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) @LIBWBCLIENT_SHARED@
 	@echo "Linking $@"
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(WINBIND_LIBS) \
+	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(WINBIND_LIBS) $(KRB5LIBS) \
 		@SONAMEFLAG@`basename $@`
 
 bin/pam_winbind. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) @LIBTALLOC_SHARED@ @LIBWBCLIENT_SHARED@
diff --git a/source/client/cifs.upcall.c b/source/client/cifs.upcall.c
index 71e60c6..7bc370c 100644
--- a/source/client/cifs.upcall.c
+++ b/source/client/cifs.upcall.c
@@ -26,6 +26,7 @@ create dns_resolver * * /usr/local/sbin/cifs.upcall %k
 */
 
 #include "includes.h"
+#include "smb_krb5.h"
 #include <keyutils.h>
 #include <getopt.h>
 
@@ -44,18 +45,6 @@ typedef enum _sectype {
 	MS_KRB5
 } sectype_t;
 
-static inline int
-k5_data_equal(krb5_data d1, krb5_data d2, unsigned int length)
-{
-	if (!length)
-		length = d1.length;
-
-	return (d1.length == length &&
-		d1.length == d2.length &&
-		memcmp(d1.data, d2.data, length) == 0);
-
-}
-
 /* does the ccache have a valid TGT? */
 static time_t
 get_tgt_time(const char *ccname) {
@@ -64,9 +53,8 @@ get_tgt_time(const char *ccname) {
 	krb5_cc_cursor cur;
 	krb5_creds creds;
 	krb5_principal principal;
-	krb5_data tgt = { .data =	"krbtgt",
-			  .length =	6 };
 	time_t credtime = 0;
+	char *realm = NULL;
 
 	if (krb5_init_context(&context)) {
 		syslog(LOG_DEBUG, "%s: unable to init krb5 context", __func__);
@@ -93,20 +81,33 @@ get_tgt_time(const char *ccname) {
 		goto err_ccstart;
 	}
 
+	if ((realm = smb_krb5_principal_get_realm(context, principal)) == NULL) {
+		syslog(LOG_DEBUG, "%s: unable to get realm", __func__);
+		goto err_ccstart;
+	}
+
 	while (!credtime && !krb5_cc_next_cred(context, ccache, &cur, &creds)) {
-		if (k5_data_equal(creds.server->realm, principal->realm, 0) &&
-		    k5_data_equal(creds.server->data[0], tgt, tgt.length) &&
-		    k5_data_equal(creds.server->data[1], principal->realm, 0) &&
+		char *name;
+		if (smb_krb5_unparse_name(context, creds.server, &name)) {
+			syslog(LOG_DEBUG, "%s: unable to unparse name", __func__);
+			goto err_endseq;
+		}
+		if (krb5_realm_compare(context, creds.server, principal) &&
+		    strnequal(name, KRB5_TGS_NAME, KRB5_TGS_NAME_SIZE) &&
+		    strnequal(name+KRB5_TGS_NAME_SIZE+1, realm, strlen(realm)) &&
 		    creds.times.endtime > time(NULL))
 			credtime = creds.times.endtime;
                 krb5_free_cred_contents(context, &creds);
+		SAFE_FREE(name);
         }
+err_endseq:
         krb5_cc_end_seq_get(context, ccache, &cur);
-
 err_ccstart:
 	krb5_free_principal(context, principal);
 err_princ:
+#if defined(KRB5_TC_OPENCLOSE)
 	krb5_cc_set_flags(context, ccache, KRB5_TC_OPENCLOSE);
+#endif
 	krb5_cc_close(context, ccache);
 err_cache:
 	krb5_free_context(context);
diff --git a/source/configure.in b/source/configure.in
index cf46405..650a38f 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -3540,11 +3540,32 @@ if test x"$with_ads_support" != x"no"; then
     CPPFLAGS=$ac_save_CPPFLAGS
     LDFLAGS=$ac_save_LDFLAGS
   fi
-  AC_CHECK_HEADERS(krb5/locate_plugin.h)
+  AC_CHECK_HEADERS([krb5/locate_plugin.h], [], [],
+[[#ifdef HAVE_KRB5_H
+ #include <krb5.h>
+ #endif
+]])
+
   if test x"$ac_cv_header_krb5_locate_plugin_h" = x"yes"; then
 	WINBIND_KRB5_LOCATOR="bin/winbind_krb5_locator.$SHLIBEXT"
 	EXTRA_ALL_TARGETS="$EXTRA_ALL_TARGETS $WINBIND_KRB5_LOCATOR"
   fi
+
+  # check for new heimdal KRB5_DEPRECATED handling
+
+  AC_CACHE_CHECK([for KRB5_DEPRECATED define taking an identifier],
+                samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER,[
+    AC_TRY_COMPILE(
+      [#define KRB5_DEPRECATED 1
+      #include <krb5.h>],
+      [],
+      samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER=yes,
+      samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER=no)])
+
+  if test x"$samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER" = x"yes"; then
+    AC_DEFINE(HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER, 1,
+	       [Whether to use deprecated krb5 interfaces])
+  fi
 fi
 
 # Now we have determined whether we really want ADS support
diff --git a/source/include/ads.h b/source/include/ads.h
index abff9ea..ba3db90 100644
--- a/source/include/ads.h
+++ b/source/include/ads.h
@@ -339,68 +339,9 @@ typedef void **ADS_MODLIST;
 /* Kerberos environment variable names */
 #define KRB5_ENV_CCNAME "KRB5CCNAME"
 
-/* Heimdal uses a slightly different name */
-#if defined(HAVE_ENCTYPE_ARCFOUR_HMAC_MD5)
-#define ENCTYPE_ARCFOUR_HMAC ENCTYPE_ARCFOUR_HMAC_MD5
-#endif
-
-/* The older versions of heimdal that don't have this
-   define don't seem to use it anyway.  I'm told they
-   always use a subkey */
-#ifndef HAVE_AP_OPTS_USE_SUBKEY
-#define AP_OPTS_USE_SUBKEY 0
-#endif
-
 #define WELL_KNOWN_GUID_COMPUTERS	"AA312825768811D1ADED00C04FD8D5CD" 
 #define WELL_KNOWN_GUID_USERS		"A9D1CA15768811D1ADED00C04FD8D5CD"
 
-#ifndef KRB5_ADDR_NETBIOS
-#define KRB5_ADDR_NETBIOS 0x14
-#endif
-
-#ifndef KRB5KRB_ERR_RESPONSE_TOO_BIG
-#define KRB5KRB_ERR_RESPONSE_TOO_BIG (-1765328332L)
-#endif
-
-#ifdef HAVE_KRB5
-typedef struct {
-	NTSTATUS ntstatus;
-	uint32 unknown1;
-	uint32 unknown2; /* 0x00000001 */
-} KRB5_EDATA_NTSTATUS;
-
-typedef struct {
-#if defined(HAVE_MAGIC_IN_KRB5_ADDRESS) && defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS) /* MIT */
-	krb5_address **addrs;
-#elif defined(HAVE_KRB5_ADDRESSES) /* Heimdal */
-	krb5_addresses *addrs;
-#else
-#error UNKNOWN_KRB5_ADDRESS_TYPE
-#endif /* defined(HAVE_MAGIC_IN_KRB5_ADDRESS) && defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS) */
-} smb_krb5_addresses;
-
-#ifdef HAVE_KRB5_KEYBLOCK_KEYVALUE /* Heimdal */
-#define KRB5_KEY_TYPE(k)	((k)->keytype)
-#define KRB5_KEY_LENGTH(k)	((k)->keyvalue.length)
-#define KRB5_KEY_DATA(k)	((k)->keyvalue.data)
-#define KRB5_KEY_DATA_CAST	void
-#else /* MIT */
-#define KRB5_KEY_TYPE(k)	((k)->enctype)
-#define KRB5_KEY_LENGTH(k)	((k)->length)
-#define KRB5_KEY_DATA(k)	((k)->contents)
-#define KRB5_KEY_DATA_CAST	krb5_octet
-#endif /* HAVE_KRB5_KEYBLOCK_KEYVALUE */
-
-#ifdef HAVE_KRB5_KEYTAB_ENTRY_KEY               /* MIT */
-#define KRB5_KT_KEY(k)		(&(k)->key)
-#elif HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK          /* Heimdal */
-#define KRB5_KT_KEY(k)		(&(k)->keyblock)
-#else
-#error krb5_keytab_entry has no key or keyblock member
-#endif /* HAVE_KRB5_KEYTAB_ENTRY_KEY */
-
-#endif /* HAVE_KRB5 */
-
 enum ads_extended_dn_flags {
 	ADS_EXTENDED_DN_HEX_STRING	= 0,
 	ADS_EXTENDED_DN_STRING		= 1 /* not supported on win2k */
diff --git a/source/include/includes.h b/source/include/includes.h
index baf22e8..bf38d99 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -20,11 +20,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/* work around broken krb5.h on sles9 */
-#ifdef SIZEOF_LONG
-#undef SIZEOF_LONG
-#endif
-
 #include "lib/replace/replace.h"
 
 /* make sure we have included the correct config.h */
@@ -163,9 +158,7 @@
 #endif
 #endif /* HAVE_NETGROUP */
 
-#if HAVE_KRB5_H
-#include <krb5.h>
-#else
+#ifndef HAVE_KRB5_H
 #undef HAVE_KRB5
 #endif
 
@@ -686,7 +679,6 @@ typedef char fstring[FSTRING_LEN];
 #include "passdb.h"
 #include "rpc_secdes.h"
 #include "gpo.h"
-#include "authdata.h"
 #include "msdfs.h"
 #include "rap.h"
 #include "md5.h"
@@ -1144,134 +1136,6 @@ char *talloc_asprintf_strupper_m(TALLOC_CTX *t, const char *fmt, ...) PRINTF_ATT
 #define XATTR_REPLACE 0x2       /* set value, fail if attr does not exist */
 #endif
 
-#if defined(HAVE_KRB5)
-
-krb5_error_code smb_krb5_parse_name(krb5_context context,
-				const char *name, /* in unix charset */
-                                krb5_principal *principal);
-
-krb5_error_code smb_krb5_unparse_name(krb5_context context,
-				krb5_const_principal principal,
-				char **unix_name);
-
-#ifndef HAVE_KRB5_SET_REAL_TIME
-krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_t microseconds);
-#endif
-
-krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype *enc);
-
-#if defined(HAVE_KRB5_AUTH_CON_SETKEY) && !defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY)
-krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context, krb5_auth_context auth_context, krb5_keyblock *keyblock);
-#endif
-
-#ifndef HAVE_KRB5_FREE_UNPARSED_NAME
-void krb5_free_unparsed_name(krb5_context ctx, char *val);
-#endif
-
-/* Stub out initialize_krb5_error_table since it is not present in all
- * Kerberos implementations. If it's not present, it's not necessary to
- * call it.
- */
-#ifndef HAVE_INITIALIZE_KRB5_ERROR_TABLE
-#define initialize_krb5_error_table()
-#endif
-
-/* Samba wrapper function for krb5 functionality. */
-bool setup_kaddr( krb5_address *pkaddr, struct sockaddr_storage *paddr);
-int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype, bool no_salt);
-bool get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, krb5_ticket *tkt);
-krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt);
-krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters);
-#if defined(HAVE_KRB5_LOCATE_KDC)
-krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters);
-#endif
-krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes);
-bool get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, DATA_BLOB *session_key, bool remote);
-krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry *kt_entry);
-krb5_principal kerberos_fetch_salt_princ_for_host_princ(krb5_context context, krb5_principal host_princ, int enctype);
-void kerberos_set_creds_enctype(krb5_creds *pcreds, int enctype);
-bool kerberos_compatible_enctypes(krb5_context context, krb5_enctype enctype1, krb5_enctype enctype2);
-void kerberos_free_data_contents(krb5_context context, krb5_data *pdata);
-NTSTATUS decode_pac_data(TALLOC_CTX *mem_ctx,
-			 DATA_BLOB *pac_data_blob,
-			 krb5_context context,
-			 krb5_keyblock *service_keyblock,
-			 krb5_const_principal client_principal,
-			 time_t tgs_authtime,
-			 struct PAC_DATA **pac_data_out);
-void smb_krb5_checksum_from_pac_sig(krb5_checksum *cksum, 
-				    struct PAC_SIGNATURE_DATA *sig);
-krb5_error_code smb_krb5_verify_checksum(krb5_context context,
-					 const krb5_keyblock *keyblock,
-					 krb5_keyusage usage,
-					 krb5_checksum *cksum,
-					 uint8 *data,
-					 size_t length);
-time_t get_authtime_from_tkt(krb5_ticket *tkt);
-void smb_krb5_free_ap_req(krb5_context context, 
-			  krb5_ap_req *ap_req);
-krb5_error_code smb_krb5_get_keyinfo_from_ap_req(krb5_context context, 
-						 const krb5_data *inbuf, 
-						 krb5_kvno *kvno, 
-						 krb5_enctype *enctype);
-krb5_error_code krb5_rd_req_return_keyblock_from_keytab(krb5_context context,
-							krb5_auth_context *auth_context,
-							const krb5_data *inbuf,
-							krb5_const_principal server,
-							krb5_keytab keytab,
-							krb5_flags *ap_req_options,
-							krb5_ticket **ticket, 
-							krb5_keyblock **keyblock);
-krb5_error_code smb_krb5_parse_name_norealm(krb5_context context, 
-					    const char *name, 
-					    krb5_principal *principal);
-bool smb_krb5_principal_compare_any_realm(krb5_context context, 
-					  krb5_const_principal princ1, 
-					  krb5_const_principal princ2);
-int cli_krb5_get_ticket(const char *principal, time_t time_offset, 
-			DATA_BLOB *ticket, DATA_BLOB *session_key_krb5, uint32 extra_ap_opts, const char *ccname, time_t *tgs_expire);
-krb5_error_code smb_krb5_renew_ticket(const char *ccache_string, const char *client_string, const char *service_string, time_t *expire_time);
-krb5_error_code kpasswd_err_to_krb5_err(krb5_error_code res_code);
-krb5_error_code smb_krb5_gen_netbios_krb5_address(smb_krb5_addresses **kerb_addr);
-krb5_error_code smb_krb5_free_addresses(krb5_context context, smb_krb5_addresses *addr);
-NTSTATUS krb5_to_nt_status(krb5_error_code kerberos_error);
-krb5_error_code nt_status_to_krb5(NTSTATUS nt_status);
-void smb_krb5_free_error(krb5_context context, krb5_error *krberror);
-krb5_error_code handle_krberror_packet(krb5_context context,
-                                         krb5_data *packet);
-
-void smb_krb5_get_init_creds_opt_free(krb5_context context,
-				    krb5_get_init_creds_opt *opt);
-krb5_error_code smb_krb5_get_init_creds_opt_alloc(krb5_context context,
-				    krb5_get_init_creds_opt **opt);
-krb5_error_code smb_krb5_mk_error(krb5_context context,
-					krb5_error_code error_code,
-					const krb5_principal server,
-					krb5_data *reply);
-krb5_enctype smb_get_enctype_from_kt_entry(krb5_keytab_entry *kt_entry);
-krb5_error_code smb_krb5_enctype_to_string(krb5_context context, 
- 					    krb5_enctype enctype, 
-					    char **etype_s);
-krb5_error_code smb_krb5_open_keytab(krb5_context context, 
- 				      const char *keytab_name, 
-				      bool write_access, 
-				      krb5_keytab *keytab);
-krb5_error_code smb_krb5_keytab_name(TALLOC_CTX *mem_ctx,
-				     krb5_context context,
-				     krb5_keytab keytab,
-				     const char **keytab_name);
-int smb_krb5_kt_add_entry_ext(krb5_context context,
-			      krb5_keytab keytab,
-			      krb5_kvno kvno,
-			      const char *princ_s,
-			      krb5_enctype *enctypes,
-			      krb5_data password,
-			      bool no_salt,
-			      bool keep_old_entries);
-
-#endif /* HAVE_KRB5 */
-
-
 #ifdef HAVE_LDAP
 
 /* function declarations not included in proto.h */
diff --git a/source/include/krb5_protos.h b/source/include/krb5_protos.h
new file mode 100644
index 0000000..ef5c667
--- /dev/null
+++ b/source/include/krb5_protos.h
@@ -0,0 +1,146 @@
+/* work around broken krb5.h on sles9 */
+#ifdef SIZEOF_LONG
+#undef SIZEOF_LONG
+#endif
+
+
+#if defined(HAVE_KRB5)
+krb5_error_code smb_krb5_parse_name(krb5_context context,
+				const char *name, /* in unix charset */
+                                krb5_principal *principal);
+
+krb5_error_code smb_krb5_unparse_name(krb5_context context,
+				      krb5_const_principal principal,
+				      char **unix_name);
+
+#ifndef HAVE_KRB5_SET_REAL_TIME
+krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_t microseconds);
+#endif
+
+krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype *enc);
+
+#if defined(HAVE_KRB5_AUTH_CON_SETKEY) && !defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY)
+krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context, krb5_auth_context auth_context, krb5_keyblock *keyblock);
+#endif
+
+#ifndef HAVE_KRB5_FREE_UNPARSED_NAME
+void krb5_free_unparsed_name(krb5_context ctx, char *val);
+#endif
+
+/* Stub out initialize_krb5_error_table since it is not present in all
+ * Kerberos implementations. If it's not present, it's not necessary to
+ * call it.
+ */
+#ifndef HAVE_INITIALIZE_KRB5_ERROR_TABLE
+#define initialize_krb5_error_table()
+#endif
+
+/* Samba wrapper function for krb5 functionality. */
+bool setup_kaddr( krb5_address *pkaddr, struct sockaddr_storage *paddr);
+int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype, bool no_salt);
+bool get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, krb5_ticket *tkt);
+krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt);
+krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters);
+#if defined(HAVE_KRB5_LOCATE_KDC)
+krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters);
+#endif
+krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes);
+bool get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, DATA_BLOB *session_key, bool remote);
+krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry *kt_entry);
+krb5_principal kerberos_fetch_salt_princ_for_host_princ(krb5_context context, krb5_principal host_princ, int enctype);
+void kerberos_set_creds_enctype(krb5_creds *pcreds, int enctype);
+bool kerberos_compatible_enctypes(krb5_context context, krb5_enctype enctype1, krb5_enctype enctype2);
+void kerberos_free_data_contents(krb5_context context, krb5_data *pdata);
+NTSTATUS decode_pac_data(TALLOC_CTX *mem_ctx,
+			 DATA_BLOB *pac_data_blob,
+			 krb5_context context,
+			 krb5_keyblock *service_keyblock,
+			 krb5_const_principal client_principal,
+			 time_t tgs_authtime,
+			 struct PAC_DATA **pac_data_out);
+void smb_krb5_checksum_from_pac_sig(krb5_checksum *cksum,
+				    struct PAC_SIGNATURE_DATA *sig);
+krb5_error_code smb_krb5_verify_checksum(krb5_context context,
+					 const krb5_keyblock *keyblock,
+					 krb5_keyusage usage,
+					 krb5_checksum *cksum,
+					 uint8 *data,
+					 size_t length);
+time_t get_authtime_from_tkt(krb5_ticket *tkt);
+void smb_krb5_free_ap_req(krb5_context context,
+			  krb5_ap_req *ap_req);
+krb5_error_code smb_krb5_get_keyinfo_from_ap_req(krb5_context context,
+						 const krb5_data *inbuf,
+						 krb5_kvno *kvno,
+						 krb5_enctype *enctype);
+krb5_error_code krb5_rd_req_return_keyblock_from_keytab(krb5_context context,
+							krb5_auth_context *auth_context,
+							const krb5_data *inbuf,
+							krb5_const_principal server,
+							krb5_keytab keytab,
+							krb5_flags *ap_req_options,
+							krb5_ticket **ticket,
+							krb5_keyblock **keyblock);
+krb5_error_code smb_krb5_parse_name_norealm(krb5_context context,
+					    const char *name,
+					    krb5_principal *principal);
+bool smb_krb5_principal_compare_any_realm(krb5_context context,
+					  krb5_const_principal princ1,
+					  krb5_const_principal princ2);
+int cli_krb5_get_ticket(const char *principal, time_t time_offset,
+			DATA_BLOB *ticket, DATA_BLOB *session_key_krb5,
+			uint32 extra_ap_opts, const char *ccname,
+			time_t *tgs_expire);
+krb5_error_code smb_krb5_renew_ticket(const char *ccache_string, const char *client_string, const char *service_string, time_t *expire_time);
+krb5_error_code kpasswd_err_to_krb5_err(krb5_error_code res_code);
+krb5_error_code smb_krb5_gen_netbios_krb5_address(smb_krb5_addresses **kerb_addr);
+krb5_error_code smb_krb5_free_addresses(krb5_context context, smb_krb5_addresses *addr);
+NTSTATUS krb5_to_nt_status(krb5_error_code kerberos_error);
+krb5_error_code nt_status_to_krb5(NTSTATUS nt_status);
+void smb_krb5_free_error(krb5_context context, krb5_error *krberror);
+krb5_error_code handle_krberror_packet(krb5_context context,
+                                         krb5_data *packet);
+
+void smb_krb5_get_init_creds_opt_free(krb5_context context,
+				    krb5_get_init_creds_opt *opt);
+krb5_error_code smb_krb5_get_init_creds_opt_alloc(krb5_context context,
+				    krb5_get_init_creds_opt **opt);
+krb5_error_code smb_krb5_mk_error(krb5_context context,
+					krb5_error_code error_code,
+					const krb5_principal server,
+					krb5_data *reply);
+krb5_enctype smb_get_enctype_from_kt_entry(krb5_keytab_entry *kt_entry);
+krb5_error_code smb_krb5_enctype_to_string(krb5_context context,
+					    krb5_enctype enctype,
+					    char **etype_s);
+krb5_error_code smb_krb5_open_keytab(krb5_context context,
+				      const char *keytab_name,
+				      bool write_access,
+				      krb5_keytab *keytab);
+krb5_error_code smb_krb5_keytab_name(TALLOC_CTX *mem_ctx,


-- 
Samba Shared Repository


More information about the samba-cvs mailing list