svn commit: samba r3495 - branches/SAMBA_3_0/source/include branches/SAMBA_3_0/source/libads trunk/source/include trunk/source/libads

[gd at samba.org]

Author: gd
Date: 2004-11-03 00:29:09 +0000 (Wed, 03 Nov 2004)
New Revision: 3495

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3495

Log:
Fix the build (recent kerberos-changes).

Guenther

Modified:
   branches/SAMBA_3_0/source/include/includes.h
   branches/SAMBA_3_0/source/libads/kerberos.c
   branches/SAMBA_3_0/source/libads/kerberos_verify.c
   trunk/source/include/includes.h
   trunk/source/libads/kerberos.c
   trunk/source/libads/kerberos_verify.c


Changeset:
Modified: branches/SAMBA_3_0/source/include/includes.h
===================================================================
--- branches/SAMBA_3_0/source/include/includes.h	2004-11-03 00:17:12 UTC (rev 3494)
+++ branches/SAMBA_3_0/source/include/includes.h	2004-11-03 00:29:09 UTC (rev 3495)
@@ -1349,7 +1349,9 @@
 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);
 #endif /* HAVE_KRB5 */
 
 

Modified: branches/SAMBA_3_0/source/libads/kerberos.c
===================================================================
--- branches/SAMBA_3_0/source/libads/kerberos.c	2004-11-03 00:17:12 UTC (rev 3494)
+++ branches/SAMBA_3_0/source/libads/kerberos.c	2004-11-03 00:29:09 UTC (rev 3495)
@@ -635,7 +635,7 @@
  Wrapper function for the above.
  ************************************************************************/
 
-void kerberos_derive_salting_principal(char *service_principal)
+BOOL kerberos_derive_salting_principal(char *service_principal)
 {
 	krb5_context context = NULL;
 	krb5_enctype *enctypes = NULL;
@@ -646,7 +646,7 @@
 	if ((ret = krb5_init_context(&context)) != 0) {
 		DEBUG(1,("kerberos_derive_cifs_salting_principals: krb5_init_context failed. %s\n",
 			error_message(ret)));
-		return;
+		return False;
 	}
 	if ((ret = get_kerberos_allowed_etypes(context, &enctypes)) != 0) {
 		DEBUG(1,("kerberos_derive_cifs_salting_principals: get_kerberos_allowed_etypes failed. %s\n",
@@ -672,6 +672,8 @@
 	if (context) {
 		krb5_free_context(context);
 	}
+
+	return ret ? False : True;
 }
 
 /************************************************************************

Modified: branches/SAMBA_3_0/source/libads/kerberos_verify.c
===================================================================
--- branches/SAMBA_3_0/source/libads/kerberos_verify.c	2004-11-03 00:17:12 UTC (rev 3494)
+++ branches/SAMBA_3_0/source/libads/kerberos_verify.c	2004-11-03 00:29:09 UTC (rev 3495)
@@ -231,7 +231,6 @@
 	char *host_princ_s = NULL;
 	BOOL got_replay_mutex = False;
 
-	fstring myname;
 	BOOL auth_ok = False;
 
 	ZERO_STRUCT(packet);

Modified: trunk/source/include/includes.h
===================================================================
--- trunk/source/include/includes.h	2004-11-03 00:17:12 UTC (rev 3494)
+++ trunk/source/include/includes.h	2004-11-03 00:29:09 UTC (rev 3495)
@@ -1356,7 +1356,9 @@
 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);
 #endif /* HAVE_KRB5 */
 
 

Modified: trunk/source/libads/kerberos.c
===================================================================
--- trunk/source/libads/kerberos.c	2004-11-03 00:17:12 UTC (rev 3494)
+++ trunk/source/libads/kerberos.c	2004-11-03 00:29:09 UTC (rev 3495)
@@ -635,7 +635,7 @@
  Wrapper function for the above.
  ************************************************************************/
 
-void kerberos_derive_salting_principal(char *service_principal)
+BOOL kerberos_derive_salting_principal(char *service_principal)
 {
 	krb5_context context = NULL;
 	krb5_enctype *enctypes = NULL;
@@ -646,7 +646,7 @@
 	if ((ret = krb5_init_context(&context)) != 0) {
 		DEBUG(1,("kerberos_derive_cifs_salting_principals: krb5_init_context failed. %s\n",
 			error_message(ret)));
-		return;
+		return False;
 	}
 	if ((ret = get_kerberos_allowed_etypes(context, &enctypes)) != 0) {
 		DEBUG(1,("kerberos_derive_cifs_salting_principals: get_kerberos_allowed_etypes failed. %s\n",
@@ -672,6 +672,8 @@
 	if (context) {
 		krb5_free_context(context);
 	}
+
+	return ret ? False : True;
 }
 
 /************************************************************************

Modified: trunk/source/libads/kerberos_verify.c
===================================================================
--- trunk/source/libads/kerberos_verify.c	2004-11-03 00:17:12 UTC (rev 3494)
+++ trunk/source/libads/kerberos_verify.c	2004-11-03 00:29:09 UTC (rev 3495)
@@ -239,7 +239,6 @@
 	char *host_princ_s = NULL;
 	BOOL got_replay_mutex = False;
 
-	fstring myname;
 	BOOL auth_ok = False;
 
 	ZERO_STRUCT(packet);