[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha4-135-gf10c9ca

[Stefan Metzmacher]

The branch, v4-0-test has been updated
       via  f10c9ca3612d7bdc4c2c221e959f8c48ec2f9349 (commit)
       via  d88be1a1cb543b4e2cc5d15262da786558aa276d (commit)
       via  31cf1a781efce932d0574d7840979fcd0a07ec08 (commit)
       via  7b6927832a1118b142d0d8a3a5548761f5a04f1a (commit)
      from  ba6394cb654f2a6683b5e97fad8e838d8e457e06 (commit)

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


- Log -----------------------------------------------------------------
commit f10c9ca3612d7bdc4c2c221e959f8c48ec2f9349
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jun 27 11:34:05 2008 +0200

    gsskrb5: just don't force, but allow the flags when GSS_CF_NO_CI_FLAGS is given
    
    metze

commit d88be1a1cb543b4e2cc5d15262da786558aa276d
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jun 27 11:33:00 2008 +0200

    gsskrb5: fix gss_krb5_cred_no_ci_flags_x_oid_desc variable name
    
    metze

commit 31cf1a781efce932d0574d7840979fcd0a07ec08
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jun 27 11:31:49 2008 +0200

    credentials: gss_set_cred_option() doesn't like GSS_C_NO_BUFFER
    
    metze

commit 7b6927832a1118b142d0d8a3a5548761f5a04f1a
Author: Julien Kerihuel <j.kerihuel at openchange.org>
Date:   Sat May 31 00:47:14 2008 +0200

    Fix if_version for interfaces with a if_version_minor field different from 0
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

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

Summary of changes:
 source/auth/credentials/credentials_krb5.c        |    5 ++++-
 source/heimdal/lib/gssapi/krb5/init_sec_context.c |    6 ++++++
 source/heimdal/lib/gssapi/krb5/set_cred_option.c  |    4 ++--
 source/pidl/lib/Parse/Pidl/NDR.pm                 |    7 ++++++-
 4 files changed, 18 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/auth/credentials/credentials_krb5.c b/source/auth/credentials/credentials_krb5.c
index 583469e..a880486 100644
--- a/source/auth/credentials/credentials_krb5.c
+++ b/source/auth/credentials/credentials_krb5.c
@@ -359,11 +359,14 @@ _PUBLIC_ int cli_credentials_get_client_gss_creds(struct cli_credentials *cred,
 	OM_uint32 maj_stat, min_stat;
 	struct gssapi_creds_container *gcc;
 	struct ccache_container *ccache;
+	gss_buffer_desc empty_buffer = GSS_C_EMPTY_BUFFER;
+
 	if (cred->client_gss_creds_obtained >= cred->client_gss_creds_threshold && 
 	    cred->client_gss_creds_obtained > CRED_UNINITIALISED) {
 		*_gcc = cred->client_gss_creds;
 		return 0;
 	}
+
 	ret = cli_credentials_get_ccache(cred, event_ctx, lp_ctx, 
 					 &ccache);
 	if (ret) {
@@ -391,7 +394,7 @@ _PUBLIC_ int cli_credentials_get_client_gss_creds(struct cli_credentials *cred,
 	/* don't force GSS_C_CONF_FLAG and GSS_C_INTEG_FLAG */
 	maj_stat = gss_set_cred_option(&min_stat, &gcc->creds,
 				       GSS_KRB5_CRED_NO_CI_FLAGS_X,
-				       GSS_C_NO_BUFFER);
+				       &empty_buffer);
 	if (maj_stat) {
 		talloc_free(gcc);
 		if (min_stat) {
diff --git a/source/heimdal/lib/gssapi/krb5/init_sec_context.c b/source/heimdal/lib/gssapi/krb5/init_sec_context.c
index ab7624e..c455a5d 100644
--- a/source/heimdal/lib/gssapi/krb5/init_sec_context.c
+++ b/source/heimdal/lib/gssapi/krb5/init_sec_context.c
@@ -490,6 +490,12 @@ init_auth
     if (req_flags & GSS_C_EXTENDED_ERROR_FLAG)
 	flags |= GSS_C_EXTENDED_ERROR_FLAG;
 
+    if (req_flags & GSS_C_CONF_FLAG) {
+	flags |= GSS_C_CONF_FLAG;
+    }
+    if (req_flags & GSS_C_INTEG_FLAG) {
+	flags |= GSS_C_INTEG_FLAG;
+    }
     if (cred == NULL || !(cred->cred_flags & GSS_CF_NO_CI_FLAGS)) {
 	flags |= GSS_C_CONF_FLAG;
 	flags |= GSS_C_INTEG_FLAG;
diff --git a/source/heimdal/lib/gssapi/krb5/set_cred_option.c b/source/heimdal/lib/gssapi/krb5/set_cred_option.c
index 242dfa8..85b50d0 100644
--- a/source/heimdal/lib/gssapi/krb5/set_cred_option.c
+++ b/source/heimdal/lib/gssapi/krb5/set_cred_option.c
@@ -35,10 +35,10 @@
 RCSID("$Id: set_cred_option.c 22655 2008-02-26 12:40:35Z lha $");
 
 /* 1.2.752.43.13.17 */
-static gss_OID_desc gss_krb5_ccache_name_x_oid_desc =
+static gss_OID_desc gss_krb5_cred_no_ci_flags_x_oid_desc =
 {6, rk_UNCONST("\x2a\x85\x70\x2b\x0d\x11")};
 
-gss_OID GSS_KRB5_CRED_NO_CI_FLAGS_X = &gss_krb5_ccache_name_x_oid_desc;
+gss_OID GSS_KRB5_CRED_NO_CI_FLAGS_X = &gss_krb5_cred_no_ci_flags_x_oid_desc;
 
 /* 1.2.752.43.13.18 */
 static gss_OID_desc gss_krb5_import_cred_x_oid_desc =
diff --git a/source/pidl/lib/Parse/Pidl/NDR.pm b/source/pidl/lib/Parse/Pidl/NDR.pm
index 33e5ad3..1e45047 100644
--- a/source/pidl/lib/Parse/Pidl/NDR.pm
+++ b/source/pidl/lib/Parse/Pidl/NDR.pm
@@ -688,7 +688,12 @@ sub ParseInterface($)
 	$version = "0.0";
 
 	if(defined $idl->{PROPERTIES}->{version}) { 
-		$version = $idl->{PROPERTIES}->{version}; 
+		my @if_version = split(/\./, $idl->{PROPERTIES}->{version});
+		if ($if_version[0] == $idl->{PROPERTIES}->{version}) {
+				$version = $idl->{PROPERTIES}->{version};
+		} else {
+				$version = $if_version[1] << 16 | $if_version[0];
+		}
 	}
 
 	# If no endpoint is set, default to the interface name as a named pipe


-- 
Samba Shared Repository