svn commit: samba r15389 - in branches/SAMBA_4_0/source: lib/ldb/swig scripting/swig/torture

2006-05-01 Thread tpot
Author: tpot
Date: 2006-05-02 05:14:00 + (Tue, 02 May 2006)
New Revision: 15389

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15389

Log:
Add some better torture tests for LdbMessage.

Fix up behaviour of Ldb.__setitem__() function.  It should overwrite the 
element data.

Add wrapper for ldb_msg_sanity_check().

Modified:
   branches/SAMBA_4_0/source/lib/ldb/swig/Ldb.py
   branches/SAMBA_4_0/source/lib/ldb/swig/ldb.i
   branches/SAMBA_4_0/source/scripting/swig/torture/torture_ldb.py


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/swig/Ldb.py
===
--- branches/SAMBA_4_0/source/lib/ldb/swig/Ldb.py   2006-05-02 02:36:11 UTC 
(rev 15388)
+++ branches/SAMBA_4_0/source/lib/ldb/swig/Ldb.py   2006-05-02 05:14:00 UTC 
(rev 15389)
@@ -20,6 +20,15 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
+#
+# Interface notes:
+#
+#   - should an empty dn be represented as None, or an empty string?
+#
+#   - should single-valued attributes be a string, or a list with one
+# element?
+#
+
 from ldb import *
 
 # Global initialisation
@@ -62,6 +71,9 @@
 def __setattr__(self, attr, value):
 if attr == 'dn':
 self.msg.dn = ldb_dn_explode(self.msg, value)
+if self.msg.dn == None:
+err = LDB_ERR_INVALID_DN_SYNTAX
+raise LdbError(err, ldb_strerror(err))
 return
 self.__dict__[attr] = value
 
@@ -78,6 +90,7 @@
 for i in range(elt.num_values)]
 
 def __setitem__(self, key, value):
+ldb_msg_remove_attr(self.msg, key)
 if type(value) in (list, tuple):
 [ldb_msg_add_value(self.msg, key, v) for v in value]
 else:
@@ -99,6 +112,11 @@
 def items(self):
 return [(k, self[k]) for k in self.keys()]
 
+# Misc stuff
+
+def sanity_check(self):
+return ldb_msg_sanity_check(self.msg)
+
 class Ldb:
 """A class representing a binding to a ldb file."""
 

Modified: branches/SAMBA_4_0/source/lib/ldb/swig/ldb.i
===
--- branches/SAMBA_4_0/source/lib/ldb/swig/ldb.i2006-05-02 02:36:11 UTC 
(rev 15388)
+++ branches/SAMBA_4_0/source/lib/ldb/swig/ldb.i2006-05-02 05:14:00 UTC 
(rev 15389)
@@ -199,13 +199,18 @@
  * Wrap ldb functions 
  */
 
+/* Initialisation */
+
 int ldb_global_init(void);
-
 struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx);
 
+/* Error handling */
+
 const char *ldb_errstring(struct ldb_context *ldb);
 const char *ldb_strerror(int ldb_err);
 
+/* Top-level ldb operations */
+
 int ldb_connect(struct ldb_context *ldb, const char *url, unsigned int flags, 
const char *options[]);
 
 int ldb_search(struct ldb_context *ldb, const struct ldb_dn *base, enum 
ldb_scope scope, const char *expression, const char * const *attrs, struct 
ldb_result **OUT);
@@ -216,9 +221,20 @@
 
 int ldb_add(struct ldb_context *ldb, const struct ldb_message *message);
 
+/* Ldb message operations */
+
 struct ldb_message *ldb_msg_new(void *mem_ctx);
+
 struct ldb_message_element *ldb_msg_find_element(const struct ldb_message 
*msg, const char *attr_name);
+
 int ldb_msg_add_value(struct ldb_message *msg, const char *attr_name, const 
struct ldb_val *INPUT);
 
+void ldb_msg_remove_attr(struct ldb_message *msg, const char *attr);
+
+int ldb_msg_sanity_check(struct ldb_message *msg);
+
+/* DN operations */
+
 struct ldb_dn *ldb_dn_explode(void *mem_ctx, const char *dn);
+
 char *ldb_dn_linearize(void *mem_ctx, const struct ldb_dn *dn);

Modified: branches/SAMBA_4_0/source/scripting/swig/torture/torture_ldb.py
===
--- branches/SAMBA_4_0/source/scripting/swig/torture/torture_ldb.py 
2006-05-02 02:36:11 UTC (rev 15388)
+++ branches/SAMBA_4_0/source/scripting/swig/torture/torture_ldb.py 
2006-05-02 05:14:00 UTC (rev 15389)
@@ -1,18 +1,83 @@
 #!/usr/bin/python
+#
+# A torture test for the Python Ldb bindings.  Also a short guide on
+# how the API works.
+#
 
-import Ldb, sys
+from Ldb import *
 
-def test(cond, msg):
+# Helpers
+
+def t(cond, msg):
+"""Test a condition."""
 if not cond:
-print 'FAILED:', msg
-sys.exit(1)
+raise RuntimeError('FAILED: %s' % msg)
 
+#
 # Torture LdbMessage
+#
 
-m = Ldb.LdbMessage()
+m = LdbMessage()
+
+# Empty message
+
+t(m.keys() == [], 'empty msg')
+t(m.dn == None, 'empty dn')
+
+t(m.sanity_check() == LDB_ERR_INVALID_DN_SYNTAX, 'sanity check')
+
+# Test invalid dn
+
+try:
+m.dn = 'invalid dn'
+except LdbError, arg:
+if arg[0] != LDB_ERR_INVALID_DN_SYNTAX:
+raise
+else:
+t(False, 'LdbError not raised')
+
+# Test valid dn
+
+m.dn = 'name=spotty'
+t(m.dn == 'name=spotty', 'specified dn')
+
+t(m.sanity_check() == LDB_SUCCESS, 'sanity check')
+
+# Test some single-valued attributes
+
 m['animal'] = 'dog'
 m['name'] = 'spotty'

svn commit: samba r15388 - in branches/SAMBA_4_0/source/lib/ldb/common: .

2006-05-01 Thread tpot
Author: tpot
Date: 2006-05-02 02:36:11 + (Tue, 02 May 2006)
New Revision: 15388

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15388

Log:
Fix cut&paste typo.

Modified:
   branches/SAMBA_4_0/source/lib/ldb/common/ldb.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb.c
===
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb.c  2006-05-01 23:03:32 UTC 
(rev 15387)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb.c  2006-05-02 02:36:11 UTC 
(rev 15388)
@@ -533,7 +533,7 @@
return "Alias problem";
case LDB_ERR_INVALID_DN_SYNTAX:
return "Invalid DN syntax";
-/* 53 RESERVED */
+/* 35 RESERVED */
case LDB_ERR_ALIAS_DEREFERENCING_PROBLEM:
return "Alias dereferencing problem";
 /* 37-47 unused */



svn commit: samba-web r974 - in trunk/projects: .

2006-05-01 Thread jerry
Author: jerry
Date: 2006-05-02 01:23:49 + (Tue, 02 May 2006)
New Revision: 974

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=974

Log:
adding link to the student submission form
Modified:
   trunk/projects/summercode06.html


Changeset:
Modified: trunk/projects/summercode06.html
===
--- trunk/projects/summercode06.html2006-05-01 21:56:27 UTC (rev 973)
+++ trunk/projects/summercode06.html2006-05-02 01:23:49 UTC (rev 974)
@@ -20,6 +20,9 @@
 work on the project you are proposing and that you understand the scope of the 
 problem.
 
+Update (1 May): The http://code.google.com/soc/student_step1.html";>student application
+form is now open for submissions at Google.
+
 
 
   Project Ideas



Build status as of Tue May 2 00:00:02 2006

2006-05-01 Thread build
URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2006-05-01 
00:00:05.0 +
+++ /home/build/master/cache/broken_results.txt 2006-05-02 00:00:04.0 
+
@@ -1,17 +1,17 @@
-Build status as of Mon May  1 00:00:02 2006
+Build status as of Tue May  2 00:00:02 2006
 
 Build counts:
 Tree Total  Broken Panic 
-ccache   8  2  0 
-distcc   13 2  0 
-lorikeet-heimdal 34 27 0 
+ccache   9  1  0 
+distcc   13 1  0 
+lorikeet-heimdal 34 26 0 
 ppp  19 0  0 
 rsync36 2  0 
 samba2  0  0 
 samba-docs   0  0  0 
-samba4   38 24 3 
+samba4   39 24 5 
 samba_3_038 7  0 
 smb-build26 0  0 
-talloc   8  5  0 
-tdb  33 4  0 
+talloc   9  5  0 
+tdb  34 5  0 
 


svn commit: samba r15387 - in branches/SAMBA_4_0/source: build/smb_build libcli/nbt ntvfs ntvfs/cifs_posix_cli ntvfs/simple param rpc_server

2006-05-01 Thread jelmer
Author: jelmer
Date: 2006-05-01 23:03:32 + (Mon, 01 May 2006)
New Revision: 15387

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15387

Log:
Fix installation of dcerpc headers, remove more instances of uint_t

Modified:
   branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
   branches/SAMBA_4_0/source/libcli/nbt/libnbt.h
   branches/SAMBA_4_0/source/ntvfs/cifs_posix_cli/cvfs.h
   branches/SAMBA_4_0/source/ntvfs/ntvfs.h
   branches/SAMBA_4_0/source/ntvfs/simple/svfs.h
   branches/SAMBA_4_0/source/param/loadparm.h
   branches/SAMBA_4_0/source/rpc_server/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/config_mk.pm  2006-05-01 
22:53:29 UTC (rev 15386)
+++ branches/SAMBA_4_0/source/build/smb_build/config_mk.pm  2006-05-01 
23:03:32 UTC (rev 15387)
@@ -55,7 +55,11 @@
 
"MANPAGE"   => "string",
"PRIVATE_PROTO_HEADER"  => "string",
+   "PUBLIC_PROTO_HEADER"   => "string",
 
+
+   "PUBLIC_HEADERS"=> "list",
+
"CFLAGS"=> "string"
},
"BINARY" => {

Modified: branches/SAMBA_4_0/source/libcli/nbt/libnbt.h
===
--- branches/SAMBA_4_0/source/libcli/nbt/libnbt.h   2006-05-01 22:53:29 UTC 
(rev 15386)
+++ branches/SAMBA_4_0/source/libcli/nbt/libnbt.h   2006-05-01 23:03:32 UTC 
(rev 15387)
@@ -74,7 +74,7 @@
/* shall we allow multiple replies? */
BOOL allow_multiple_replies;
 
-   uint_t num_replies;
+   unsigned int num_replies;
struct nbt_name_reply {
struct nbt_name_packet *packet;
struct socket_address *dest;

Modified: branches/SAMBA_4_0/source/ntvfs/cifs_posix_cli/cvfs.h
===
--- branches/SAMBA_4_0/source/ntvfs/cifs_posix_cli/cvfs.h   2006-05-01 
22:53:29 UTC (rev 15386)
+++ branches/SAMBA_4_0/source/ntvfs/cifs_posix_cli/cvfs.h   2006-05-01 
23:03:32 UTC (rev 15387)
@@ -13,7 +13,7 @@
 };
 
 struct svfs_dir {
-   uint_t count;
+   unsigned int count;
char *unix_dir;
struct svfs_dirfile {
char *name;
@@ -30,6 +30,6 @@
 struct search_state {
struct search_state *next, *prev;
uint16_t handle;
-   uint_t current_index;
+   unsigned int current_index;
struct svfs_dir *dir;
 };

Modified: branches/SAMBA_4_0/source/ntvfs/ntvfs.h
===
--- branches/SAMBA_4_0/source/ntvfs/ntvfs.h 2006-05-01 22:53:29 UTC (rev 
15386)
+++ branches/SAMBA_4_0/source/ntvfs/ntvfs.h 2006-05-01 23:03:32 UTC (rev 
15387)
@@ -223,7 +223,7 @@
 struct ntvfs_async_state {
struct ntvfs_async_state *prev, *next;
/* the async handling infos */
-   uint_t state;
+   unsigned int state;
void *private_data;
void (*send_fn)(struct ntvfs_request *);
NTSTATUS status;

Modified: branches/SAMBA_4_0/source/ntvfs/simple/svfs.h
===
--- branches/SAMBA_4_0/source/ntvfs/simple/svfs.h   2006-05-01 22:53:29 UTC 
(rev 15386)
+++ branches/SAMBA_4_0/source/ntvfs/simple/svfs.h   2006-05-01 23:03:32 UTC 
(rev 15387)
@@ -13,7 +13,7 @@
 };
 
 struct svfs_dir {
-   uint_t count;
+   unsigned int count;
char *unix_dir;
struct svfs_dirfile {
char *name;
@@ -30,6 +30,6 @@
 struct search_state {
struct search_state *next, *prev;
uint16_t handle;
-   uint_t current_index;
+   unsigned int current_index;
struct svfs_dir *dir;
 };

Modified: branches/SAMBA_4_0/source/param/loadparm.h
===
--- branches/SAMBA_4_0/source/param/loadparm.h  2006-05-01 22:53:29 UTC (rev 
15386)
+++ branches/SAMBA_4_0/source/param/loadparm.h  2006-05-01 23:03:32 UTC (rev 
15387)
@@ -49,7 +49,7 @@
void *ptr;
BOOL (*special)(const char *, char **);
const struct enum_list *enum_list;
-   uint_t flags;
+   unsigned int flags;
union {
BOOL bvalue;
int ivalue;

Modified: branches/SAMBA_4_0/source/rpc_server/config.mk
===
--- branches/SAMBA_4_0/source/rpc_server/config.mk  2006-05-01 22:53:29 UTC 
(rev 15386)
+++ branches/SAMBA_4_0/source/rpc_server/config.mk  2006-05-01 23:03:32 UTC 
(rev 15387)
@@ -209,8 +209,8 @@
 [MODULE::dcerpc_server]
 INIT_FUNCTION = server_service_rpc_init
 SUBSYSTEM = service
-#PUBLIC_HEADERS = dcerpc_server.h
-PRIVATE_PROTO_HEADER = dcerpc_server_proto.h
+PUBLIC_HEADERS = dcerpc_server.h
+PUBLIC_PROTO_HEADER = dcerpc_server_proto.h
 OB

svn commit: samba r15386 - branches/SAMBA_3_0/source/python trunk/source/python

2006-05-01 Thread deryck
Author: deryck
Date: 2006-05-01 22:53:29 + (Mon, 01 May 2006)
New Revision: 15386

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15386

Log:

Missed some functions in my last commit.

deryck

Modified:
   branches/SAMBA_3_0/source/python/py_samr.c
   trunk/source/python/py_samr.c


Changeset:
Modified: branches/SAMBA_3_0/source/python/py_samr.c
===
--- branches/SAMBA_3_0/source/python/py_samr.c  2006-05-01 22:31:33 UTC (rev 
15385)
+++ branches/SAMBA_3_0/source/python/py_samr.c  2006-05-01 22:53:29 UTC (rev 
15386)
@@ -283,7 +283,7 @@
0,  /*tp_hash */
 };
 
-PyObject *new_samr_user_hnd_object(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+PyObject *new_samr_user_hnd_object(struct rpc_pipe_client *cli, TALLOC_CTX 
*mem_ctx,
   POLICY_HND *pol)
 {
samr_user_hnd_object *o;
@@ -304,7 +304,7 @@
PyObject_Del(self);
 }
 
-PyObject *new_samr_domain_hnd_object(struct cli_state *cli, TALLOC_CTX 
*mem_ctx,
+PyObject *new_samr_domain_hnd_object(struct rpc_pipe_client *cli, TALLOC_CTX 
*mem_ctx,
 POLICY_HND *pol)
 {
samr_domain_hnd_object *o;
@@ -396,7 +396,7 @@
0,  /*tp_hash */
 };
 
-PyObject *new_samr_connect_hnd_object(struct cli_state *cli, TALLOC_CTX 
*mem_ctx,
+PyObject *new_samr_connect_hnd_object(struct rpc_pipe_client *cli, TALLOC_CTX 
*mem_ctx,
  POLICY_HND *pol)
 {
samr_connect_hnd_object *o;
@@ -577,7 +577,7 @@
goto done;
}
 
-   result = new_samr_connect_hnd_object(cli, mem_ctx, &hnd);
+   result = new_samr_connect_hnd_object(cli->pipe_list, mem_ctx, &hnd);
 
 done:
if (!result) {

Modified: trunk/source/python/py_samr.c
===
--- trunk/source/python/py_samr.c   2006-05-01 22:31:33 UTC (rev 15385)
+++ trunk/source/python/py_samr.c   2006-05-01 22:53:29 UTC (rev 15386)
@@ -283,7 +283,7 @@
0,  /*tp_hash */
 };
 
-PyObject *new_samr_user_hnd_object(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+PyObject *new_samr_user_hnd_object(struct rpc_pipe_client *cli, TALLOC_CTX 
*mem_ctx,
   POLICY_HND *pol)
 {
samr_user_hnd_object *o;
@@ -304,7 +304,7 @@
PyObject_Del(self);
 }
 
-PyObject *new_samr_domain_hnd_object(struct cli_state *cli, TALLOC_CTX 
*mem_ctx,
+PyObject *new_samr_domain_hnd_object(struct rpc_pipe_client *cli, TALLOC_CTX 
*mem_ctx,
 POLICY_HND *pol)
 {
samr_domain_hnd_object *o;
@@ -396,7 +396,7 @@
0,  /*tp_hash */
 };
 
-PyObject *new_samr_connect_hnd_object(struct cli_state *cli, TALLOC_CTX 
*mem_ctx,
+PyObject *new_samr_connect_hnd_object(struct rpc_pipe_client *cli, TALLOC_CTX 
*mem_ctx,
  POLICY_HND *pol)
 {
samr_connect_hnd_object *o;
@@ -577,7 +577,7 @@
goto done;
}
 
-   result = new_samr_connect_hnd_object(cli, mem_ctx, &hnd);
+   result = new_samr_connect_hnd_object(cli->pipe_list, mem_ctx, &hnd);
 
 done:
if (!result) {



svn commit: samba r15385 - branches/SAMBA_3_0/source/python trunk/source/python

2006-05-01 Thread deryck
Author: deryck
Date: 2006-05-01 22:31:33 + (Mon, 01 May 2006)
New Revision: 15385

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15385

Log:

Some work to bring the python code up to date with the
rpc client rewrite.

Modified:
   branches/SAMBA_3_0/source/python/py_lsa.c
   branches/SAMBA_3_0/source/python/py_lsa.h
   branches/SAMBA_3_0/source/python/py_samr.c
   branches/SAMBA_3_0/source/python/py_samr.h
   branches/SAMBA_3_0/source/python/py_spoolss_drivers.c
   branches/SAMBA_3_0/source/python/py_spoolss_ports.c
   branches/SAMBA_3_0/source/python/py_spoolss_printerdata.c
   branches/SAMBA_3_0/source/python/py_spoolss_printers.c
   branches/SAMBA_3_0/source/python/py_srvsvc.c
   trunk/source/python/py_lsa.c
   trunk/source/python/py_lsa.h
   trunk/source/python/py_samr.c
   trunk/source/python/py_samr.h
   trunk/source/python/py_spoolss_drivers.c
   trunk/source/python/py_spoolss_ports.c
   trunk/source/python/py_spoolss_printerdata.c
   trunk/source/python/py_spoolss_printers.c
   trunk/source/python/py_srvsvc.c


Changeset:
Modified: branches/SAMBA_3_0/source/python/py_lsa.c
===
--- branches/SAMBA_3_0/source/python/py_lsa.c   2006-05-01 22:07:12 UTC (rev 
15384)
+++ branches/SAMBA_3_0/source/python/py_lsa.c   2006-05-01 22:31:33 UTC (rev 
15385)
@@ -20,7 +20,7 @@
 
 #include "python/py_lsa.h"
 
-PyObject *new_lsa_policy_hnd_object(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+PyObject *new_lsa_policy_hnd_object(struct rpc_pipe_client *cli, TALLOC_CTX 
*mem_ctx,
POLICY_HND *pol)
 {
lsa_policy_hnd_object *o;
@@ -90,14 +90,14 @@
}
 
ntstatus = rpccli_lsa_open_policy(
-   cli, mem_ctx, True, desired_access, &hnd);
+   cli->pipe_list, mem_ctx, True, desired_access, &hnd);
 
if (!NT_STATUS_IS_OK(ntstatus)) {
PyErr_SetObject(lsa_ntstatus, py_ntstatus_tuple(ntstatus));
goto done;
}
 
-   result = new_lsa_policy_hnd_object(cli, mem_ctx, &hnd);
+   result = new_lsa_policy_hnd_object(cli->pipe_list, mem_ctx, &hnd);
 
 done:
if (!result) {

Modified: branches/SAMBA_3_0/source/python/py_lsa.h
===
--- branches/SAMBA_3_0/source/python/py_lsa.h   2006-05-01 22:07:12 UTC (rev 
15384)
+++ branches/SAMBA_3_0/source/python/py_lsa.h   2006-05-01 22:31:33 UTC (rev 
15385)
@@ -27,7 +27,7 @@
 
 typedef struct {
PyObject_HEAD
-   struct cli_state *cli;
+   struct rpc_pipe_client *cli;
TALLOC_CTX *mem_ctx;
POLICY_HND pol;
 } lsa_policy_hnd_object;

Modified: branches/SAMBA_3_0/source/python/py_samr.c
===
--- branches/SAMBA_3_0/source/python/py_samr.c  2006-05-01 22:07:12 UTC (rev 
15384)
+++ branches/SAMBA_3_0/source/python/py_samr.c  2006-05-01 22:31:33 UTC (rev 
15385)
@@ -569,7 +569,7 @@
goto done;
}
 
-   ntstatus = rpccli_samr_connect(cli, mem_ctx, desired_access, &hnd);
+   ntstatus = rpccli_samr_connect(cli->pipe_list, mem_ctx, desired_access, 
&hnd);
 
if (!NT_STATUS_IS_OK(ntstatus)) {
cli_shutdown(cli);

Modified: branches/SAMBA_3_0/source/python/py_samr.h
===
--- branches/SAMBA_3_0/source/python/py_samr.h  2006-05-01 22:07:12 UTC (rev 
15384)
+++ branches/SAMBA_3_0/source/python/py_samr.h  2006-05-01 22:31:33 UTC (rev 
15385)
@@ -27,7 +27,7 @@
 
 typedef struct {
PyObject_HEAD
-   struct cli_state *cli;
+   struct rpc_pipe_client *cli;
TALLOC_CTX *mem_ctx;
POLICY_HND connect_pol;
 } samr_connect_hnd_object;
@@ -36,7 +36,7 @@
 
 typedef struct {
PyObject_HEAD
-   struct cli_state *cli;
+   struct rpc_pipe_client *cli;
TALLOC_CTX *mem_ctx;
POLICY_HND domain_pol;
 } samr_domain_hnd_object;
@@ -45,7 +45,7 @@
 
 typedef struct {
PyObject_HEAD
-   struct cli_state *cli;
+   struct rpc_pipe_client *cli;
TALLOC_CTX *mem_ctx;
POLICY_HND user_pol;
 } samr_user_hnd_object;

Modified: branches/SAMBA_3_0/source/python/py_spoolss_drivers.c
===
--- branches/SAMBA_3_0/source/python/py_spoolss_drivers.c   2006-05-01 
22:07:12 UTC (rev 15384)
+++ branches/SAMBA_3_0/source/python/py_spoolss_drivers.c   2006-05-01 
22:31:33 UTC (rev 15385)
@@ -70,7 +70,7 @@
}   
 
werror = rpccli_spoolss_enumprinterdrivers(
-   cli, mem_ctx, level, arch,
+   cli->pipe_list, mem_ctx, level, arch,
&num_drivers, &ctr);
 
if (!W_ERROR_IS_OK(werror)) {
@@ -263,7 +263,7 @@
}   
 
werror = rpccli_spoolss_getprinterdriverdir(
-   cli, mem_ctx, level, arch, &ctr);
+   cl

svn commit: samba r15384 - in branches/SAMBA_4_0/source: auth/kerberos build/smb_build lib/socket libcli libcli/ldap librpc utils

2006-05-01 Thread jelmer
Author: jelmer
Date: 2006-05-01 22:07:12 + (Mon, 01 May 2006)
New Revision: 15384

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15384

Log:
Improve naming of socket library, disable Requires(.private)? fields in 
pkg-config files for now as
they break external projects.

Modified:
   branches/SAMBA_4_0/source/auth/kerberos/config.mk
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/lib/socket/config.mk
   branches/SAMBA_4_0/source/libcli/config.mk
   branches/SAMBA_4_0/source/libcli/ldap/config.mk
   branches/SAMBA_4_0/source/librpc/config.mk
   branches/SAMBA_4_0/source/utils/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/auth/kerberos/config.mk
===
--- branches/SAMBA_4_0/source/auth/kerberos/config.mk   2006-05-01 20:58:49 UTC 
(rev 15383)
+++ branches/SAMBA_4_0/source/auth/kerberos/config.mk   2006-05-01 22:07:12 UTC 
(rev 15384)
@@ -9,7 +9,7 @@
kerberos_pac.o \
gssapi_parse.o \
krb5_init_context.o
-PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC LIBSAMBA-SOCKET LIBCLI_RESOLVE
+PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC samba-socket LIBCLI_RESOLVE
 PRIVATE_DEPENDENCIES = ASN1_UTIL HEIMDAL_ROKEN_ADDRINFO auth_sam
 # End SUBSYSTEM KERBEROS
 #

Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm   2006-05-01 
20:58:49 UTC (rev 15383)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm   2006-05-01 
22:07:12 UTC (rev 15384)
@@ -442,7 +442,7 @@
foreach (@{$ctx->{PUBLIC_DEPENDENCIES}}) {
 #  next unless ($self-> ) {
 
-   $pubs .= "$_ ";
+#FIXME $pubs .= "$_ ";
}
}
 
@@ -450,7 +450,7 @@
foreach (@{$ctx->{PRIVATE_DEPENDENCIES}}) {
 #  next unless ($self-> ) {
 
-   $privs .= "$_ ";
+#FIXME $privs .= "$_ ";
}
}
 

Modified: branches/SAMBA_4_0/source/lib/socket/config.mk
===
--- branches/SAMBA_4_0/source/lib/socket/config.mk  2006-05-01 20:58:49 UTC 
(rev 15383)
+++ branches/SAMBA_4_0/source/lib/socket/config.mk  2006-05-01 22:07:12 UTC 
(rev 15384)
@@ -2,7 +2,7 @@
 
 # Start MODULE socket_ipv4
 [MODULE::socket_ipv4]
-SUBSYSTEM = LIBSAMBA-SOCKET
+SUBSYSTEM = samba-socket
 OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
socket_ipv4.o
@@ -14,7 +14,7 @@
 
 # Start MODULE socket_ipv6
 [MODULE::socket_ipv6]
-SUBSYSTEM = LIBSAMBA-SOCKET
+SUBSYSTEM = samba-socket
 OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
socket_ipv6.o
@@ -25,7 +25,7 @@
 
 # Start MODULE socket_unix
 [MODULE::socket_unix]
-SUBSYSTEM = LIBSAMBA-SOCKET
+SUBSYSTEM = samba-socket
 OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
socket_unix.o
@@ -35,7 +35,7 @@
 
 
 # Start SUBSYSTEM SOCKET
-[SUBSYSTEM::LIBSAMBA-SOCKET]
+[SUBSYSTEM::samba-socket]
 OBJ_FILES = \
socket.o \
access.o \

Modified: branches/SAMBA_4_0/source/libcli/config.mk
===
--- branches/SAMBA_4_0/source/libcli/config.mk  2006-05-01 20:58:49 UTC (rev 
15383)
+++ branches/SAMBA_4_0/source/libcli/config.mk  2006-05-01 22:07:12 UTC (rev 
15384)
@@ -54,7 +54,7 @@
nbt/namerefresh.o \
nbt/namerelease.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT LIBCLI_COMPOSITE LIBEVENTS \
-   NDR_SECURITY LIBSAMBA-SOCKET
+   NDR_SECURITY samba-socket
 
 [SUBSYSTEM::LIBCLI_DGRAM]
 OBJ_FILES = \
@@ -80,7 +80,7 @@
 DESCRIPTION = WINS Replication client library
 OBJ_FILES = \
wrepl/winsrepl.o
-PUBLIC_DEPENDENCIES = NDR_WINSREPL LIBSAMBA-SOCKET LIBCLI_RESOLVE LIBEVENTS
+PUBLIC_DEPENDENCIES = NDR_WINSREPL samba-socket LIBCLI_RESOLVE LIBEVENTS
 
 [SUBSYSTEM::LIBCLI_RESOLVE]
 PRIVATE_PROTO_HEADER = resolve/proto.h
@@ -114,12 +114,12 @@
clideltree.o
 PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIBSECURITY LIBCLI_RESOLVE \
-   LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS LIBSAMBA-SOCKET
+   LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba-socket
 
 [SUBSYSTEM::LIBCLI_RAW]
 PRIVATE_PROTO_HEADER = raw/raw_proto.h
 PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE 
-PUBLIC_DEPENDENCIES = LIBSAMBA-SOCKET LIBPACKET gensec LIBCRYPTO
+PUBLIC_DEPENDENCIES = samba-socket LIBPACKET gensec LIBCRYPTO
 LDFLAGS = $(SUBSYSTEM_LIBCLI_SMB_COMPOSITE_OUTPUT)
 OBJ_FILES = raw/rawfile.

svn commit: samba-web r973 - in trunk/projects: .

2006-05-01 Thread abartlet
Author: abartlet
Date: 2006-05-01 21:56:27 + (Mon, 01 May 2006)
New Revision: 973

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=973

Log:
Some project ideas. 

Andrew Bartlett

Modified:
   trunk/projects/summercode06.html


Changeset:
Modified: trunk/projects/summercode06.html
===
--- trunk/projects/summercode06.html2006-05-01 15:03:03 UTC (rev 972)
+++ trunk/projects/summercode06.html2006-05-01 21:56:27 UTC (rev 973)
@@ -176,4 +176,37 @@
   analyzing completely new protocols. Talk to [EMAIL PROTECTED] for
   details.
 
+  GQ replacement using GTK and LDB
+  GQ is a widely used LDAP query tool.  Unfortunetly, it has some
+  annoying habits (stealing the mouse when it crashes), and is
+  unmaintained.  Many LDAP administrators would benifit if a similar
+  tool were constructed, in particular with similar schema knowlege.
+  Using LDB as a backend could allow easy use of Samba-supported SASL
+  mechanisms for easier authentication.  Talk to
+  [EMAIL PROTECTED]
+
+  GQ replacement in Samba4's SWAT
+  Likewise to the above proposal, an LDB editor in SWAT would be
+  very useful.  Builting it with interactive (AJAX like) functionalty
+  would make it a very powerful way to manage Samba4's LDB databases.
+  Talk to [EMAIL PROTECTED]
+
+  Samba4 using a real LDAP backend server
+  Currently, Samba4 can use either an in-memory database, or a LDAP
+  server as the backend for it's primary user database.  The LDAP
+  backend server alternative is currently very restricted: The only
+  supported server is a matching version of Samba4.  This project
+  would be to advance this support.  Initial steps would be to load
+  the provision, then permit password changes.  Eventual support would
+  include schema mapping. (Participants should discuss with
+  [EMAIL PROTECTED], and work out how far would be reasonable to
+  support in the timeframe). 
+
+  User Manager for Samba4 SWAT
+  Samba4 needs a user manger tool, built into the SWAT server.
+  This could be a new tool, or an existing tool ported to Samba4.  It
+  would benifit from being interactive without page load delays,
+  (possibly AJAX), and should at least allow modification of similar
+  properties to MMC
+
 



svn commit: samba r15383 - in branches/SAMBA_4_0/source: .

2006-05-01 Thread jelmer
Author: jelmer
Date: 2006-05-01 20:58:49 + (Mon, 01 May 2006)
New Revision: 15383

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15383

Log:
Revert making DSO's the default - this caused a few test suite breakages.

Modified:
   branches/SAMBA_4_0/source/configure.in


Changeset:
Modified: branches/SAMBA_4_0/source/configure.in
===
--- branches/SAMBA_4_0/source/configure.in  2006-05-01 20:57:15 UTC (rev 
15382)
+++ branches/SAMBA_4_0/source/configure.in  2006-05-01 20:58:49 UTC (rev 
15383)
@@ -48,6 +48,13 @@
 sinclude(lib/appweb/config.m4)
 sinclude(nsswitch/config.m4)
 
+AC_ARG_ENABLE(dso,
+[  --enable-dsoEnable building internal libraries as DSO's 
(experimental)],
+[ if test x$enable_dso != xyes; then
+   BLDSHARED=false
+  fi], 
+[BLDSHARED=false])
+
 #
 # add *_CFLAGS only for the real build
 CFLAGS="${CFLAGS} ${DEVELOPER_CFLAGS}"



svn commit: samba r15382 - in branches/SAMBA_4_0/source/lib/replace: .

2006-05-01 Thread paulg
Author: paulg
Date: 2006-05-01 20:57:15 + (Mon, 01 May 2006)
New Revision: 15382

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15382

Log:
Use grp.h in this block; it has been cleaned out of the other headers that 
formerly included it for us.

Paul

Modified:
   branches/SAMBA_4_0/source/lib/replace/replace.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/replace.c
===
--- branches/SAMBA_4_0/source/lib/replace/replace.c 2006-05-01 20:13:25 UTC 
(rev 15381)
+++ branches/SAMBA_4_0/source/lib/replace/replace.c 2006-05-01 20:57:15 UTC 
(rev 15382)
@@ -200,6 +200,9 @@
errno = ENOSYS;
return -1;
 #else /* HAVE_SETGROUPS */
+
+#include 
+
gid_t *grouplst = NULL;
int max_gr = groups_max();
int ret;



svn commit: samba r15381 - in branches/SAMBA_4_0/source: . build/smb_build

2006-05-01 Thread jelmer
Author: jelmer
Date: 2006-05-01 20:13:25 + (Mon, 01 May 2006)
New Revision: 15381

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15381

Log:
Make shared libraries the default (where supported). This concludes my rewrite 
of the build system, which I'm (overall) 
pretty happy with now. I'll continue making smaller changes, but they won't 
have as much impact as the changes I've made in the past months.

Modified:
   branches/SAMBA_4_0/source/build/smb_build/TODO
   branches/SAMBA_4_0/source/configure.in


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/TODO
===
--- branches/SAMBA_4_0/source/build/smb_build/TODO  2006-05-01 18:54:53 UTC 
(rev 15380)
+++ branches/SAMBA_4_0/source/build/smb_build/TODO  2006-05-01 20:13:25 UTC 
(rev 15381)
@@ -1,11 +1,10 @@
-- Add --export-dynamic for each subsystem that has modules
 - let the build system implement some make 
functions($(patsubst),$(wildcard),...) and use our own implementations where 
`make' does not support them
 - include extra_flags.txt using Makefile construction if 
   supported by current make
-- make --enable-dso the default
-- fix shared module loading for selftest during non-developer builds without 
install
+- fix shared module loading for selftest during builds without install
 - remove recursive dependency between LIBSOCKET, LIBCLI_NBT and LIBCLI_RESOLVE
-- clearer distinction between dcerpc and ndr. seperate interface tables?
+- clearer distinction between dcerpc and ndr. seperate interface tables? Maybe 
get rid of 
+  NDR's table altogether and use dlopen/dlsym ?
 - saner names for:
libcli.so.0.0.1 (rename to libsmb?)
libcli_cldap.so.0.0.1 (rename to libcldap?)

Modified: branches/SAMBA_4_0/source/configure.in
===
--- branches/SAMBA_4_0/source/configure.in  2006-05-01 18:54:53 UTC (rev 
15380)
+++ branches/SAMBA_4_0/source/configure.in  2006-05-01 20:13:25 UTC (rev 
15381)
@@ -48,13 +48,6 @@
 sinclude(lib/appweb/config.m4)
 sinclude(nsswitch/config.m4)
 
-AC_ARG_ENABLE(dso,
-[  --enable-dsoEnable building internal libraries as DSO's 
(experimental)],
-[ if test x$enable_dso != xyes; then
-   BLDSHARED=false
-  fi], 
-[BLDSHARED=false])
-
 #
 # add *_CFLAGS only for the real build
 CFLAGS="${CFLAGS} ${DEVELOPER_CFLAGS}"



svn commit: samba r15380 - branches/SAMBA_3_0/source/rpc_server trunk/source/rpc_server

2006-05-01 Thread jerry
Author: jerry
Date: 2006-05-01 18:54:53 + (Mon, 01 May 2006)
New Revision: 15380

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15380

Log:
default eventlog tdbs to mode 0660 to allow easier access by 
BUILTIN\Administrators
Modified:
   branches/SAMBA_3_0/source/rpc_server/srv_eventlog_lib.c
   trunk/source/rpc_server/srv_eventlog_lib.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpc_server/srv_eventlog_lib.c
===
--- branches/SAMBA_3_0/source/rpc_server/srv_eventlog_lib.c 2006-05-01 
18:11:15 UTC (rev 15379)
+++ branches/SAMBA_3_0/source/rpc_server/srv_eventlog_lib.c 2006-05-01 
18:54:53 UTC (rev 15380)
@@ -39,7 +39,7 @@
tdbfilename));
 
tdb = tdb_open_log( tdbfilename, 0, TDB_DEFAULT, 
-   O_RDWR|O_CREAT|O_TRUNC, 0600 );
+   O_RDWR|O_CREAT|O_TRUNC, 0660 );
 
if ( !tdb ) {
DEBUG( 0, ( "Can't open tdb for [%s]\n", tdbfilename ) );

Modified: trunk/source/rpc_server/srv_eventlog_lib.c
===
--- trunk/source/rpc_server/srv_eventlog_lib.c  2006-05-01 18:11:15 UTC (rev 
15379)
+++ trunk/source/rpc_server/srv_eventlog_lib.c  2006-05-01 18:54:53 UTC (rev 
15380)
@@ -39,7 +39,7 @@
tdbfilename));
 
tdb = tdb_open_log( tdbfilename, 0, TDB_DEFAULT, 
-   O_RDWR|O_CREAT|O_TRUNC, 0600 );
+   O_RDWR|O_CREAT|O_TRUNC, 0660 );
 
if ( !tdb ) {
DEBUG( 0, ( "Can't open tdb for [%s]\n", tdbfilename ) );



svn commit: samba r15379 - in branches/SAMBA_4_0/source: auth auth/kerberos build/m4 build/smb_build kdc ldap_server libcli/raw ntvfs ntvfs/posix rpc_server rpc_server/common

2006-05-01 Thread jelmer
Author: jelmer
Date: 2006-05-01 18:11:15 + (Mon, 01 May 2006)
New Revision: 15379

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15379

Log:
Fix shared library build's unresolved dependencies

Modified:
   branches/SAMBA_4_0/source/auth/auth_simple.c
   branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c
   branches/SAMBA_4_0/source/build/m4/check_ld.m4
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/kdc/config.mk
   branches/SAMBA_4_0/source/ldap_server/config.mk
   branches/SAMBA_4_0/source/libcli/raw/rawioctl.c
   branches/SAMBA_4_0/source/ntvfs/config.mk
   branches/SAMBA_4_0/source/ntvfs/posix/config.mk
   branches/SAMBA_4_0/source/rpc_server/common/share_info.c
   branches/SAMBA_4_0/source/rpc_server/config.mk
   branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c
   branches/SAMBA_4_0/source/rpc_server/handles.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/auth_simple.c
===
--- branches/SAMBA_4_0/source/auth/auth_simple.c2006-05-01 15:45:26 UTC 
(rev 15378)
+++ branches/SAMBA_4_0/source/auth/auth_simple.c2006-05-01 18:11:15 UTC 
(rev 15379)
@@ -26,7 +26,7 @@
 #include "auth/auth.h"
 #include "lib/events/events.h"
 
-NTSTATUS authenticate_username_pw(TALLOC_CTX *mem_ctx, 
+_PUBLIC_ NTSTATUS authenticate_username_pw(TALLOC_CTX *mem_ctx, 
  const char *nt4_domain, 
  const char *nt4_username, 
  const char *password, 

Modified: branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c
===
--- branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c  2006-05-01 
15:45:26 UTC (rev 15378)
+++ branches/SAMBA_4_0/source/auth/kerberos/kerberos_pac.c  2006-05-01 
18:11:15 UTC (rev 15379)
@@ -312,7 +312,7 @@
return status;
 }
 
- NTSTATUS kerberos_pac_logon_info(TALLOC_CTX *mem_ctx,
+_PUBLIC_  NTSTATUS kerberos_pac_logon_info(TALLOC_CTX *mem_ctx,
  struct PAC_LOGON_INFO **logon_info,
  DATA_BLOB blob,
  krb5_context context,

Modified: branches/SAMBA_4_0/source/build/m4/check_ld.m4
===
--- branches/SAMBA_4_0/source/build/m4/check_ld.m4  2006-05-01 15:45:26 UTC 
(rev 15378)
+++ branches/SAMBA_4_0/source/build/m4/check_ld.m4  2006-05-01 18:11:15 UTC 
(rev 15379)
@@ -138,7 +138,7 @@
*next2*) AC_DEFINE(NEXT2,1,[Whether the host os is NeXT v2])
AC_DEFINE(STAT_ST_BLOCKSIZE,512)
;;
-   *dgux*) AC_CHECK_PROG( ROFF, groff, [groff -etpsR -Tascii -man])
+   *dgux*) 
AC_DEFINE(STAT_ST_BLOCKSIZE,512)
;;
*sysv4*) AC_DEFINE(SYSV,1,[Whether this is a system V system])

Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm   2006-05-01 
15:45:26 UTC (rev 15378)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm   2006-05-01 
18:11:15 UTC (rev 15379)
@@ -392,7 +392,7 @@
 #
 bin/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) 
\$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) 
[EMAIL PROTECTED] Linking \$\@
-   [EMAIL PROTECTED](CC) \$(LDFLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) 
\$(INSTALL_LINK_FLAGS) \\
+   [EMAIL PROTECTED](CC) \$(DYNEXP) \$(LDFLAGS) -o \$\@ 
\$(LOCAL_LINK_FLAGS) \$(INSTALL_LINK_FLAGS) \\
\$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) 
 
 __EOD__
@@ -402,7 +402,7 @@
 $self->output(<< "__EOD__"
 $installdir/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) 
\$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) 
[EMAIL PROTECTED] Linking \$\@
-   [EMAIL PROTECTED](CC) \$(LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
+   [EMAIL PROTECTED](CC) \$(DYNEXP) \$(LDFLAGS) -o \$\@ 
\$(INSTALL_LINK_FLAGS) \\
\$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) 
 
 __EOD__

Modified: branches/SAMBA_4_0/source/kdc/config.mk
===
--- branches/SAMBA_4_0/source/kdc/config.mk 2006-05-01 15:45:26 UTC (rev 
15378)
+++ branches/SAMBA_4_0/source/kdc/config.mk 2006-05-01 18:11:15 UTC (rev 
15379)
@@ -21,7 +21,7 @@
hdb-ldb.o \
pac-glue.o 
 PUBLIC_DEPENDENCIES = \
-   ldb auth_sam 
+   ldb auth_sam KERBEROS
 # End SUBSYSTEM KDC
 ###
 

Modified: branches/SAMBA_4_0/source/ldap_server/config.mk
===
--- branches/SAMBA_4_0/source/ldap_server/config.mk 2006-05-01 15:45:26 UTC 
(rev 15378)
+++ branches/SAMBA_4_0/source/ldap_server/config.mk 2006-05-01 18

svn commit: samba r15378 - in branches/SAMBA_4_0/source/script: .

2006-05-01 Thread jelmer
Author: jelmer
Date: 2006-05-01 15:45:26 + (Mon, 01 May 2006)
New Revision: 15378

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15378

Log:
Fix installheader script. Alexander, this will break installation of headers 
for srcdir != builddir

Modified:
   branches/SAMBA_4_0/source/script/installheader.pl


Changeset:
Modified: branches/SAMBA_4_0/source/script/installheader.pl
===
--- branches/SAMBA_4_0/source/script/installheader.pl   2006-05-01 14:33:48 UTC 
(rev 15377)
+++ branches/SAMBA_4_0/source/script/installheader.pl   2006-05-01 15:45:26 UTC 
(rev 15378)
@@ -2,18 +2,16 @@
 # Copyright (C) 2006 Jelmer Vernooij
 use strict;
 use File::Basename;
-use Cwd 'abs_path';
 
 my $includedir = shift;
-my $builddir = abs_path($ENV{samba_builddir});
-my $srcdir = abs_path($ENV{samba_srcdir});
 
+
 sub read_headermap($)
 {
my ($fn) = @_;
my %map = ();
my $ln = 0;
-   open(MAP, "<$fn");
+   open(MAP, ") {
$ln++;
s/#.*$//g;
@@ -30,19 +28,14 @@
return %map;
 }
 
-my %map = read_headermap("$srcdir/headermap.txt");
+my %map = read_headermap("headermap.txt");
 
 sub findmap($)
 {
$_ = shift;
s/^\.\///g;
-   s/$builddir\///g;
-   s/$srcdir\///g;
 
if (! -f $_ && -f "lib/$_") { $_ = "lib/$_"; }
-   if ($srcdir !~ $builddir) {
-if (! -f "$srcdir/$_" && -f "$srcdir/lib/$_") { $_ = "lib/$_"; }
-   }

return $map{$_};
 }
@@ -62,7 +55,7 @@
 
my $lineno = 0;
 
-   open(IN, "<$src") || open(IN, "<$srcdir/$src");
+   open(IN, "<$src");
open(OUT, ">$dst");
 
while () {



svn commit: samba-web r972 - in trunk/news/announcements: .

2006-05-01 Thread deryck
Author: deryck
Date: 2006-05-01 15:03:03 + (Mon, 01 May 2006)
New Revision: 972

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=972

Log:
Fix broken link (spotted by Cory Councilman).

deryck


Modified:
   trunk/news/announcements/summer_code06.html


Changeset:
Modified: trunk/news/announcements/summer_code06.html
===
--- trunk/news/announcements/summer_code06.html 2006-05-01 11:25:38 UTC (rev 
971)
+++ trunk/news/announcements/summer_code06.html 2006-05-01 15:03:03 UTC (rev 
972)
@@ -17,7 +17,7 @@
   Today, 1 May 2006, is the day Google has planned to start accepting 
   applications from students.  For a list of potential projects in Samba 
   development, see our
-  Summer of Code '06 project
+  Summer of Code '06 project
   page.
 
 



svn commit: samba r15377 - in branches/SAMBA_4_0/source/lib: replace util

2006-05-01 Thread jelmer
Author: jelmer
Date: 2006-05-01 14:33:48 + (Mon, 01 May 2006)
New Revision: 15377

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15377

Log:
Remove sys_select() code as it's no longer used.

Removed:
   branches/SAMBA_4_0/source/lib/util/select.c
Modified:
   branches/SAMBA_4_0/source/lib/replace/readline.c
   branches/SAMBA_4_0/source/lib/util/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/readline.c
===
--- branches/SAMBA_4_0/source/lib/replace/readline.c2006-05-01 13:39:36 UTC 
(rev 15376)
+++ branches/SAMBA_4_0/source/lib/replace/readline.c2006-05-01 14:33:48 UTC 
(rev 15377)
@@ -25,6 +25,51 @@
 #include 
 #include "system/readline.h"
 
+/***
+ Similar to sys_select() but catch EINTR and continue.
+ This is what sys_select() used to do in Samba.
+/
+
+int sys_select_intr(int maxfd, fd_set *readfds, fd_set *writefds, fd_set 
*errorfds, struct timeval *tval)
+{
+   int ret;
+   fd_set *readfds2, readfds_buf, *writefds2, writefds_buf, *errorfds2, 
errorfds_buf;
+   struct timeval tval2, *ptval;
+
+   readfds2 = (readfds ? &readfds_buf : NULL);
+   writefds2 = (writefds ? &writefds_buf : NULL);
+   errorfds2 = (errorfds ? &errorfds_buf : NULL);
+   ptval = (tval ? &tval2 : NULL);
+
+   do {
+   if (readfds)
+   readfds_buf = *readfds;
+   if (writefds)
+   writefds_buf = *writefds;
+   if (errorfds)
+   errorfds_buf = *errorfds;
+   if (tval)
+   tval2 = *tval;
+
+   /* We must use select and not sys_select here. If we use
+  sys_select we'd lose the fact a signal occurred when 
sys_select
+  read a byte from the pipe. Fix from Mark Weaver
+  <[EMAIL PROTECTED]>
+   */
+
+   ret = select(maxfd, readfds2, writefds2, errorfds2, ptval);
+   } while (ret == -1 && errno == EINTR);
+
+   if (readfds)
+   *readfds = readfds_buf;
+   if (writefds)
+   *writefds = writefds_buf;
+   if (errorfds)
+   *errorfds = errorfds_buf;
+
+   return ret;
+}
+
 /
  Display the prompt and wait for input. Call callback() regularly
 /

Modified: branches/SAMBA_4_0/source/lib/util/config.mk
===
--- branches/SAMBA_4_0/source/lib/util/config.mk2006-05-01 13:39:36 UTC 
(rev 15376)
+++ branches/SAMBA_4_0/source/lib/util/config.mk2006-05-01 14:33:48 UTC 
(rev 15377)
@@ -25,7 +25,6 @@
substitute.o \
fsusage.o \
ms_fnmatch.o \
-   select.o \
mutex.o \
idtree.o \
module.o

Deleted: branches/SAMBA_4_0/source/lib/util/select.c
===
--- branches/SAMBA_4_0/source/lib/util/select.c 2006-05-01 13:39:36 UTC (rev 
15376)
+++ branches/SAMBA_4_0/source/lib/util/select.c 2006-05-01 14:33:48 UTC (rev 
15377)
@@ -1,169 +0,0 @@
-/* 
-   Unix SMB/Netbios implementation.
-   Version 3.0
-   Samba select/poll implementation
-   Copyright (C) Andrew Tridgell 1992-1998
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-#include "system/filesys.h"
-
-/* This is here because it allows us to avoid a nasty race in signal handling. 
-   We need to guarantee that when we get a signal we get out of a select 
immediately
-   but doing that involves a race condition. We can avoid the race by getting 
the 
-   signal handler to write to a pipe that is in the select/poll list 
-
-   This means all Samba signal handlers should call sys_select_signal().
-*/
-
-static pid_t initialised;
-static int select_pipe[2];
-static volatile unsigned pipe_written, pipe_read;
-
-/***
- Call 

svn commit: samba r15376 - in branches/SAMBA_4_0/source: lib lib/socket lib/util librpc

2006-05-01 Thread jelmer
Author: jelmer
Date: 2006-05-01 13:39:36 + (Mon, 01 May 2006)
New Revision: 15376

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15376

Log:
Add detection of -lnsl, required for building on SUN boxes.

Modified:
   branches/SAMBA_4_0/source/lib/basic.mk
   branches/SAMBA_4_0/source/lib/socket/config.m4
   branches/SAMBA_4_0/source/lib/socket/config.mk
   branches/SAMBA_4_0/source/lib/util/config.mk
   branches/SAMBA_4_0/source/librpc/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/lib/basic.mk
===
--- branches/SAMBA_4_0/source/lib/basic.mk  2006-05-01 13:20:05 UTC (rev 
15375)
+++ branches/SAMBA_4_0/source/lib/basic.mk  2006-05-01 13:39:36 UTC (rev 
15376)
@@ -25,7 +25,7 @@
 OBJ_FILES = \
netif/interface.o \
netif/netif.o
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
+PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL EXT_NSL
 # End SUBSYSTEM LIBNETIF
 ##
 

Modified: branches/SAMBA_4_0/source/lib/socket/config.m4
===
--- branches/SAMBA_4_0/source/lib/socket/config.m4  2006-05-01 13:20:05 UTC 
(rev 15375)
+++ branches/SAMBA_4_0/source/lib/socket/config.m4  2006-05-01 13:39:36 UTC 
(rev 15376)
@@ -37,6 +37,23 @@
 
 
SMB_EXT_LIB(EXT_SOCKET,[${SOCKET_LIBS}],[${SOCKET_CFLAGS}],[${SOCKET_CPPFLAGS}],[${SOCKET_LDFLAGS}])
 
+AC_CHECK_FUNCS(gethostbyname)
+if test x"$ac_cv_func_gethostbyname" = x"no"; then
+AC_CHECK_LIB_EXT(nsl_s, NSL_LIBS, gethostbyname)
+AC_CHECK_LIB_EXT(nsl, NSl_LIBS, gethostbyname)
+AC_CHECK_LIB_EXT(socket, NSL_LIBS, gethostbyname)
+SMB_ENABLE(EXT_NSL,YES)
+dnl We can't just call AC_CHECK_FUNCS(gethostbyname) here, because the 
value
+dnl has been cached.
+if test x"$ac_cv_lib_ext_nsl_s_gethostbyname" != x"yes" &&
+   test x"$ac_cv_lib_ext_nsl_gethostbyname" != x"yes" &&
+   test x"$ac_cv_lib_ext_socket_gethostbyname" != x"yes"; then
+   AC_MSG_ERROR([no gethostbyname() function available!])
+fi
+fi
+
+SMB_EXT_LIB(EXT_NSL,[${NSL_LIBS}],[],[],[])
+
 
 # check for unix domain sockets
 AC_CACHE_CHECK([for unix domain sockets],samba_cv_unixsocket, [

Modified: branches/SAMBA_4_0/source/lib/socket/config.mk
===
--- branches/SAMBA_4_0/source/lib/socket/config.mk  2006-05-01 13:20:05 UTC 
(rev 15375)
+++ branches/SAMBA_4_0/source/lib/socket/config.mk  2006-05-01 13:39:36 UTC 
(rev 15376)
@@ -6,8 +6,8 @@
 OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
socket_ipv4.o
-PUBLIC_DEPENDENCIES = EXT_SOCKET
-PRIVATE_DEPENDENCIES = LIBSAMBA-ERRORS
+PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL
+PRIVATE_DEPENDENCIES = LIBSAMBA-ERRORS 
 # End MODULE socket_ipv4
 
 
@@ -18,7 +18,7 @@
 OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
socket_ipv6.o
-PUBLIC_DEPENDENCIES = EXT_SOCKET
+PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL
 # End MODULE socket_ipv6
 
 
@@ -29,7 +29,7 @@
 OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
socket_unix.o
-PUBLIC_DEPENDENCIES = EXT_SOCKET
+PUBLIC_DEPENDENCIES = EXT_SOCKET EXT_NSL
 # End MODULE socket_unix
 
 

Modified: branches/SAMBA_4_0/source/lib/util/config.mk
===
--- branches/SAMBA_4_0/source/lib/util/config.mk2006-05-01 13:20:05 UTC 
(rev 15375)
+++ branches/SAMBA_4_0/source/lib/util/config.mk2006-05-01 13:39:36 UTC 
(rev 15376)
@@ -31,7 +31,7 @@
module.o
 PUBLIC_DEPENDENCIES = \
LIBREPLACE LIBCRYPTO DL LIBTALLOC \
-   SOCKET_WRAPPER
+   SOCKET_WRAPPER EXT_NSL
 
 [SUBSYSTEM::PIDFILE]
 PRIVATE_PROTO_HEADER = pidfile.h

Modified: branches/SAMBA_4_0/source/librpc/config.mk
===
--- branches/SAMBA_4_0/source/librpc/config.mk  2006-05-01 13:20:05 UTC (rev 
15375)
+++ branches/SAMBA_4_0/source/librpc/config.mk  2006-05-01 13:39:36 UTC (rev 
15376)
@@ -11,7 +11,7 @@
ndr/ndr_basic.o \
ndr/ndr_string.o \
ndr/ndr_misc.o
-PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL CHARSET
+PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL CHARSET EXT_NSL
 # End SUBSYSTEM LIBNDR
 
 



svn commit: samba r15375 - in branches/SAMBA_4_0/source: build/smb_build client lib/registry/tools lib/replace

2006-05-01 Thread jelmer
Author: jelmer
Date: 2006-05-01 13:20:05 + (Mon, 01 May 2006)
New Revision: 15375

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15375

Log:
Rename readline.h to smbreadline.h avoid clashes with system header.

Added:
   branches/SAMBA_4_0/source/lib/replace/smbreadline.h
Removed:
   branches/SAMBA_4_0/source/lib/replace/readline.h
Modified:
   branches/SAMBA_4_0/source/build/smb_build/header.pm
   branches/SAMBA_4_0/source/client/client.c
   branches/SAMBA_4_0/source/lib/registry/tools/regshell.c


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/header.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/header.pm 2006-05-01 13:06:39 UTC 
(rev 15374)
+++ branches/SAMBA_4_0/source/build/smb_build/header.pm 2006-05-01 13:20:05 UTC 
(rev 15375)
@@ -35,8 +35,10 @@
 $key->{TYPE} ne "BINARY");
next unless defined($key->{INIT_FUNCTIONS});
 
+   my $name = $key->{NAME};
+   $name =~ s/-/_/g;
$DEFINE->{COMMENT} = "$key->{TYPE} $key->{NAME} INIT";
-   $DEFINE->{KEY} = "STATIC_$key->{NAME}_MODULES";
+   $DEFINE->{KEY} = "STATIC_$name\_MODULES";
$DEFINE->{VAL} = "{ \\\n";
foreach (@{$key->{INIT_FUNCTIONS}}) {
$DEFINE->{VAL} .= "\t$_, \\\n";

Modified: branches/SAMBA_4_0/source/client/client.c
===
--- branches/SAMBA_4_0/source/client/client.c   2006-05-01 13:06:39 UTC (rev 
15374)
+++ branches/SAMBA_4_0/source/client/client.c   2006-05-01 13:20:05 UTC (rev 
15375)
@@ -38,7 +38,7 @@
 #include "system/time.h" /* needed by some systems for asctime() */
 #include "libcli/resolve/resolve.h"
 #include "libcli/security/security.h"
-#include "lib/replace/readline.h"
+#include "lib/replace/smbreadline.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 
 static int io_bufsize = 64512;

Modified: branches/SAMBA_4_0/source/lib/registry/tools/regshell.c
===
--- branches/SAMBA_4_0/source/lib/registry/tools/regshell.c 2006-05-01 
13:06:39 UTC (rev 15374)
+++ branches/SAMBA_4_0/source/lib/registry/tools/regshell.c 2006-05-01 
13:20:05 UTC (rev 15375)
@@ -25,7 +25,7 @@
 #include "lib/events/events.h"
 #include "lib/registry/reg_backend_rpc.h"
 #include "system/time.h"
-#include "lib/replace/readline.h"
+#include "lib/replace/smbreadline.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
 /* 

Deleted: branches/SAMBA_4_0/source/lib/replace/readline.h
===
--- branches/SAMBA_4_0/source/lib/replace/readline.h2006-05-01 13:06:39 UTC 
(rev 15374)
+++ branches/SAMBA_4_0/source/lib/replace/readline.h2006-05-01 13:20:05 UTC 
(rev 15375)
@@ -1,9 +0,0 @@
-#ifndef __SMBREADLINE_H__
-#define __SMBREADLINE_H__
-
-char *smb_readline(const char *prompt, void (*callback)(void), 
-  char **(completion_fn)(const char *text, int start, int 
end));
-const char *smb_readline_get_line_buffer(void);
-void smb_readline_ca_char(char c);
-
-#endif /* __SMBREADLINE_H__ */

Copied: branches/SAMBA_4_0/source/lib/replace/smbreadline.h (from rev 15371, 
branches/SAMBA_4_0/source/lib/replace/readline.h)



svn commit: samba r15374 - in branches/SAMBA_4_0/source/heimdal_build: .

2006-05-01 Thread jelmer
Author: jelmer
Date: 2006-05-01 13:06:39 + (Mon, 01 May 2006)
New Revision: 15374

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15374

Log:
Make subsystem name shorter - Stratos VOS has a filename length limit of 32

Modified:
   branches/SAMBA_4_0/source/heimdal_build/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===
--- branches/SAMBA_4_0/source/heimdal_build/config.mk   2006-05-01 12:54:36 UTC 
(rev 15373)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk   2006-05-01 13:06:39 UTC 
(rev 15374)
@@ -304,7 +304,7 @@
 CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
 OBJ_FILES = ../heimdal/lib/roken/getprogname.o
 
-[SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME_HOST]
+[SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME_H]
 CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
 OBJ_FILES = ../heimdal/lib/roken/getprogname.ho
 
@@ -415,7 +415,7 @@
../heimdal/lib/vers/print_version.ho \
../lib/replace/snprintf.ho \
../lib/replace/replace.ho
-PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_HOST
+PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H
 # End BINARY asn1_compile
 ###
 
@@ -441,7 +441,7 @@
replace.ho \
../lib/replace/snprintf.ho \
../lib/replace/replace.ho
-PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX 
HEIMDAL_ROKEN_GETPROGNAME_HOST
+PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H
 # End BINARY compile_et
 ###
 



svn commit: samba r15373 - in branches/SAMBA_4_0/source: auth/kerberos heimdal_build lib/socket libcli libcli/ldap librpc utils

2006-05-01 Thread jelmer
Author: jelmer
Date: 2006-05-01 12:54:36 + (Mon, 01 May 2006)
New Revision: 15373

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15373

Log:
Rename SOCKET to LIBSAMBA-SOCKET to prevent name clashes with -lsocket on SUN
boxes.

Modified:
   branches/SAMBA_4_0/source/auth/kerberos/config.mk
   branches/SAMBA_4_0/source/heimdal_build/config.mk
   branches/SAMBA_4_0/source/lib/socket/config.mk
   branches/SAMBA_4_0/source/libcli/config.mk
   branches/SAMBA_4_0/source/libcli/ldap/config.mk
   branches/SAMBA_4_0/source/librpc/config.mk
   branches/SAMBA_4_0/source/utils/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/auth/kerberos/config.mk
===
--- branches/SAMBA_4_0/source/auth/kerberos/config.mk   2006-05-01 06:49:02 UTC 
(rev 15372)
+++ branches/SAMBA_4_0/source/auth/kerberos/config.mk   2006-05-01 12:54:36 UTC 
(rev 15373)
@@ -9,7 +9,7 @@
kerberos_pac.o \
gssapi_parse.o \
krb5_init_context.o
-PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC SOCKET LIBCLI_RESOLVE
+PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC LIBSAMBA-SOCKET LIBCLI_RESOLVE
 PRIVATE_DEPENDENCIES = ASN1_UTIL HEIMDAL_ROKEN_ADDRINFO auth_sam
 # End SUBSYSTEM KERBEROS
 #

Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===
--- branches/SAMBA_4_0/source/heimdal_build/config.mk   2006-05-01 06:49:02 UTC 
(rev 15372)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk   2006-05-01 12:54:36 UTC 
(rev 15373)
@@ -320,7 +320,7 @@
../heimdal/lib/roken/freehostent.o \
../heimdal/lib/roken/copyhostent.o \
../heimdal/lib/roken/hostent_find_fqdn.o
-PRIVATE_DEPENDENCIES = SOCKET
+PRIVATE_DEPENDENCIES = EXT_SOCKET
 
 ###
 # Start SUBSYSTEM HEIMDAL_ROKEN

Modified: branches/SAMBA_4_0/source/lib/socket/config.mk
===
--- branches/SAMBA_4_0/source/lib/socket/config.mk  2006-05-01 06:49:02 UTC 
(rev 15372)
+++ branches/SAMBA_4_0/source/lib/socket/config.mk  2006-05-01 12:54:36 UTC 
(rev 15373)
@@ -2,7 +2,7 @@
 
 # Start MODULE socket_ipv4
 [MODULE::socket_ipv4]
-SUBSYSTEM = SOCKET
+SUBSYSTEM = LIBSAMBA-SOCKET
 OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
socket_ipv4.o
@@ -14,7 +14,7 @@
 
 # Start MODULE socket_ipv6
 [MODULE::socket_ipv6]
-SUBSYSTEM = SOCKET
+SUBSYSTEM = LIBSAMBA-SOCKET
 OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
socket_ipv6.o
@@ -25,7 +25,7 @@
 
 # Start MODULE socket_unix
 [MODULE::socket_unix]
-SUBSYSTEM = SOCKET
+SUBSYSTEM = LIBSAMBA-SOCKET
 OUTPUT_TYPE = INTEGRATED
 OBJ_FILES = \
socket_unix.o
@@ -35,7 +35,7 @@
 
 
 # Start SUBSYSTEM SOCKET
-[SUBSYSTEM::SOCKET]
+[SUBSYSTEM::LIBSAMBA-SOCKET]
 OBJ_FILES = \
socket.o \
access.o \

Modified: branches/SAMBA_4_0/source/libcli/config.mk
===
--- branches/SAMBA_4_0/source/libcli/config.mk  2006-05-01 06:49:02 UTC (rev 
15372)
+++ branches/SAMBA_4_0/source/libcli/config.mk  2006-05-01 12:54:36 UTC (rev 
15373)
@@ -54,7 +54,7 @@
nbt/namerefresh.o \
nbt/namerelease.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT LIBCLI_COMPOSITE LIBEVENTS \
-   NDR_SECURITY SOCKET
+   NDR_SECURITY LIBSAMBA-SOCKET
 
 [SUBSYSTEM::LIBCLI_DGRAM]
 OBJ_FILES = \
@@ -80,7 +80,7 @@
 DESCRIPTION = WINS Replication client library
 OBJ_FILES = \
wrepl/winsrepl.o
-PUBLIC_DEPENDENCIES = NDR_WINSREPL SOCKET LIBCLI_RESOLVE LIBEVENTS
+PUBLIC_DEPENDENCIES = NDR_WINSREPL LIBSAMBA-SOCKET LIBCLI_RESOLVE LIBEVENTS
 
 [SUBSYSTEM::LIBCLI_RESOLVE]
 PRIVATE_PROTO_HEADER = resolve/proto.h
@@ -114,12 +114,12 @@
clideltree.o
 PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIBSECURITY LIBCLI_RESOLVE \
-   LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS SOCKET
+   LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS LIBSAMBA-SOCKET
 
 [SUBSYSTEM::LIBCLI_RAW]
 PRIVATE_PROTO_HEADER = raw/raw_proto.h
 PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE 
-PUBLIC_DEPENDENCIES = SOCKET LIBPACKET gensec LIBCRYPTO
+PUBLIC_DEPENDENCIES = LIBSAMBA-SOCKET LIBPACKET gensec LIBCRYPTO
 LDFLAGS = $(SUBSYSTEM_LIBCLI_SMB_COMPOSITE_OUTPUT)
 OBJ_FILES = raw/rawfile.o \
raw/smb_signing.o \

Modified: branches/SAMBA_4_0/source/libcli/ldap/config.mk
===
--- branches/SAMBA_4_0/source/libcli/ldap/config.mk 2006-05-01 06:49:02 UTC 
(rev 15372)
+++ branches/SAMBA_4_0/source/libcli/ldap/config.mk 2006-0

svn commit: samba-web r971 - in trunk/news/announcements: .

2006-05-01 Thread deryck
Author: deryck
Date: 2006-05-01 11:25:38 + (Mon, 01 May 2006)
New Revision: 971

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=971

Log:
Add news item announcing Summer of Code student sign ups.

deryck

Added:
   trunk/news/announcements/summer_code06.html


Changeset:
Added: trunk/news/announcements/summer_code06.html
===
--- trunk/news/announcements/summer_code06.html 2006-05-01 03:45:34 UTC (rev 
970)
+++ trunk/news/announcements/summer_code06.html 2006-05-01 11:25:38 UTC (rev 
971)
@@ -0,0 +1,24 @@
+Summer of Code '06 Student 
Applications 
+
+
+  Google is doing its http://code.google.com/soc/";>
+  Summer of Code program again this year.  Samba is proud to be 
+  involved again as a mentor organization, so if you're a student and 
+  have some time on your hands this summer, consider signing up.  From
+  the Summer of Code site:
+
+  
+  The SoC is our program to introduce students to the world of Open Source 
+  software development. Last year of the 8744 applicants, 419 students 
were 
+  accepted into the program and more than 80% of them succeeded, which 
means 
+  they received the full stipend of $4500.
+  
+
+  Today, 1 May 2006, is the day Google has planned to start accepting 
+  applications from students.  For a list of potential projects in Samba 
+  development, see our
+  Summer of Code '06 project
+  page.
+
+
+