[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  02a08d5 s4:ntvfs common - remove two outdated function prototypes
       via  7c44039 s4:ntvfs common - add "UTIL_TDB" and "tdb-wrap" as internal build dependency
       via  5347074 s4:param/pyparam.c - suppress "P_SEP" compilation warning
      from  8dda773 s3-docs: document -k switch in net manpage.

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


- Log -----------------------------------------------------------------
commit 02a08d5cd5f2a57e51fffd2a10b6ee8f797df9e0
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Tue Sep 20 18:38:54 2011 +0200

    s4:ntvfs common - remove two outdated function prototypes
    
    The two functions don't exist anymore.
    
    Reviewed-by: Jelmer
    
    Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
    Autobuild-Date: Tue Sep 20 20:16:29 CEST 2011 on sn-devel-104

commit 7c44039f483802c04611abaf11e0b421716e632b
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Tue Sep 20 15:04:54 2011 +0200

    s4:ntvfs common - add "UTIL_TDB" and "tdb-wrap" as internal build dependency
    
    These modules are required for both header and source code files (see
    bug #8468).
    
    Reviewed-by: Jelmer

commit 5347074c4e458e077e2833170e2b122494037552
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Tue Sep 20 14:32:52 2011 +0200

    s4:param/pyparam.c - suppress "P_SEP" compilation warning
    
    Reviewed-by: Jelmer

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

Summary of changes:
 source4/ntvfs/common/brlock.h      |    3 ---
 source4/ntvfs/common/opendb.h      |    1 -
 source4/ntvfs/common/wscript_build |    1 +
 source4/param/pyparam.c            |    4 ++--
 4 files changed, 3 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/ntvfs/common/brlock.h b/source4/ntvfs/common/brlock.h
index 703538f..650136b 100644
--- a/source4/ntvfs/common/brlock.h
+++ b/source4/ntvfs/common/brlock.h
@@ -51,8 +51,5 @@ struct brlock_ops {
 			      int *count);
 };
 
-
 void brlock_set_ops(const struct brlock_ops *new_ops);
 void brl_tdb_init_ops(void);
-void brl_ctdb_init_ops(void);
-
diff --git a/source4/ntvfs/common/opendb.h b/source4/ntvfs/common/opendb.h
index 446df17..1bfc6aa 100644
--- a/source4/ntvfs/common/opendb.h
+++ b/source4/ntvfs/common/opendb.h
@@ -57,4 +57,3 @@ struct opendb_oplock_break {
 
 void odb_set_ops(const struct opendb_ops *new_ops);
 void odb_tdb_init_ops(void);
-void odb_ctdb_init_ops(void);
diff --git a/source4/ntvfs/common/wscript_build b/source4/ntvfs/common/wscript_build
index 4977b70..b16f8fa 100644
--- a/source4/ntvfs/common/wscript_build
+++ b/source4/ntvfs/common/wscript_build
@@ -3,6 +3,7 @@
 bld.SAMBA_SUBSYSTEM('ntvfs_common',
 	source='init.c brlock.c brlock_tdb.c opendb.c opendb_tdb.c notify.c',
 	autoproto='proto.h',
+	deps='UTIL_TDB tdb-wrap',
 	public_deps='NDR_OPENDB NDR_NOTIFY sys_notify sys_lease share'
 	)
 
diff --git a/source4/param/pyparam.c b/source4/param/pyparam.c
index 663ed84..d5049d7 100644
--- a/source4/param/pyparam.c
+++ b/source4/param/pyparam.c
@@ -143,8 +143,8 @@ static PyObject *py_lp_ctx_get_helper(struct loadparm_context *lp_ctx, const cha
 			       PyString_FromString(strlist[j]));
 	    return pylist;
 	}
-
-	break;
+    case P_SEP:
+	return NULL; /* this stands for a separator, can be ignored */
     }
     return NULL;
 


-- 
Samba Shared Repository