[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1304-gf14737e

[Andrew Bartlett]

The branch, v4-0-test has been updated
       via  f14737e4d2040d2f401a3b20c5e78d0d793cfc3a (commit)
      from  218ec98a1694080748d1ac12baa90ffcda364833 (commit)

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


- Log -----------------------------------------------------------------
commit f14737e4d2040d2f401a3b20c5e78d0d793cfc3a
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Mar 17 15:22:52 2008 +1100

    Don't require users of credentials.h to have krb5.h and gssapi.h
    
    Rather than require users of Samba4's headers to have krb5-devel
    installed (presumably in their system paths), don't expose the minor
    functions which require this by default.
    
    Andrew Bartlett

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

Summary of changes:
 source/auth/credentials/credentials.h      |    5 ++++-
 source/auth/credentials/credentials_krb5.c |    8 ++++----
 source/auth/credentials/credentials_krb5.h |   14 ++++++++++++--
 source/auth/kerberos/kerberos_util.c       |    8 ++++----
 4 files changed, 24 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/auth/credentials/credentials.h b/source/auth/credentials/credentials.h
index a3da5c6..1b205c6 100644
--- a/source/auth/credentials/credentials.h
+++ b/source/auth/credentials/credentials.h
@@ -128,7 +128,10 @@ struct cli_credentials {
 
 struct ldb_context;
 struct loadparm_context;
-#include "auth/credentials/credentials_krb5.h"
+struct ccache_container;
+
+struct gssapi_creds_container;
+
 #include "auth/credentials/credentials_proto.h"
 
 #endif /* __CREDENTIALS_H__ */
diff --git a/source/auth/credentials/credentials_krb5.c b/source/auth/credentials/credentials_krb5.c
index 90b196e..52bf9f1 100644
--- a/source/auth/credentials/credentials_krb5.c
+++ b/source/auth/credentials/credentials_krb5.c
@@ -400,10 +400,10 @@ int cli_credentials_get_client_gss_creds(struct cli_credentials *cred,
    to the credentials system.
 */
 
-int cli_credentials_set_client_gss_creds(struct cli_credentials *cred, 
-					 struct loadparm_context *lp_ctx,
-					 gss_cred_id_t gssapi_cred,
-					 enum credentials_obtained obtained) 
+ int cli_credentials_set_client_gss_creds(struct cli_credentials *cred, 
+					  struct loadparm_context *lp_ctx,
+					  gss_cred_id_t gssapi_cred,
+					  enum credentials_obtained obtained) 
 {
 	int ret;
 	OM_uint32 maj_stat, min_stat;
diff --git a/source/auth/credentials/credentials_krb5.h b/source/auth/credentials/credentials_krb5.h
index b963fbd..aaa7d7f 100644
--- a/source/auth/credentials/credentials_krb5.h
+++ b/source/auth/credentials/credentials_krb5.h
@@ -26,10 +26,20 @@
 #include <gssapi/gssapi.h>
 #include <krb5.h>
 
-struct ccache_container;
-
 struct gssapi_creds_container {
 	gss_cred_id_t creds;
 };
 
+/* Manually prototyped here to avoid needing gss headers in most callers */
+int cli_credentials_set_client_gss_creds(struct cli_credentials *cred, 
+					 struct loadparm_context *lp_ctx,
+					 gss_cred_id_t gssapi_cred,
+					 enum credentials_obtained obtained);
+
+/* Manually prototyped here to avoid needing krb5 headers in most callers */
+krb5_error_code principal_from_credentials(TALLOC_CTX *parent_ctx, 
+					   struct cli_credentials *credentials, 
+					   struct smb_krb5_context *smb_krb5_context,
+					   krb5_principal *princ);
+	
 #endif /* __CREDENTIALS_KRB5_H__ */
diff --git a/source/auth/kerberos/kerberos_util.c b/source/auth/kerberos/kerberos_util.c
index 70e2961..e905e3e 100644
--- a/source/auth/kerberos/kerberos_util.c
+++ b/source/auth/kerberos/kerberos_util.c
@@ -101,10 +101,10 @@ static krb5_error_code salt_principal_from_credentials(TALLOC_CTX *parent_ctx,
  * the library routines.  The returned princ is placed in the talloc
  * system by means of a destructor (do *not* free). */
 
-krb5_error_code principal_from_credentials(TALLOC_CTX *parent_ctx, 
-					   struct cli_credentials *credentials, 
-					   struct smb_krb5_context *smb_krb5_context,
-					   krb5_principal *princ)
+ krb5_error_code principal_from_credentials(TALLOC_CTX *parent_ctx, 
+					    struct cli_credentials *credentials, 
+					    struct smb_krb5_context *smb_krb5_context,
+					    krb5_principal *princ)
 {
 	krb5_error_code ret;
 	const char *princ_string;


-- 
Samba Shared Repository