[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  26b6e28 gensec: Make gensec_security_oids_from_ops static
       via  85220ea gensec: Make gensec_security_by_sasl_list static
       via  eb6ebe6 gensec: Make gensec_interface_version public
      from  fbb12b5 samba-tool/tests: Force the gecos of the user to a fixed value.

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


- Log -----------------------------------------------------------------
commit 26b6e280822f7a351a37cad98004fa0b49208df6
Author: Volker Lendecke <vl at samba.org>
Date:   Sat May 11 10:36:12 2013 +0200

    gensec: Make gensec_security_oids_from_ops static
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed May 15 20:05:34 CEST 2013 on sn-devel-104

commit 85220eaa9cbd574d29cc7cab54854c5e29778ff1
Author: Volker Lendecke <vl at samba.org>
Date:   Sat May 11 10:35:59 2013 +0200

    gensec: Make gensec_security_by_sasl_list static
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit eb6ebe689faa08a941bd22929ab2e3f932deee85
Author: Volker Lendecke <vl at samba.org>
Date:   Sat May 11 10:35:33 2013 +0200

    gensec: Make gensec_interface_version public
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 auth/gensec/gensec.h       |    1 +
 auth/gensec/gensec_start.c |   18 ++++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/auth/gensec/gensec.h b/auth/gensec/gensec.h
index efbbabe..396a16d 100644
--- a/auth/gensec/gensec.h
+++ b/auth/gensec/gensec.h
@@ -193,6 +193,7 @@ struct gensec_critical_sizes {
 	int sizeof_gensec_security_ops;
 	int sizeof_gensec_security;
 };
+const struct gensec_critical_sizes *gensec_interface_version(void);
 
 /* Socket wrapper */
 
diff --git a/auth/gensec/gensec_start.c b/auth/gensec/gensec_start.c
index d3145ec..e46f0ee 100644
--- a/auth/gensec/gensec_start.c
+++ b/auth/gensec/gensec_start.c
@@ -280,9 +280,10 @@ static const struct gensec_security_ops *gensec_security_by_name(struct gensec_s
  * attached to the gensec_security, and return in our preferred order.
  */
 
-const struct gensec_security_ops **gensec_security_by_sasl_list(struct gensec_security *gensec_security,
-								TALLOC_CTX *mem_ctx,
-								const char **sasl_names)
+static const struct gensec_security_ops **gensec_security_by_sasl_list(
+	struct gensec_security *gensec_security,
+	TALLOC_CTX *mem_ctx,
+	const char **sasl_names)
 {
 	const struct gensec_security_ops **backends_out;
 	struct gensec_security_ops **backends;
@@ -427,10 +428,11 @@ _PUBLIC_ const struct gensec_security_ops_wrapper *gensec_security_by_oid_list(
  * Return OIDS from the security subsystems listed
  */
 
-const char **gensec_security_oids_from_ops(struct gensec_security *gensec_security,
-										   TALLOC_CTX *mem_ctx,
-					   struct gensec_security_ops **ops,
-					   const char *skip)
+static const char **gensec_security_oids_from_ops(
+	struct gensec_security *gensec_security,
+	TALLOC_CTX *mem_ctx,
+	struct gensec_security_ops **ops,
+	const char *skip)
 {
 	int i;
 	int j = 0;
@@ -875,7 +877,7 @@ _PUBLIC_ NTSTATUS gensec_register(const struct gensec_security_ops *ops)
   This can be used by backends to either detect compilation errors, or provide
   multiple implementations for different smbd compilation options in one module
 */
-const struct gensec_critical_sizes *gensec_interface_version(void)
+_PUBLIC_ const struct gensec_critical_sizes *gensec_interface_version(void)
 {
 	static const struct gensec_critical_sizes critical_sizes = {
 		GENSEC_INTERFACE_VERSION,


-- 
Samba Shared Repository