svn commit: samba r3439 - branches/SAMBA_3_0/source/libads branches/SAMBA_3_0/source/libsmb trunk/source/libads trunk/source/libsmb

[gd at samba.org]

Author: gd
Date: 2004-11-01 19:35:55 +0000 (Mon, 01 Nov 2004)
New Revision: 3439

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

Log:
Finally fix build for platforms without kerberos.

Guenther

Modified:
   branches/SAMBA_3_0/source/libads/kerberos.c
   branches/SAMBA_3_0/source/libsmb/clikrb5.c
   trunk/source/libads/kerberos.c
   trunk/source/libsmb/clikrb5.c


Changeset:
Modified: branches/SAMBA_3_0/source/libads/kerberos.c
===================================================================
--- branches/SAMBA_3_0/source/libads/kerberos.c	2004-11-01 18:44:15 UTC (rev 3438)
+++ branches/SAMBA_3_0/source/libads/kerberos.c	2004-11-01 19:35:55 UTC (rev 3439)
@@ -247,7 +247,7 @@
  Setting principal to NULL deletes this entry.
  ************************************************************************/
 
-BOOL kerberos_secrets_store_salting_principal(const char *service,
+ BOOL kerberos_secrets_store_salting_principal(const char *service,
 					      int enctype,
 					      const char *principal)
 {
@@ -602,7 +602,7 @@
  Go through all the possible enctypes for this principal.
  ************************************************************************/
 
-void kerberos_derive_salting_principal(krb5_context context,
+ void kerberos_derive_salting_principal(krb5_context context,
 					krb5_ccache ccache,
 					krb5_enctype *enctypes,
 					char *service_principal)

Modified: branches/SAMBA_3_0/source/libsmb/clikrb5.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/clikrb5.c	2004-11-01 18:44:15 UTC (rev 3438)
+++ branches/SAMBA_3_0/source/libsmb/clikrb5.c	2004-11-01 19:35:55 UTC (rev 3439)
@@ -123,7 +123,7 @@
 #error UNKNOWN_CREATE_KEY_FUNCTIONS
 #endif
 
-int create_kerberos_key_from_string(krb5_context context,
+ int create_kerberos_key_from_string(krb5_context context,
 					krb5_principal host_princ,
 					krb5_data *password,
 					krb5_keyblock *key,
@@ -272,7 +272,7 @@
 }
 #endif
 
-void kerberos_free_data_contents(krb5_context context, krb5_data *pdata)
+ void kerberos_free_data_contents(krb5_context context, krb5_data *pdata)
 {
 #if defined(HAVE_KRB5_FREE_DATA_CONTENTS)
 	if (pdata->data) {
@@ -283,7 +283,7 @@
 #endif
 }
 
-void kerberos_set_creds_enctype(krb5_creds *pcreds, int enctype)
+ void kerberos_set_creds_enctype(krb5_creds *pcreds, int enctype)
 {
 #if defined(HAVE_KRB5_KEYBLOCK_IN_CREDS)
 	KRB5_KEY_TYPE((&pcreds->keyblock)) = enctype;
@@ -294,7 +294,7 @@
 #endif
 }
 
-BOOL kerberos_compatible_enctypes(krb5_context context,
+ BOOL kerberos_compatible_enctypes(krb5_context context,
 				  krb5_enctype enctype1,
 				  krb5_enctype enctype2)
 {

Modified: trunk/source/libads/kerberos.c
===================================================================
--- trunk/source/libads/kerberos.c	2004-11-01 18:44:15 UTC (rev 3438)
+++ trunk/source/libads/kerberos.c	2004-11-01 19:35:55 UTC (rev 3439)
@@ -247,7 +247,7 @@
  Setting principal to NULL deletes this entry.
  ************************************************************************/
 
-BOOL kerberos_secrets_store_salting_principal(const char *service,
+ BOOL kerberos_secrets_store_salting_principal(const char *service,
 					      int enctype,
 					      const char *principal)
 {
@@ -602,7 +602,7 @@
  Go through all the possible enctypes for this principal.
  ************************************************************************/
 
-void kerberos_derive_salting_principal(krb5_context context,
+ void kerberos_derive_salting_principal(krb5_context context,
 					krb5_ccache ccache,
 					krb5_enctype *enctypes,
 					char *service_principal)

Modified: trunk/source/libsmb/clikrb5.c
===================================================================
--- trunk/source/libsmb/clikrb5.c	2004-11-01 18:44:15 UTC (rev 3438)
+++ trunk/source/libsmb/clikrb5.c	2004-11-01 19:35:55 UTC (rev 3439)
@@ -123,7 +123,7 @@
 #error UNKNOWN_CREATE_KEY_FUNCTIONS
 #endif
 
-int create_kerberos_key_from_string(krb5_context context,
+ int create_kerberos_key_from_string(krb5_context context,
 					krb5_principal host_princ,
 					krb5_data *password,
 					krb5_keyblock *key,
@@ -272,7 +272,7 @@
 }
 #endif
 
-void kerberos_free_data_contents(krb5_context context, krb5_data *pdata)
+ void kerberos_free_data_contents(krb5_context context, krb5_data *pdata)
 {
 #if defined(HAVE_KRB5_FREE_DATA_CONTENTS)
 	if (pdata->data) {
@@ -283,7 +283,7 @@
 #endif
 }
 
-void kerberos_set_creds_enctype(krb5_creds *pcreds, int enctype)
+ void kerberos_set_creds_enctype(krb5_creds *pcreds, int enctype)
 {
 #if defined(HAVE_KRB5_KEYBLOCK_IN_CREDS)
 	KRB5_KEY_TYPE((&pcreds->keyblock)) = enctype;
@@ -294,7 +294,7 @@
 #endif
 }
 
-BOOL kerberos_compatible_enctypes(krb5_context context,
+ BOOL kerberos_compatible_enctypes(krb5_context context,
 				  krb5_enctype enctype1,
 				  krb5_enctype enctype2)
 {