[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  2bbf055... Make -k a simple non-bool option.
       via  2d46e07... Fix what looks like a cut-and-paste error in our read_negTokenInit() function.
      from  8a4525d... waf: fix the build of nsswitch libwbclient.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2bbf055dbb15ea99b80ae66adc906ad5494a3999
Author: Jeremy Allison <jra at samba.org>
Date:   Thu May 20 14:59:34 2010 -0700

    Make -k a simple non-bool option.
    
    Jeremy.

commit 2d46e07c47418fdec5239d65032277c7917a44a4
Author: Jeremy Allison <jra at samba.org>
Date:   Thu May 20 14:30:44 2010 -0700

    Fix what looks like a cut-and-paste error in our read_negTokenInit() function.
    
    We should never be calling asn1_push_XXX functions inside an asn1
    reading function. Change asn1_push_tag() -> asn1_start_tag() and
    asn1_pop_tag() -> asn1_end_tag(). This allows us to connect to a
    NetApp filer at the Microsoft plugfest.
    
    Andrew PLEASE CHECK !
    
    Jeremy.

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

Summary of changes:
 libcli/auth/spnego_parse.c             |    8 ++++----
 source4/lib/cmdline/popt_credentials.c |    9 ---------
 2 files changed, 4 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/auth/spnego_parse.c b/libcli/auth/spnego_parse.c
index 3f7047b..86b083d 100644
--- a/libcli/auth/spnego_parse.c
+++ b/libcli/auth/spnego_parse.c
@@ -88,11 +88,11 @@ static bool read_negTokenInit(struct asn1_data *asn1, TALLOC_CTX *mem_ctx,
 				/* RFC 2478 says we have an Octet String here,
 				   but W2k sends something different... */
 				char *mechListMIC;
-				asn1_push_tag(asn1, ASN1_SEQUENCE(0));
-				asn1_push_tag(asn1, ASN1_CONTEXT(0));
+				asn1_start_tag(asn1, ASN1_SEQUENCE(0));
+				asn1_start_tag(asn1, ASN1_CONTEXT(0));
 				asn1_read_GeneralString(asn1, mem_ctx, &mechListMIC);
-				asn1_pop_tag(asn1);
-				asn1_pop_tag(asn1);
+				asn1_end_tag(asn1);
+				asn1_end_tag(asn1);
 
 				token->targetPrincipal = mechListMIC;
 			}
diff --git a/source4/lib/cmdline/popt_credentials.c b/source4/lib/cmdline/popt_credentials.c
index 80f71eb..384024f 100644
--- a/source4/lib/cmdline/popt_credentials.c
+++ b/source4/lib/cmdline/popt_credentials.c
@@ -103,15 +103,6 @@ static void popt_common_credentials_callback(poptContext con,
 	case OPT_KERBEROS:
 	{
 		bool use_kerberos = true;
-		/* Force us to only use kerberos */
-		if (arg) {
-			if (!set_boolean(arg, &use_kerberos)) {
-				fprintf(stderr, "Error parsing -k %s\n", arg);
-				exit(1);
-				break;
-			}
-		}
-		
 		cli_credentials_set_kerberos_state(cmdline_credentials, 
 						   use_kerberos 
 						   ? CRED_MUST_USE_KERBEROS


-- 
Samba Shared Repository