[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  eb97161 samba.getopt: Allow --kerberos=auto, and fix exception name if an unknown value is specified.
       via  b0d76ef s4/param: Expose lpcfg_smb_ports and lpcfg_socket_options, which are both required by winexe.
       via  aa472fc param: Expose lpcfg_smb_ports, required by winexe.
      from  49eba95 s3-waf: make sure we build example vfs modules with --enable-developer.

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


- Log -----------------------------------------------------------------
commit eb971614e538a16852b3cbc3677fb06eb57e6a83
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Oct 11 23:56:15 2011 +0200

    samba.getopt: Allow --kerberos=auto, and fix exception name if an unknown
    value is specified.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Wed Oct 12 02:12:21 CEST 2011 on sn-devel-104

commit b0d76efb6e15c98b718a6412421c25c16837de37
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Oct 11 23:53:59 2011 +0200

    s4/param: Expose lpcfg_smb_ports and lpcfg_socket_options, which are both required by winexe.

commit aa472fc0f092e9047f36c0b676b06aafd7953716
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Oct 11 23:51:37 2011 +0200

    param: Expose lpcfg_smb_ports, required by winexe.

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

Summary of changes:
 lib/param/param.h                        |    2 ++
 source4/scripting/python/samba/getopt.py |    5 ++++-
 2 files changed, 6 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/param/param.h b/lib/param/param.h
index 3b9a75d..c54f9cb 100644
--- a/lib/param/param.h
+++ b/lib/param/param.h
@@ -204,6 +204,8 @@ void lpcfg_smbcli_options(struct loadparm_context *lp_ctx,
 			 struct smbcli_options *options);
 void lpcfg_smbcli_session_options(struct loadparm_context *lp_ctx,
 				 struct smbcli_session_options *options);
+const char **lpcfg_smb_ports(struct loadparm_context *);
+const char *lpcfg_socket_options(struct loadparm_context *);
 struct dcerpc_server_info *lpcfg_dcerpc_server_info(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx);
 struct gensec_settings *lpcfg_gensec_settings(TALLOC_CTX *, struct loadparm_context *);
 
diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py
index 01e9f87..1b30d2f 100644
--- a/source4/scripting/python/samba/getopt.py
+++ b/source4/scripting/python/samba/getopt.py
@@ -25,6 +25,7 @@ import optparse
 import os
 from samba.credentials import (
     Credentials,
+    AUTO_USE_KERBEROS,
     DONT_USE_KERBEROS,
     MUST_USE_KERBEROS,
     )
@@ -150,8 +151,10 @@ class CredentialsOptions(optparse.OptionGroup):
             self.creds.set_kerberos_state(MUST_USE_KERBEROS)
         elif arg.lower() in ["no", 'false', '0']:
             self.creds.set_kerberos_state(DONT_USE_KERBEROS)
+        elif arg.lower() in ["auto"]:
+            self.creds.set_kerberos_state(AUTO_USE_KERBEROS)
         else:
-            raise optparse.BadOptionErr("invalid kerberos option: %s" % arg)
+            raise optparse.BadOptionError("invalid kerberos option: %s" % arg)
 
     def _set_simple_bind_dn(self, option, opt_str, arg, parser):
         self.creds.set_bind_dn(arg)


-- 
Samba Shared Repository