svn commit: samba r6591 - in branches/SAMBA_4_0/source/scripting/swig: .
Author: tpot
Date: 2005-05-03 06:11:12 + (Tue, 03 May 2005)
New Revision: 6591
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6591
Log:
Add some comments.
Use SWIG %rename to get rid of prefix on every tdb function.
Treat mode_t as an int so we can actually pass a mode argument to
tdb_open().
Modified:
branches/SAMBA_4_0/source/scripting/swig/tdb.i
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/swig/tdb.i
===
--- branches/SAMBA_4_0/source/scripting/swig/tdb.i 2005-05-03 01:48:50 UTC
(rev 6590)
+++ branches/SAMBA_4_0/source/scripting/swig/tdb.i 2005-05-03 06:11:12 UTC
(rev 6591)
@@ -3,7 +3,7 @@
Swig interface to tdb.
- Copyright (C) 2004 Tim Potter <[EMAIL PROTECTED]>
+ Copyright (C) 2004,2005 Tim Potter <[EMAIL PROTECTED]>
** NOTE! The following LGPL license applies to the tdb
** library. This does NOT imply that all of Samba is released
@@ -51,7 +51,6 @@
%}
-
/* The tdb functions will crash if a NULL tdb is passed */
%include exception.i
@@ -63,7 +62,8 @@
}
/* In and out typemaps for the TDB_DATA structure. This is converted to
- and from the Python string type. */
+ and from the Python string type which can contain arbitrary binary
+ data.. */
%typemap(in) TDB_DATA {
if (!PyString_Check($input)) {
@@ -85,7 +85,7 @@
/* Treat a mode_t as an unsigned integer */
-typedef uint_t mode_t;
+typedef int mode_t;
/* flags to tdb_store() */
@@ -103,36 +103,76 @@
#define TDB_CONVERT 16 /* convert endian (internal use) */
#define TDB_BIGENDIAN 32 /* header is big-endian (internal use) */
+%rename tdb_open open;
TDB_CONTEXT *tdb_open(const char *name, int hash_size, int tdb_flags,
int open_flags, mode_t mode);
+%rename tdb_open_ex open_ex;
TDB_CONTEXT *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
int open_flags, mode_t mode,
tdb_log_func log_fn,
tdb_hash_func hash_fn);
+%rename tdb_reopen reopen;
int tdb_reopen(TDB_CONTEXT *tdb);
+
+%rename tdb_reopen_all reopen_all;
int tdb_reopen_all(void);
+%rename tdb_logging_function logging_function;
void tdb_logging_function(TDB_CONTEXT *tdb, tdb_log_func);
+
+%rename tdb_error error;
enum TDB_ERROR tdb_error(TDB_CONTEXT *tdb);
+
+%rename tdb_errorstr errorstr;
const char *tdb_errorstr(TDB_CONTEXT *tdb);
+
+%rename tdb_fetch fetch;
TDB_DATA tdb_fetch(TDB_CONTEXT *tdb, TDB_DATA key);
+
+%rename tdb_delete delete;
int tdb_delete(TDB_CONTEXT *tdb, TDB_DATA key);
+
+%rename tdb_store store;
int tdb_store(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf, int flag =
TDB_REPLACE);
+
+%rename tdb_append append;
int tdb_append(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA new_dbuf);
+
+%rename tdb_close close;
int tdb_close(TDB_CONTEXT *tdb);
+
+%rename tdb_firstkey firstkey;
TDB_DATA tdb_firstkey(TDB_CONTEXT *tdb);
+
+%rename tdb_nextkey nextkey;
TDB_DATA tdb_nextkey(TDB_CONTEXT *tdb, TDB_DATA key);
+
+%rename tdb_traverse traverse;
int tdb_traverse(TDB_CONTEXT *tdb, tdb_traverse_func fn, void *state);
+
+%rename tdb_exists exists;
int tdb_exists(TDB_CONTEXT *tdb, TDB_DATA key);
+
+%rename tdb_lockall lockall;
int tdb_lockall(TDB_CONTEXT *tdb);
+
+%rename tdb_unlockall unlockall;
void tdb_unlockall(TDB_CONTEXT *tdb);
/* Low level locking functions: use with care */
+
+%rename tdb_chainlock chainlock;
int tdb_chainlock(TDB_CONTEXT *tdb, TDB_DATA key);
+
+%rename tdb_chainunlock chainunlock;
int tdb_chainunlock(TDB_CONTEXT *tdb, TDB_DATA key);
/* Debug functions. Not used in production. */
+
+%rename tdb_dump_all dump_all;
void tdb_dump_all(TDB_CONTEXT *tdb);
+
+%rename tdb_printfreelist printfreelist;
int tdb_printfreelist(TDB_CONTEXT *tdb);
svn commit: samba r6590 - in branches/SAMBA_4_0/source/scripting/swig: .
Author: tpot Date: 2005-05-03 01:48:50 + (Tue, 03 May 2005) New Revision: 6590 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6590 Log: Remove bogus library versioning variables from swig wrappers. Modified: branches/SAMBA_4_0/source/scripting/swig/config.mk Changeset: Modified: branches/SAMBA_4_0/source/scripting/swig/config.mk === --- branches/SAMBA_4_0/source/scripting/swig/config.mk 2005-05-03 01:48:24 UTC (rev 6589) +++ branches/SAMBA_4_0/source/scripting/swig/config.mk 2005-05-03 01:48:50 UTC (rev 6590) @@ -1,11 +1,5 @@ [LIBRARY::swig_tdb] -MAJOR_VERSION = 0 -MINOR_VERSION = 0 -RELEASE_VERSION = 1 REQUIRED_SUBSYSTEMS = LIBTDB [LIBRARY::swig_dcerpc] -MAJOR_VERSION = 0 -MINOR_VERSION = 0 -RELEASE_VERSION = 1 REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBBASIC CONFIG RPC_NDR_SAMR RPC_NDR_LSA
svn commit: samba r6589 - in branches/SAMBA_4_0/source/build/smb_build: .
Author: tpot
Date: 2005-05-03 01:48:24 + (Tue, 03 May 2005)
New Revision: 6589
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6589
Log:
Make the library versioning options for building a shared library optional.
This will allow us to build unversioned libraries suitable for loading
using dlopen() i.e for the swig wrappers.
Modified:
branches/SAMBA_4_0/source/build/smb_build/input.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/input.pm 2005-05-02 21:30:57 UTC
(rev 6588)
+++ branches/SAMBA_4_0/source/build/smb_build/input.pm 2005-05-03 01:48:24 UTC
(rev 6589)
@@ -114,9 +114,16 @@
}
$lib->{OUTPUT_TYPE} = "SHARED_LIBRARY";
- $lib->{MAJOR_VERSION} = join('', @{$lib->{MAJOR_VERSION}});
- $lib->{MINOR_VERSION} = join('', @{$lib->{MINOR_VERSION}});
- $lib->{RELEASE_VERSION} = join('', @{$lib->{RELEASE_VERSION}});
+
+ if (defined($lib->{MAJOR_VERSION})) {
+ $lib->{MAJOR_VERSION} = join('', $lib->{MAJOR_VERSION});
+ }
+ if (defined($lib->{MINOR_VERSION})) {
+ $lib->{MINOR_VERSION} = join('', $lib->{MINOR_VERSION});
+ }
+ if (defined($lib->{RELEASE_VERSION})) {
+ $lib->{RELEASE_VERSION} = join('', $lib->{RELEASE_VERSION});
+ }
}
sub check_binary($$)
Build status as of Tue May 3 00:00:01 2005
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2005-05-02 00:00:20.0 + +++ /home/build/master/cache/broken_results.txt 2005-05-03 00:00:26.0 + @@ -1,4 +1,4 @@ -Build status as of Mon May 2 00:00:02 2005 +Build status as of Tue May 3 00:00:01 2005 Build counts: Tree Total Broken Panic @@ -9,7 +9,7 @@ samba1 0 0 samba-docs 0 0 0 samba4 38 22 0 -samba_3_038 8 0 +samba_3_038 5 0 Currently broken builds: Host Tree Compiler Status @@ -19,9 +19,7 @@ rhonwynsamba_3_0gcc-4.0ok/ 2/?/? rhonwynsamba4 tccok/ 2/?/? shelob ccache iccok/ok/ok/ 2 -aretnapsamba_3_0gccok/ok/ok/ 1 aretnapccache iccok/ok/ok/ 1 -aretnapsamba_3_0iccok/ok/ok/ 2 gc4samba4 gccok/ 1/?/? manhattan samba4 cc ok/ 1/?/? sbfsamba4 gccok/ 1/?/? @@ -41,7 +39,6 @@ gc20 samba4 gccok/ 2/?/? sun1 samba4 cc ok/ 2/?/? sun1 samba4 gccok/ 2/?/? -sun1 samba_3_0gccok/ok/ok/ 1 fire1 samba4 gccok/ 2/?/? m30ccache gccok/ok/ok/ 2 m30rsyncgccok/ok/ok/ 2
svn commit: samba r6588 - in branches/SAMBA_3_0/source/lib: .
Author: herb
Date: 2005-05-02 21:30:57 + (Mon, 02 May 2005)
New Revision: 6588
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6588
Log:
just include includes.h to get prototypes here.
Modified:
branches/SAMBA_3_0/source/lib/dummyroot.c
branches/SAMBA_3_0/source/lib/dummysmbd.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/dummyroot.c
===
--- branches/SAMBA_3_0/source/lib/dummyroot.c 2005-05-02 17:53:09 UTC (rev
6587)
+++ branches/SAMBA_3_0/source/lib/dummyroot.c 2005-05-02 21:30:57 UTC (rev
6588)
@@ -22,8 +22,7 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
-void become_root(void);
-void unbecome_root(void);
+#include "includes.h"
void become_root(void)
{
Modified: branches/SAMBA_3_0/source/lib/dummysmbd.c
===
--- branches/SAMBA_3_0/source/lib/dummysmbd.c 2005-05-02 17:53:09 UTC (rev
6587)
+++ branches/SAMBA_3_0/source/lib/dummysmbd.c 2005-05-02 21:30:57 UTC (rev
6588)
@@ -22,7 +22,7 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
-void decrement_smbd_process_count( void );
+#include "includes.h"
void decrement_smbd_process_count( void )
{
Re: svn commit: samba r6586 - in branches/SAMBA_3_0/source: lib libads libsmb smbd tests torture
[EMAIL PROTECTED] writes:
> [EMAIL PROTECTED] writes:
>
>> Log:
>> get rid of a few more compiler warnings
>>
>> Modified: branches/SAMBA_3_0/source/lib/dummyroot.c
>> ===
>> --- branches/SAMBA_3_0/source/lib/dummyroot.c2005-05-02 16:23:02 UTC
>> (rev 6585)
>> +++ branches/SAMBA_3_0/source/lib/dummyroot.c2005-05-02 17:49:43 UTC
>> (rev 6586)
>> @@ -22,6 +22,9 @@
>> /* Stupid dummy functions required due to the horrible dependency mess
>> in Samba. */
>>
>> +void become_root(void);
>> +void unbecome_root(void);
>> +
>> void become_root(void)
>> {
>> return;
>>
>
> Herb, I don't get it. What is the purpose of a forward declaration
> immediately prior to an actual function declaration? What type of warning
> were you getting that this solves?
Herb, in talking with abartlet, I now understand what problem this was trying
to solve. These are public functions, and therefore should have calls by
external (not in the same file) users. (If not, they'd likely be declared
static.) These stub functions that you have corrected should, as you
discovered, have external declarations as well. Since the callers are
intended to be external, the external declarations should really be in a
header file so that all callers to these functions are using the same external
declaration. By putting the external declarations in the C file with the
function declaration, the warning is removed, but the "purpose" of the warning
is defeated.
In our discussion, abartlet and I agreed that the proper place for these
declarations is probably in proto.h, which raises the question as to why they
are not automagically being added to proto.h. Would you like to try to figure
out why they're not being generated in proto.h, and perhaps fix it so they
are?
If there is some reason that they shouldn't in fact, go in proto.h, then it
seems that includes.h would likely be the right place for them.
Cheers,
Derrell
Re: svn commit: samba r6586 - in branches/SAMBA_3_0/source: lib libads libsmb smbd tests torture
[EMAIL PROTECTED] writes:
> Log:
> get rid of a few more compiler warnings
>
> Modified: branches/SAMBA_3_0/source/lib/dummyroot.c
> ===
> --- branches/SAMBA_3_0/source/lib/dummyroot.c 2005-05-02 16:23:02 UTC (rev
> 6585)
> +++ branches/SAMBA_3_0/source/lib/dummyroot.c 2005-05-02 17:49:43 UTC (rev
> 6586)
> @@ -22,6 +22,9 @@
> /* Stupid dummy functions required due to the horrible dependency mess
> in Samba. */
>
> +void become_root(void);
> +void unbecome_root(void);
> +
> void become_root(void)
> {
> return;
>
Herb, I don't get it. What is the purpose of a forward declaration
immediately prior to an actual function declaration? What type of warning
were you getting that this solves?
Confused,
Derrell
svn commit: samba r6587 - in trunk/source: lib libads libsmb smbd tests torture
Author: herb
Date: 2005-05-02 17:53:09 + (Mon, 02 May 2005)
New Revision: 6587
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6587
Log:
merge change 6586 from SAMBA_3_0
Modified:
trunk/source/lib/dummyroot.c
trunk/source/lib/dummysmbd.c
trunk/source/lib/interfaces.c
trunk/source/lib/sysquotas.c
trunk/source/lib/sysquotas_4A.c
trunk/source/lib/sysquotas_linux.c
trunk/source/lib/sysquotas_xfs.c
trunk/source/libads/kerberos.c
trunk/source/libsmb/clikrb5.c
trunk/source/smbd/notify_kernel.c
trunk/source/smbd/oplock_linux.c
trunk/source/tests/shlib.c
trunk/source/tests/sysquotas.c
trunk/source/torture/denytest.c
trunk/source/torture/mangle_test.c
trunk/source/torture/torture.c
Changeset:
Modified: trunk/source/lib/dummyroot.c
===
--- trunk/source/lib/dummyroot.c2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/dummyroot.c2005-05-02 17:53:09 UTC (rev 6587)
@@ -22,6 +22,9 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
+void become_root(void);
+void unbecome_root(void);
+
void become_root(void)
{
return;
Modified: trunk/source/lib/dummysmbd.c
===
--- trunk/source/lib/dummysmbd.c2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/dummysmbd.c2005-05-02 17:53:09 UTC (rev 6587)
@@ -22,6 +22,8 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
+void decrement_smbd_process_count( void );
+
void decrement_smbd_process_count( void )
{
return;
Modified: trunk/source/lib/interfaces.c
===
--- trunk/source/lib/interfaces.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/interfaces.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -358,6 +358,8 @@
/* this wrapper is used to remove duplicates from the interface list generated
above */
+int get_interfaces(struct iface_struct *ifaces, int max_interfaces);
+
int get_interfaces(struct iface_struct *ifaces, int max_interfaces)
{
int total, i, j;
Modified: trunk/source/lib/sysquotas.c
===
--- trunk/source/lib/sysquotas.c2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/sysquotas.c2005-05-02 17:53:09 UTC (rev 6587)
@@ -497,6 +497,8 @@
}
#else /* HAVE_SYS_QUOTAS */
+ void dummy_sysquotas_c(void);
+
void dummy_sysquotas_c(void)
{
return;
Modified: trunk/source/lib/sysquotas_4A.c
===
--- trunk/source/lib/sysquotas_4A.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/sysquotas_4A.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -335,5 +335,7 @@
}
#else /* HAVE_QUOTACTL_4A */
+ void dummy_sysquotas_4A(void);
+
void dummy_sysquotas_4A(void){}
#endif /* HAVE_QUOTACTL_4A */
Modified: trunk/source/lib/sysquotas_linux.c
===
--- trunk/source/lib/sysquotas_linux.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/sysquotas_linux.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -556,5 +556,7 @@
}
#else /* HAVE_QUOTACTL_LINUX */
+ void dummy_sysquotas_linux(void);
+
void dummy_sysquotas_linux(void){}
#endif /* HAVE_QUOTACTL_LINUX */
Modified: trunk/source/lib/sysquotas_xfs.c
===
--- trunk/source/lib/sysquotas_xfs.c2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/sysquotas_xfs.c2005-05-02 17:53:09 UTC (rev 6587)
@@ -329,5 +329,7 @@
}
#else /* HAVE_XFS_QUOTAS */
+ void dummy_sysquotas_xfs(void);
+
void dummy_sysquotas_xfs(void){}
#endif /* HAVE_XFS_QUOTAS */
Modified: trunk/source/libads/kerberos.c
===
--- trunk/source/libads/kerberos.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/libads/kerberos.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -247,7 +247,7 @@
Setting principal to NULL deletes this entry.
/
- BOOL kerberos_secrets_store_salting_principal(const char *service,
+BOOL kerberos_secrets_store_salting_principal(const char *service,
int enctype,
const char *principal)
{
Modified: trunk/source/libsmb/clikrb5.c
===
--- trunk/source/libsmb/clikrb5.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/libsmb/clikrb5.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -525,11 +525,13 @@
#if defined(HAVE_KRB5_PRINCIPAL_GET_COMP_STRING) &&
!defined(HAVE_KRB5_PRINC_COMPONENT)
+ const krb5_data *krb5_princ_c
svn commit: samba r6586 - in branches/SAMBA_3_0/source: lib libads libsmb smbd tests torture
Author: herb
Date: 2005-05-02 17:49:43 + (Mon, 02 May 2005)
New Revision: 6586
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6586
Log:
get rid of a few more compiler warnings
Modified:
branches/SAMBA_3_0/source/lib/dummyroot.c
branches/SAMBA_3_0/source/lib/dummysmbd.c
branches/SAMBA_3_0/source/lib/interfaces.c
branches/SAMBA_3_0/source/lib/sysquotas.c
branches/SAMBA_3_0/source/lib/sysquotas_4A.c
branches/SAMBA_3_0/source/lib/sysquotas_linux.c
branches/SAMBA_3_0/source/lib/sysquotas_xfs.c
branches/SAMBA_3_0/source/libads/kerberos.c
branches/SAMBA_3_0/source/libsmb/clikrb5.c
branches/SAMBA_3_0/source/smbd/notify_kernel.c
branches/SAMBA_3_0/source/smbd/oplock_linux.c
branches/SAMBA_3_0/source/tests/shlib.c
branches/SAMBA_3_0/source/tests/sysquotas.c
branches/SAMBA_3_0/source/torture/denytest.c
branches/SAMBA_3_0/source/torture/mangle_test.c
branches/SAMBA_3_0/source/torture/torture.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/dummyroot.c
===
--- branches/SAMBA_3_0/source/lib/dummyroot.c 2005-05-02 16:23:02 UTC (rev
6585)
+++ branches/SAMBA_3_0/source/lib/dummyroot.c 2005-05-02 17:49:43 UTC (rev
6586)
@@ -22,6 +22,9 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
+void become_root(void);
+void unbecome_root(void);
+
void become_root(void)
{
return;
Modified: branches/SAMBA_3_0/source/lib/dummysmbd.c
===
--- branches/SAMBA_3_0/source/lib/dummysmbd.c 2005-05-02 16:23:02 UTC (rev
6585)
+++ branches/SAMBA_3_0/source/lib/dummysmbd.c 2005-05-02 17:49:43 UTC (rev
6586)
@@ -22,6 +22,8 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
+void decrement_smbd_process_count( void );
+
void decrement_smbd_process_count( void )
{
return;
Modified: branches/SAMBA_3_0/source/lib/interfaces.c
===
--- branches/SAMBA_3_0/source/lib/interfaces.c 2005-05-02 16:23:02 UTC (rev
6585)
+++ branches/SAMBA_3_0/source/lib/interfaces.c 2005-05-02 17:49:43 UTC (rev
6586)
@@ -358,6 +358,8 @@
/* this wrapper is used to remove duplicates from the interface list generated
above */
+int get_interfaces(struct iface_struct *ifaces, int max_interfaces);
+
int get_interfaces(struct iface_struct *ifaces, int max_interfaces)
{
int total, i, j;
Modified: branches/SAMBA_3_0/source/lib/sysquotas.c
===
--- branches/SAMBA_3_0/source/lib/sysquotas.c 2005-05-02 16:23:02 UTC (rev
6585)
+++ branches/SAMBA_3_0/source/lib/sysquotas.c 2005-05-02 17:49:43 UTC (rev
6586)
@@ -497,6 +497,8 @@
}
#else /* HAVE_SYS_QUOTAS */
+ void dummy_sysquotas_c(void);
+
void dummy_sysquotas_c(void)
{
return;
Modified: branches/SAMBA_3_0/source/lib/sysquotas_4A.c
===
--- branches/SAMBA_3_0/source/lib/sysquotas_4A.c2005-05-02 16:23:02 UTC
(rev 6585)
+++ branches/SAMBA_3_0/source/lib/sysquotas_4A.c2005-05-02 17:49:43 UTC
(rev 6586)
@@ -335,5 +335,7 @@
}
#else /* HAVE_QUOTACTL_4A */
+ void dummy_sysquotas_4A(void);
+
void dummy_sysquotas_4A(void){}
#endif /* HAVE_QUOTACTL_4A */
Modified: branches/SAMBA_3_0/source/lib/sysquotas_linux.c
===
--- branches/SAMBA_3_0/source/lib/sysquotas_linux.c 2005-05-02 16:23:02 UTC
(rev 6585)
+++ branches/SAMBA_3_0/source/lib/sysquotas_linux.c 2005-05-02 17:49:43 UTC
(rev 6586)
@@ -556,5 +556,7 @@
}
#else /* HAVE_QUOTACTL_LINUX */
+ void dummy_sysquotas_linux(void);
+
void dummy_sysquotas_linux(void){}
#endif /* HAVE_QUOTACTL_LINUX */
Modified: branches/SAMBA_3_0/source/lib/sysquotas_xfs.c
===
--- branches/SAMBA_3_0/source/lib/sysquotas_xfs.c 2005-05-02 16:23:02 UTC
(rev 6585)
+++ branches/SAMBA_3_0/source/lib/sysquotas_xfs.c 2005-05-02 17:49:43 UTC
(rev 6586)
@@ -329,5 +329,7 @@
}
#else /* HAVE_XFS_QUOTAS */
+ void dummy_sysquotas_xfs(void);
+
void dummy_sysquotas_xfs(void){}
#endif /* HAVE_XFS_QUOTAS */
Modified: branches/SAMBA_3_0/source/libads/kerberos.c
===
--- branches/SAMBA_3_0/source/libads/kerberos.c 2005-05-02 16:23:02 UTC (rev
6585)
+++ branches/SAMBA_3_0/source/libads/kerberos.c 2005-05-02 17:49:43 UTC (rev
6586)
@@ -248,7 +248,7 @@
Setting principal to NULL deletes this entry.
/
- BOOL kerberos_secrets_store_salting_principal(const char *service,
+BOOL kerberos_secrets_store_salting_principal(const char *service,
svn commit: samba r6585 - in branches/SAMBA_3_0/source: .
Author: jelmer Date: 2005-05-02 16:23:02 + (Mon, 02 May 2005) New Revision: 6585 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6585 Log: Fix socket-wrapper-enabled build for the tdb tools Modified: branches/SAMBA_3_0/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2005-05-02 16:17:51 UTC (rev 6584) +++ branches/SAMBA_3_0/source/Makefile.in 2005-05-02 16:23:02 UTC (rev 6585) @@ -855,7 +855,7 @@ bin/[EMAIL PROTECTED]@: $(PROFILES_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ + @$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ @SOCKWRAP@ bin/[EMAIL PROTECTED]@: $(EDITREG_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ @@ -1268,15 +1268,15 @@ bin/[EMAIL PROTECTED]@: $(TDBBACKUP_OBJ) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(DYNEXP) $(TDBBACKUP_OBJ) + @$(CC) $(FLAGS) -o $@ $(DYNEXP) $(TDBBACKUP_OBJ) @SOCKWRAP@ bin/[EMAIL PROTECTED]@: $(TDBTOOL_OBJ) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(DYNEXP) $(TDBTOOL_OBJ) + @$(CC) $(FLAGS) -o $@ $(DYNEXP) $(TDBTOOL_OBJ) @SOCKWRAP@ bin/[EMAIL PROTECTED]@: $(TDBDUMP_OBJ) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(DYNEXP) $(TDBDUMP_OBJ) + @$(CC) $(FLAGS) -o $@ $(DYNEXP) $(TDBDUMP_OBJ) @SOCKWRAP@ bin/[EMAIL PROTECTED]@: bin/[EMAIL PROTECTED]@ torture/t_strcmp.o $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) torture/t_strcmp.o -L ./bin -lbigballofmud @@ -1569,3 +1569,10 @@ # running it. For the time being we don't build all of BIN_PROGS, # because they're not all needed. check-programs: bin/t_strcmp bin/t_strstr bin/t_push_ucs2 bin/smbcontrol bin/t_snprintf + +test: all + @if test -z "$(SMB4TORTURE)"; then \ + echo "Please set the SMB4TORTURE environment variable"; \ + exit 1; \ + fi + ./script/smb4torture.sh `pwd`/prefix-test $(SMB4TORTURE)
svn commit: samba r6584 - in branches/tmp/pidl2/source: build/smb_build include lib lib/messaging libnet librpc/idl librpc/ndr ntvfs/posix passdb script/tests setup torture/raw torture/rpc utils/net
Author: jelmer Date: 2005-05-02 16:17:51 + (Mon, 02 May 2005) New Revision: 6584 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6584 Log: Merge in SAMBA_4_0 changes Added: branches/tmp/pidl2/source/lib/samba3/ branches/tmp/pidl2/source/libnet/libnet_vampire.c branches/tmp/pidl2/source/libnet/libnet_vampire.h branches/tmp/pidl2/source/setup/provision.smb.conf branches/tmp/pidl2/source/utils/net/net_vampire.c Modified: branches/tmp/pidl2/source/build/smb_build/makefile.pm branches/tmp/pidl2/source/include/structs.h branches/tmp/pidl2/source/lib/basic.mk branches/tmp/pidl2/source/lib/credentials.c branches/tmp/pidl2/source/lib/messaging/messaging.c branches/tmp/pidl2/source/lib/util_str.c branches/tmp/pidl2/source/libnet/config.mk branches/tmp/pidl2/source/libnet/libnet.h branches/tmp/pidl2/source/librpc/idl/epmapper.idl branches/tmp/pidl2/source/librpc/idl/idl_types.h branches/tmp/pidl2/source/librpc/idl/rot.idl branches/tmp/pidl2/source/librpc/idl/spoolss.idl branches/tmp/pidl2/source/librpc/ndr/ndr_basic.c branches/tmp/pidl2/source/librpc/ndr/ndr_string.c branches/tmp/pidl2/source/ntvfs/posix/pvfs_lock.c branches/tmp/pidl2/source/ntvfs/posix/pvfs_open.c branches/tmp/pidl2/source/ntvfs/posix/xattr_system.c branches/tmp/pidl2/source/passdb/secrets.c branches/tmp/pidl2/source/script/tests/selftest.sh branches/tmp/pidl2/source/setup/provision.pl branches/tmp/pidl2/source/torture/raw/lock.c branches/tmp/pidl2/source/torture/rpc/samsync.c branches/tmp/pidl2/source/utils/net/config.mk branches/tmp/pidl2/source/utils/net/net.c Changeset: Sorry, the patch is too large (655 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6584
svn commit: samba r6583 - in trunk/source/nsswitch: .
Author: vlendec Date: 2005-05-02 16:13:35 + (Mon, 02 May 2005) New Revision: 6583 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6583 Log: Make getpwuid and getpwnam async. Now I think I got all requests in the critical path async. Missing are the enumerating ones and getgrgid/getgrnam. I think during normal operation of a Samba server these should not be affected. The enum calls should work, but are still being done by the parent winbind in a blocking fashion. During testing I've found the error path for various stuff not being valgrind clean, I have to fix that. Volker Modified: trunk/source/nsswitch/winbindd.c trunk/source/nsswitch/winbindd_async.c trunk/source/nsswitch/winbindd_cache.c trunk/source/nsswitch/winbindd_dual.c trunk/source/nsswitch/winbindd_nss.h trunk/source/nsswitch/winbindd_sid.c trunk/source/nsswitch/winbindd_user.c Changeset: Sorry, the patch is too large (676 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6583
svn commit: samba r6582 - in branches/SAMBA_4_0/source/torture/rpc: .
Author: abartlet
Date: 2005-05-02 16:02:52 + (Mon, 02 May 2005)
New Revision: 6582
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6582
Log:
Remove the hack that metze needed because Samba4 didn't have a samdump
command.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/torture/rpc/samsync.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/samsync.c
===
--- branches/SAMBA_4_0/source/torture/rpc/samsync.c 2005-05-02 16:00:18 UTC
(rev 6581)
+++ branches/SAMBA_4_0/source/torture/rpc/samsync.c 2005-05-02 16:02:52 UTC
(rev 6582)
@@ -543,15 +543,6 @@
}
}
- if (nt_hash_p) {
- DATA_BLOB nt_hash_blob = data_blob_const(nt_hash_p, 16);
- DEBUG(100,("ACCOUNT [%s\\%-25s] NTHASH %s\n",
samsync_state->domain_name[0], username, data_blob_hex_string(mem_ctx,
&nt_hash_blob)));
- }
- if (lm_hash_p) {
- DATA_BLOB lm_hash_blob = data_blob_const(lm_hash_p, 16);
- DEBUG(100,("ACCOUNT [%s\\%-25s] LMHASH %s\n",
samsync_state->domain_name[0], username, data_blob_hex_string(mem_ctx,
&lm_hash_blob)));
- }
-
nt_status = test_SamLogon(samsync_state->p_netlogon_wksta, mem_ctx,
samsync_state->creds_netlogon_wksta,
domain,
username,
svn commit: samba r6581 - in branches/SAMBA_4_0/source/torture/raw: .
Author: tridge
Date: 2005-05-02 16:00:18 + (Mon, 02 May 2005)
New Revision: 6581
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6581
Log:
improved the error message for RAW-LOCK timeouts
Modified:
branches/SAMBA_4_0/source/torture/raw/lock.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/raw/lock.c
===
--- branches/SAMBA_4_0/source/torture/raw/lock.c2005-05-02 15:59:34 UTC
(rev 6580)
+++ branches/SAMBA_4_0/source/torture/raw/lock.c2005-05-02 16:00:18 UTC
(rev 6581)
@@ -543,11 +543,13 @@
status = smb_raw_lock(cli->tree, &io);
CHECK_STATUS(status, NT_STATUS_OK);
+ t = time(NULL);
status = smbcli_request_simple_recv(req);
CHECK_STATUS(status, NT_STATUS_OK);
if (time(NULL) > t+2) {
- printf("lock cancel by unlock was not immediate (%s)\n",
__location__);
+ printf("lock cancel by unlock was not immediate (%s) - took %d
secs\n",
+ __location__, (int)time(NULL)-t);
ret = False;
goto done;
}
svn commit: samba r6580 - in branches/SAMBA_4_0/source/ntvfs/posix: .
Author: tridge
Date: 2005-05-02 15:59:34 + (Mon, 02 May 2005)
New Revision: 6580
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6580
Log:
fixed the bug that caused the truncation of the main file on a stream
open with openx and the 'truncate if exists' flag
Modified:
branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c
branches/SAMBA_4_0/source/ntvfs/posix/xattr_system.c
Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c
===
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c 2005-05-02 15:58:54 UTC
(rev 6579)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c 2005-05-02 15:59:34 UTC
(rev 6580)
@@ -856,7 +856,7 @@
uint32_t create_options;
uint32_t share_access;
uint32_t access_mask;
- BOOL stream_existed;
+ BOOL stream_existed, stream_truncate=False;
/* use the generic mapping code to avoid implementing all the
different open calls. */
@@ -892,13 +892,16 @@
return NT_STATUS_INVALID_PARAMETER;
}
+ flags = 0;
+
switch (io->generic.in.open_disposition) {
case NTCREATEX_DISP_SUPERSEDE:
- flags = O_TRUNC;
- break;
-
case NTCREATEX_DISP_OVERWRITE_IF:
- flags = O_TRUNC;
+ if (name->stream_name == NULL) {
+ flags = O_TRUNC;
+ } else {
+ stream_truncate = True;
+ }
break;
case NTCREATEX_DISP_OPEN:
@@ -912,7 +915,11 @@
if (!name->stream_exists) {
return NT_STATUS_OBJECT_NAME_NOT_FOUND;
}
- flags = O_TRUNC;
+ if (name->stream_name == NULL) {
+ flags = O_TRUNC;
+ } else {
+ stream_truncate = True;
+ }
break;
case NTCREATEX_DISP_CREATE:
@@ -1075,6 +1082,13 @@
talloc_free(lck);
return status;
}
+ if (stream_truncate) {
+ status = pvfs_stream_truncate(pvfs, f->handle->name,
fd, 0);
+ if (!NT_STATUS_IS_OK(status)) {
+ talloc_free(lck);
+ return status;
+ }
+ }
}
/* re-resolve the open fd */
Modified: branches/SAMBA_4_0/source/ntvfs/posix/xattr_system.c
===
--- branches/SAMBA_4_0/source/ntvfs/posix/xattr_system.c2005-05-02
15:58:54 UTC (rev 6579)
+++ branches/SAMBA_4_0/source/ntvfs/posix/xattr_system.c2005-05-02
15:59:34 UTC (rev 6580)
@@ -37,7 +37,7 @@
#if HAVE_XATTR_SUPPORT
int ret;
- *blob = data_blob_talloc(mem_ctx, NULL, estimated_size);
+ *blob = data_blob_talloc(mem_ctx, NULL, estimated_size+16);
if (blob->data == NULL) {
return NT_STATUS_NO_MEMORY;
}
svn commit: samba r6579 - in branches/SAMBA_4_0/source/ntvfs/posix: .
Author: tridge
Date: 2005-05-02 15:58:54 + (Mon, 02 May 2005)
New Revision: 6579
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6579
Log:
improved the handling of lock timeouts and cancels in the pvfs locking
code. On lock cancel don't retry the lock.
Modified:
branches/SAMBA_4_0/source/ntvfs/posix/pvfs_lock.c
Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_lock.c
===
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_lock.c 2005-05-02 15:58:03 UTC
(rev 6578)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_lock.c 2005-05-02 15:58:54 UTC
(rev 6579)
@@ -104,7 +104,6 @@
int i;
BOOL timed_out;
- /* we consider a cancel to be a timeout */
timed_out = (reason != PVFS_WAIT_EVENT);
locks = lck->lockx.in.locks + lck->lockx.in.ulock_cnt;
@@ -117,16 +116,21 @@
DLIST_REMOVE(f->pending_list, pending);
- status = brl_lock(pvfs->brl_context,
- &f->handle->brl_locking_key,
- req->smbpid,
- f->fnum,
- locks[pending->pending_lock].offset,
- locks[pending->pending_lock].count,
- rw, NULL);
-
+ /* we don't retry on a cancel */
+ if (reason == PVFS_WAIT_CANCEL) {
+ status = NT_STATUS_CANCELLED;
+ } else {
+ status = brl_lock(pvfs->brl_context,
+ &f->handle->brl_locking_key,
+ req->smbpid,
+ f->fnum,
+ locks[pending->pending_lock].offset,
+ locks[pending->pending_lock].count,
+ rw, NULL);
+ }
if (NT_STATUS_IS_OK(status)) {
f->lock_count++;
+ timed_out = False;
}
/* if we have failed and timed out, or succeeded, then we
@@ -153,14 +157,10 @@
}
/* if we haven't timed out yet, then we can do more pending locks */
- if (timed_out) {
- pending = NULL;
+ if (rw == READ_LOCK) {
+ rw = PENDING_READ_LOCK;
} else {
- if (rw == READ_LOCK) {
- rw = PENDING_READ_LOCK;
- } else {
- rw = PENDING_WRITE_LOCK;
- }
+ rw = PENDING_WRITE_LOCK;
}
/* we've now got the pending lock. try and get the rest, which might
svn commit: samba r6578 - in branches/SAMBA_4_0/source/lib/messaging: .
Author: tridge
Date: 2005-05-02 15:58:03 + (Mon, 02 May 2005)
New Revision: 6578
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6578
Log:
brown paper bag time with the new messaging code
Modified:
branches/SAMBA_4_0/source/lib/messaging/messaging.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/messaging/messaging.c
===
--- branches/SAMBA_4_0/source/lib/messaging/messaging.c 2005-05-02 15:19:25 UTC
(rev 6577)
+++ branches/SAMBA_4_0/source/lib/messaging/messaging.c 2005-05-02 15:58:03 UTC
(rev 6578)
@@ -156,7 +156,7 @@
return;
}
- rec->data = data_blob_talloc(rec, data, rec->header.length);
+ rec->data = data_blob_talloc(rec, data+sizeof(rec->header),
rec->header.length);
if (rec->data.data == NULL) {
talloc_free(rec);
return;
svn commit: samba-docs r530 - in trunk/Samba-HOWTO-Collection: .
Author: jht Date: 2005-05-02 15:47:25 + (Mon, 02 May 2005) New Revision: 530 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=530 Log: Fixing man pages. Modified: trunk/Samba-HOWTO-Collection/manpages.xml Changeset: Modified: trunk/Samba-HOWTO-Collection/manpages.xml === --- trunk/Samba-HOWTO-Collection/manpages.xml 2005-05-02 12:04:32 UTC (rev 529) +++ trunk/Samba-HOWTO-Collection/manpages.xml 2005-05-02 15:47:25 UTC (rev 530) @@ -5,22 +5,27 @@ This appendix contains most of the manual pages from the official Samba distribution. All manual pages have been written by members of http://samba.org/samba/team.html";>the Samba Team. - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +
svn commit: samba r6577 - in branches/SAMBA_4_0/source: build/smb_build librpc/idl script/tests
Author: jelmer
Date: 2005-05-02 15:19:25 + (Mon, 02 May 2005)
New Revision: 6577
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6577
Log:
Make test works without installation now.
Running as a non-root user using socket_wrapper is possible by simple
export SOCKET_WRAPPER_DIR before running 'make test'
Modified:
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
branches/SAMBA_4_0/source/librpc/idl/epmapper.idl
branches/SAMBA_4_0/source/librpc/idl/rot.idl
branches/SAMBA_4_0/source/script/tests/selftest.sh
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-05-02
15:06:11 UTC (rev 6576)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-05-02
15:19:25 UTC (rev 6577)
@@ -151,14 +151,8 @@
basics: idl proto_exists
test: all
- ./script/tests/selftest.sh $(prefix)
+ ./script/tests/selftest.sh `pwd`/prefix-test
-export SOCKET_WRAPPER_DIR=$(shell pwd)/sockdir
-
-test-swrap: all
- mkdir -p $(SOCKET_WRAPPER_DIR)
- ./script/tests/selftest.sh $(prefix)
-
__EOD__
return $output;
Modified: branches/SAMBA_4_0/source/librpc/idl/epmapper.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/epmapper.idl 2005-05-02 15:06:11 UTC
(rev 6576)
+++ branches/SAMBA_4_0/source/librpc/idl/epmapper.idl 2005-05-02 15:19:25 UTC
(rev 6577)
@@ -12,7 +12,7 @@
uuid("e1af8308-5d1f-11c9-91a4-08002b14a0fa"),
version(3.0),
endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]",
- "ncalrpc:[EPMAPPER]", "ncacn_unix_stream:[/tmp/epmapper]"),
+ "ncalrpc:[EPMAPPER]"),
helpstring("EndPoint Mapper"),
pointer_default(unique)
]
Modified: branches/SAMBA_4_0/source/librpc/idl/rot.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/rot.idl2005-05-02 15:06:11 UTC
(rev 6576)
+++ branches/SAMBA_4_0/source/librpc/idl/rot.idl2005-05-02 15:19:25 UTC
(rev 6577)
@@ -6,7 +6,7 @@
pointer_default(unique),
depends(orpc),
endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]",
- "ncalrpc:[EPMAPPER]", "ncacn_unix_stream:[/tmp/epmapper]")
+ "ncalrpc:[EPMAPPER]")
] interface rot
{
WERROR rot_add (
Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh
===
--- branches/SAMBA_4_0/source/script/tests/selftest.sh 2005-05-02 15:06:11 UTC
(rev 6576)
+++ branches/SAMBA_4_0/source/script/tests/selftest.sh 2005-05-02 15:19:25 UTC
(rev 6577)
@@ -1,9 +1,9 @@
#!/bin/sh
DOMAIN=SAMBADOMAIN
+USERNAME=administrator
REALM=$DOMAIN
PASSWORD=penguin
SRCDIR=`pwd`
-TMPDIR=$PREFIX/tmp
if [ $# -lt 1 ]
then
@@ -12,26 +12,40 @@
fi
PREFIX=$1
+TMPDIR=$PREFIX/tmp
+LIBDIR=$PREFIX/lib
+PIDDIR=$PREFIX/pid
+CONFFILE=$LIBDIR/smb.conf
+PRIVATEDIR=$PREFIX/private
+NCALRPCDIR=$PREFIX/ncalrpc
+LOCKDIR=$PREFIX/lockdir
-rm -f $PREFIX/private/*
-./setup/provision.pl --quiet --outputdir $PREFIX/private --domain $DOMAIN
--realm $REALM --adminpass $PASSWORD
+mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $NCALRPCDIR $LOCKDIR $TMPDIR
+rm -f $PRIVATEDIR/*
+./setup/provision.pl --quiet --outputdir $PRIVATEDIR --domain $DOMAIN --realm
$REALM --adminpass $PASSWORD
-cat >$PREFIX/lib/smb.conf <$CONFFILE<
svn commit: samba r6576 - in trunk/source/torture: .
Author: idra
Date: 2005-05-02 15:06:11 + (Mon, 02 May 2005)
New Revision: 6576
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6576
Log:
keep volker happy :-)
Modified:
trunk/source/torture/torture.c
Changeset:
Modified: trunk/source/torture/torture.c
===
--- trunk/source/torture/torture.c 2005-05-02 15:00:51 UTC (rev 6575)
+++ trunk/source/torture/torture.c 2005-05-02 15:06:11 UTC (rev 6576)
@@ -4861,6 +4861,9 @@
{
int i;
+ printf("WARNING samba4 test suite is much more complete nowadays.\n");
+ printf("Please use samba4 torture.\n\n");
+
printf("Usage: smbtorture //server/share TEST1 TEST2 ...\n");
printf("\t-d debuglevel\n");
svn commit: samba r6575 - in branches/SAMBA_3_0/source/torture: .
Author: idra
Date: 2005-05-02 15:00:51 + (Mon, 02 May 2005)
New Revision: 6575
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6575
Log:
use samba4 torture please message on samba 3 torture
Modified:
branches/SAMBA_3_0/source/torture/torture.c
Changeset:
Modified: branches/SAMBA_3_0/source/torture/torture.c
===
--- branches/SAMBA_3_0/source/torture/torture.c 2005-05-02 14:53:19 UTC (rev
6574)
+++ branches/SAMBA_3_0/source/torture/torture.c 2005-05-02 15:00:51 UTC (rev
6575)
@@ -4861,6 +4861,9 @@
{
int i;
+ printf("WARNING samba4 test suite is much more complete nowadays.\n");
+ printf("Please use samba4 torture.\n\n");
+
printf("Usage: smbtorture //server/share TEST1 TEST2 ...\n");
printf("\t-d debuglevel\n");
svn commit: samba r6574 - in branches/SAMBA_4_0/source/librpc/ndr: .
Author: metze
Date: 2005-05-02 14:53:19 + (Mon, 02 May 2005)
New Revision: 6574
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6574
Log:
send a value for embedded ref pointers,
(this fixes the doublepointer test against w2k3)
but we accept zero pointers on the receive side,
because it's used in DRSUAPI
metze
Modified:
branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c
===
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c2005-05-02 14:17:19 UTC
(rev 6573)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c2005-05-02 14:53:19 UTC
(rev 6574)
@@ -577,7 +577,7 @@
if (p == NULL) {
return NT_STATUS_INVALID_PARAMETER_MIX;
}
- return ndr_push_uint32(ndr, NDR_SCALARS, 0);
+ return ndr_push_uint32(ndr, NDR_SCALARS, 0xAEF1AEF1);
}
svn commit: samba r6573 - in branches/SAMBA_4_0/source: include lib lib/samba3 libnet passdb utils/net
Author: abartlet Date: 2005-05-02 14:17:19 + (Mon, 02 May 2005) New Revision: 6573 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6573 Log: Start on my project to implement an NT4 compatible BDC in Samba4. This brings in a compatability layer for Samba3 in Samba4 - where we will start to define file formats and similar details. The 'net samdump' command uses 'password server = ' for now, and performs a similar task to Samba3's 'net rpc samsync'. Andrew Bartlett Added: branches/SAMBA_4_0/source/lib/samba3/ branches/SAMBA_4_0/source/lib/samba3/README branches/SAMBA_4_0/source/lib/samba3/smbpasswd.c branches/SAMBA_4_0/source/libnet/libnet_vampire.c branches/SAMBA_4_0/source/libnet/libnet_vampire.h branches/SAMBA_4_0/source/utils/net/net_vampire.c Modified: branches/SAMBA_4_0/source/include/structs.h branches/SAMBA_4_0/source/lib/basic.mk branches/SAMBA_4_0/source/lib/credentials.c branches/SAMBA_4_0/source/lib/util_str.c branches/SAMBA_4_0/source/libnet/config.mk branches/SAMBA_4_0/source/libnet/libnet.h branches/SAMBA_4_0/source/passdb/secrets.c branches/SAMBA_4_0/source/utils/net/config.mk branches/SAMBA_4_0/source/utils/net/net.c Changeset: Sorry, the patch is too large (731 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6573
svn commit: samba r6572 - in branches/SAMBA_4_0/source: build/pidl librpc/idl librpc/ndr
Author: metze
Date: 2005-05-02 13:37:05 + (Mon, 02 May 2005)
New Revision: 6572
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6572
Log:
add "string_array" as new scalar type for handling SPOOLSS string array's
metze
Modified:
branches/SAMBA_4_0/source/build/pidl/ndr_header.pm
branches/SAMBA_4_0/source/build/pidl/typelist.pm
branches/SAMBA_4_0/source/librpc/idl/idl_types.h
branches/SAMBA_4_0/source/librpc/idl/spoolss.idl
branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c
Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/ndr_header.pm
===
--- branches/SAMBA_4_0/source/build/pidl/ndr_header.pm 2005-05-02 12:34:44 UTC
(rev 6571)
+++ branches/SAMBA_4_0/source/build/pidl/ndr_header.pm 2005-05-02 13:37:05 UTC
(rev 6572)
@@ -60,7 +60,7 @@
pidl tabs();
HeaderType($element, $element->{TYPE}, "");
pidl " ";
-if ($element->{POINTERS} && $element->{TYPE} ne "string") {
+if ($element->{POINTERS} && not $element->{TYPE} =~ "string") {
for (my($i)=$element->{POINTERS}; $i > 0; $i--) {
pidl "*";
}
Modified: branches/SAMBA_4_0/source/build/pidl/typelist.pm
===
--- branches/SAMBA_4_0/source/build/pidl/typelist.pm2005-05-02 12:34:44 UTC
(rev 6571)
+++ branches/SAMBA_4_0/source/build/pidl/typelist.pm2005-05-02 13:37:05 UTC
(rev 6572)
@@ -86,6 +86,10 @@
C_TYPE => "const char *",
NDR_ALIGN => 4 #???
},
+ "string_array" => {
+ C_TYPE => "const char **",
+ NDR_ALIGN => 4 #???
+ },
# time types
"time_t"=> {
Modified: branches/SAMBA_4_0/source/librpc/idl/idl_types.h
===
--- branches/SAMBA_4_0/source/librpc/idl/idl_types.h2005-05-02 12:34:44 UTC
(rev 6571)
+++ branches/SAMBA_4_0/source/librpc/idl/idl_types.h2005-05-02 13:37:05 UTC
(rev 6572)
@@ -81,6 +81,11 @@
*/
#define utf8string [flag(STR_UTF8|STR_NULLTERM)] string
+/*
+ a null terminated UCS2 string
+*/
+#define nstring_array [flag(STR_NULLTERM)] string_array
+
#define NDR_NOALIGN LIBNDR_FLAG_NOALIGN
#define NDR_REMAINING LIBNDR_FLAG_REMAINING
#define NDR_ALIGN2LIBNDR_FLAG_ALIGN2
Modified: branches/SAMBA_4_0/source/librpc/idl/spoolss.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/spoolss.idl2005-05-02 12:34:44 UTC
(rev 6571)
+++ branches/SAMBA_4_0/source/librpc/idl/spoolss.idl2005-05-02 13:37:05 UTC
(rev 6572)
@@ -409,7 +409,7 @@
[relative] nstring *data_file;
[relative] nstring *config_file;
[relative] nstring *help_file;
- [relative] nstring *dependent_files; /* array */
+ [relative] nstring_array *dependent_files;
[relative] nstring *monitor_name;
[relative] nstring *default_datatype;
} spoolss_DriverInfo3;
@@ -422,10 +422,10 @@
[relative] nstring *data_file;
[relative] nstring *config_file;
[relative] nstring *help_file;
- [relative] nstring *dependent_files; /* array */
+ [relative] nstring_array *dependent_files;
[relative] nstring *monitor_name;
[relative] nstring *default_datatype;
- [relative] nstring *previous_names; /* array */
+ [relative] nstring_array *previous_names;
} spoolss_DriverInfo4;
typedef struct {
@@ -448,10 +448,10 @@
[relative] nstring *data_file;
[relative] nstring *config_file;
[relative] nstring *help_file;
- [relative] nstring *dependent_files; /* array */
+ [relative] nstring_array *dependent_files;
[relative] nstring *monitor_name;
[relative] nstring *default_datatype;
- [relative] nstring *previous_names; /* array */
+ [relative] nstring_array *previous_names;
NTTIME driver_data;
hyper driver_version;
[relative] nstring *manufacturer_name;
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c
===
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c 2005-05-02 12:34:44 UTC
(rev 6571)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c 2005-05-02 13:37:05 UTC
(rev 6572)
@@ -497,3 +497,75 @@
if(!(*string)) return ret;
return ret+strlen(*string)+1;
}
+
+/*
+ pull a general string array from the wire
+*/
+NTSTATUS ndr_pull_string_array(
svn commit: samba r6571 - in branches/SAMBA_4_0/source/setup: .
Author: metze
Date: 2005-05-02 12:34:44 + (Mon, 02 May 2005)
New Revision: 6571
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6571
Log:
create a simple smb.conf by provision.pl
metze
Added:
branches/SAMBA_4_0/source/setup/provision.smb.conf
Modified:
branches/SAMBA_4_0/source/setup/provision.pl
Changeset:
Modified: branches/SAMBA_4_0/source/setup/provision.pl
===
--- branches/SAMBA_4_0/source/setup/provision.pl2005-05-02 10:12:36 UTC
(rev 6570)
+++ branches/SAMBA_4_0/source/setup/provision.pl2005-05-02 12:34:44 UTC
(rev 6571)
@@ -440,6 +440,14 @@
FileSave("$newdb/$dnsdomain.zone", $res);
+$data = FileLoad("setup/provision.smb.conf") || die "Unable to load
provision.smb.conf\n";
+
+$res = apply_substitutions($data);
+
+$opt_quiet or print "saving smb.conf to $newdb/smb.conf ...\n";
+
+FileSave("$newdb/smb.conf", $res);
+
$opt_quiet or print "creating $newdb/hklm.ldb ... \n";
system("ldbadd -H $newdb/hklm.ldb setup/hklm.ldif") == 0 || die "Failed to
create hklm.ldb\n";
@@ -449,5 +457,7 @@
Installation:
- Please move $newdb/*.ldb to the private/ directory of your
Samba4 installation
+- Please move $newdb/smb.conf to the lib/ directory of your
+ Samba4 installation
- Please use $newdb/$dnsdomain.zone in BIND on your dns server
";
Added: branches/SAMBA_4_0/source/setup/provision.smb.conf
===
--- branches/SAMBA_4_0/source/setup/provision.smb.conf 2005-05-02 10:12:36 UTC
(rev 6570)
+++ branches/SAMBA_4_0/source/setup/provision.smb.conf 2005-05-02 12:34:44 UTC
(rev 6571)
@@ -0,0 +1,4 @@
+[globals]
+ netbios name= ${HOSTNAME}
+ workgroup = ${DOMAIN}
+ realm = ${REALM}
svn commit: samba-web r658 - in trunk: .
Author: tpot Date: 2005-05-02 12:21:59 + (Mon, 02 May 2005) New Revision: 658 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=658 Log: Add a para about the fact that you should expect to be spammed and viruses after posting to the samba mailing list. Posters should use spamgourmet.com if they are especially worried about this. Modified: trunk/archives.html Changeset: Modified: trunk/archives.html === --- trunk/archives.html 2005-04-29 18:44:16 UTC (rev 657) +++ trunk/archives.html 2005-05-02 12:21:59 UTC (rev 658) @@ -2,7 +2,7 @@ Samba - Mailing List Archives -Samba Mailing list +Samba Mailing Lists @@ -13,7 +13,8 @@ If you do not have web access, you may subscribe over email by sending a blank email to listname[EMAIL PROTECTED] with the word 'help' in the subject line. - +Note that posting to any of the Samba mailing lists will effectively expose your email address to the public, including spammers and machines infected with Windows viruses. Many people have reported an increase in spam and viruses on new email addresses after posting to mailing lists hosted on samba.org. Prospective posters may wish to use a disposable email service like http://www.spamgourmet.com/";>spamgourmet. You have been warned! + Archives
svn commit: samba-docs r529 - in trunk/Samba-HOWTO-Collection: .
Author: jelmer Date: 2005-05-02 12:04:32 + (Mon, 02 May 2005) New Revision: 529 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=529 Log: Put manual pages just before the GPL in the Appendices part Modified: trunk/Samba-HOWTO-Collection/index.xml Changeset: Modified: trunk/Samba-HOWTO-Collection/index.xml === --- trunk/Samba-HOWTO-Collection/index.xml 2005-05-02 08:55:11 UTC (rev 528) +++ trunk/Samba-HOWTO-Collection/index.xml 2005-05-02 12:04:32 UTC (rev 529) @@ -141,15 +141,15 @@ Appendixes - - + + http://www.gnu.org/licenses/gpl.xml"/>
svn commit: samba r6570 - in branches/SAMBA_3_0/source: . include lib
Author: jelmer Date: 2005-05-02 10:12:36 + (Mon, 02 May 2005) New Revision: 6570 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6570 Log: Add socket_wrapper library to 3.0. Can be enabled by passing --enable-socket-wrapper to configure Added: branches/SAMBA_3_0/source/include/socket_wrapper.h branches/SAMBA_3_0/source/lib/socket_wrapper.c Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/configure.in branches/SAMBA_3_0/source/include/includes.h Changeset: Sorry, the patch is too large (594 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6570
svn commit: samba r6569 - in branches/tmp/pidl2/source: auth build/pidl build/smb_build include lib lib/messaging lib/socket lib/socket_wrapper librpc/idl librpc/rpc script/tests setup torture/local torture/rpc
Author: jelmer Date: 2005-05-02 10:10:33 + (Mon, 02 May 2005) New Revision: 6569 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6569 Log: Merge in changes from SAMBA_4_0, fix some ref allocation issues Added: branches/tmp/pidl2/source/script/tests/selftest.sh Modified: branches/tmp/pidl2/source/auth/auth_domain.c branches/tmp/pidl2/source/auth/auth_sam.c branches/tmp/pidl2/source/build/pidl/ndr_parser.pm branches/tmp/pidl2/source/build/smb_build/makefile.pm branches/tmp/pidl2/source/include/credentials.h branches/tmp/pidl2/source/include/includes.h branches/tmp/pidl2/source/include/structs.h branches/tmp/pidl2/source/lib/credentials.c branches/tmp/pidl2/source/lib/messaging/messaging.c branches/tmp/pidl2/source/lib/socket/socket.c branches/tmp/pidl2/source/lib/socket/socket_unix.c branches/tmp/pidl2/source/lib/socket_wrapper/socket_wrapper.c branches/tmp/pidl2/source/librpc/idl/misc.idl branches/tmp/pidl2/source/librpc/idl/netlogon.idl branches/tmp/pidl2/source/librpc/rpc/dcerpc.h branches/tmp/pidl2/source/librpc/rpc/dcerpc_schannel.c branches/tmp/pidl2/source/librpc/rpc/dcerpc_util.c branches/tmp/pidl2/source/setup/provision.ldif branches/tmp/pidl2/source/setup/provision.pl branches/tmp/pidl2/source/torture/local/messaging.c branches/tmp/pidl2/source/torture/rpc/samlogon.c branches/tmp/pidl2/source/torture/rpc/samsync.c branches/tmp/pidl2/source/torture/rpc/schannel.c Changeset: Sorry, the patch is too large (1180 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6569
svn commit: samba r6568 - in branches/SAMBA_4_0/source: build/smb_build script/tests
Author: jelmer Date: 2005-05-02 09:44:59 + (Mon, 02 May 2005) New Revision: 6568 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6568 Log: Some more small 'make test' fixes Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm branches/SAMBA_4_0/source/script/tests/selftest.sh Changeset: Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm === --- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-05-01 20:55:55 UTC (rev 6567) +++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-05-02 09:44:59 UTC (rev 6568) @@ -153,10 +153,9 @@ test: all ./script/tests/selftest.sh $(prefix) -SOCKET_WRAPPER_DIR=`pwd`/sockdir +export SOCKET_WRAPPER_DIR=$(shell pwd)/sockdir test-swrap: all - export SOCKET_WRAPPER_DIR mkdir -p $(SOCKET_WRAPPER_DIR) ./script/tests/selftest.sh $(prefix) Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh === --- branches/SAMBA_4_0/source/script/tests/selftest.sh 2005-05-01 20:55:55 UTC (rev 6567) +++ branches/SAMBA_4_0/source/script/tests/selftest.sh 2005-05-02 09:44:59 UTC (rev 6568) @@ -3,7 +3,6 @@ REALM=$DOMAIN PASSWORD=penguin SRCDIR=`pwd` -SOCKET_WRAPPER_DIR=$PREFIX/sockdir TMPDIR=$PREFIX/tmp if [ $# -lt 1 ] @@ -17,7 +16,6 @@ rm -f $PREFIX/private/* ./setup/provision.pl --quiet --outputdir $PREFIX/private --domain $DOMAIN --realm $REALM --adminpass $PASSWORD -mkdir -p $SOCKET_WRAPPER_DIR cat >$PREFIX/lib/smb.conf <
svn commit: samba-docs r528 - in trunk/Samba-Guide: .
Author: jht Date: 2005-05-02 08:55:11 + (Mon, 02 May 2005) New Revision: 528 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=528 Log: Ouch fixes. Modified: trunk/Samba-Guide/SBE-SecureOfficeServer.xml trunk/Samba-Guide/SBE-TheSmallOffice.xml trunk/Samba-Guide/SBE-UpgradingSamba.xml Changeset: Modified: trunk/Samba-Guide/SBE-SecureOfficeServer.xml === --- trunk/Samba-Guide/SBE-SecureOfficeServer.xml2005-05-02 08:49:42 UTC (rev 527) +++ trunk/Samba-Guide/SBE-SecureOfficeServer.xml2005-05-02 08:55:11 UTC (rev 528) @@ -862,7 +862,7 @@ file. The final, fully qualified path for this file should be /etc/samba/smb.conf. -130 User Network with tdbsam &smbmdash; [globals] Section +130 User Network with tdbsam &smbmdash; [global] Section Global parameters PROMISES Modified: trunk/Samba-Guide/SBE-TheSmallOffice.xml === --- trunk/Samba-Guide/SBE-TheSmallOffice.xml2005-05-02 08:49:42 UTC (rev 527) +++ trunk/Samba-Guide/SBE-TheSmallOffice.xml2005-05-02 08:55:11 UTC (rev 528) @@ -640,7 +640,7 @@ -Accounting Office Network &smb.conf; File &smbmdash; [globals] Section +Accounting Office Network &smb.conf; File &smbmdash; [global] Section Global parameters BILLMORE Modified: trunk/Samba-Guide/SBE-UpgradingSamba.xml === --- trunk/Samba-Guide/SBE-UpgradingSamba.xml2005-05-02 08:49:42 UTC (rev 527) +++ trunk/Samba-Guide/SBE-UpgradingSamba.xml2005-05-02 08:55:11 UTC (rev 528) @@ -1139,7 +1139,7 @@ command and then reloading the same data into the new LDAP server using the slapadd command. Do not forget to install and configure the nss_ldap tool and the /etc/nsswitch.conf - (as shown in Chapter 5). + (as shown in ).
svn commit: samba-docs r527 - in trunk: . Samba-HOWTO-Collection
Author: jelmer Date: 2005-05-02 08:49:42 + (Mon, 02 May 2005) New Revision: 527 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=527 Log: Add optional manpages to the Samba HOWTO Collection Added: trunk/Samba-HOWTO-Collection/manpages.xml Modified: trunk/Makefile trunk/Samba-HOWTO-Collection/index.xml Changeset: Modified: trunk/Makefile === --- trunk/Makefile 2005-05-02 08:28:41 UTC (rev 526) +++ trunk/Makefile 2005-05-02 08:49:42 UTC (rev 527) @@ -41,6 +41,7 @@ $(DOCBOOKDIR)/Samba-Guide.xml: $(filter-out Samba-Guide/index.xml,$(wildcard Samba-Guide/*.xml)) $(DOCBOOKDIR)/Samba-HOWTO-Collection.xml: $(filter-out Samba-HOWTO-Collection/index.xml,$(wildcard Samba-HOWTO-Collection/*.xml)) Samba-HOWTO-Collection-attributions.xml +Samba-HOWTO-Collection/manpages.xml: $(MANPAGEDIR)/smb.conf.5.xml $(DOCBOOKDIR)/Samba-Developers-Guide.xml: $(filter-out Samba-Developers-Guide/index.xml,$(wildcard Samba-Developers-Guide/*.xml)) Samba-Developers-Guide-attributions.xml # Pseudo targets Modified: trunk/Samba-HOWTO-Collection/index.xml === --- trunk/Samba-HOWTO-Collection/index.xml 2005-05-02 08:28:41 UTC (rev 526) +++ trunk/Samba-HOWTO-Collection/index.xml 2005-05-02 08:49:42 UTC (rev 527) @@ -141,14 +141,15 @@ Appendixes + + - - http://www.gnu.org/licenses/gpl.xml"/> @@ -156,5 +157,6 @@ + Added: trunk/Samba-HOWTO-Collection/manpages.xml === --- trunk/Samba-HOWTO-Collection/manpages.xml 2005-05-02 08:28:41 UTC (rev 526) +++ trunk/Samba-HOWTO-Collection/manpages.xml 2005-05-02 08:49:42 UTC (rev 527) @@ -0,0 +1,26 @@ + +http://www.samba.org/samba/DTD/samba-doc";> +http://www.w3.org/2003/XInclude";> Manual pages + + This appendix contains most of the manual pages from the official Samba distribution. All manual pages have been written by members of + http://samba.org/samba/team.html";>the Samba Team. + + + + + + + + + + + + + + + + + + + +
svn commit: samba-docs r526 - in trunk: .
Author: jelmer Date: 2005-05-02 08:28:41 + (Mon, 02 May 2005) New Revision: 526 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=526 Log: Rename manpages to manpages-3 so I can pull in the Samba 4 manpages later Added: trunk/manpages-3/ Removed: trunk/manpages/ Modified: trunk/Makefile.settings.in Changeset: Modified: trunk/Makefile.settings.in === --- trunk/Makefile.settings.in 2005-05-02 08:06:30 UTC (rev 525) +++ trunk/Makefile.settings.in 2005-05-02 08:28:41 UTC (rev 526) @@ -28,9 +28,9 @@ ARCHIVEDIR = archive TEXINFODIR = $(OUTPUTDIR)/texi SRCDIR = @SAMBASOURCEDIR@ -MANDIR = $(OUTPUTDIR)/manpages +MANDIR = $(OUTPUTDIR)/manpages-3 EPSTOPDF = @EPSTOPDF@ -MANPAGEDIR = manpages +MANPAGEDIR = manpages-3 MAKEINDEX = @MAKEINDEX@ EXAMPLESDIR = $(OUTPUTDIR)/examples SMBDOTCONFDOC = smbdotconf Copied: trunk/manpages-3 (from rev 519, trunk/manpages)
svn commit: samba-docs r525 - in trunk: .
Author: jelmer Date: 2005-05-02 08:06:30 + (Mon, 02 May 2005) New Revision: 525 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=525 Log: Add structure diagram Added: trunk/structure.dia Changeset: Added: trunk/structure.dia === (Binary files differ) Property changes on: trunk/structure.dia ___ Name: svn:mime-type + application/octet-stream
