Build status as of Fri Sep 25 06:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-09-24 00:00:49.0 -0600 +++ /home/build/master/cache/broken_results.txt 2009-09-25 00:00:19.0 -0600 @@ -1,4 +1,4 @@ -Build status as of Thu Sep 24 06:00:02 2009 +Build status as of Fri Sep 25 06:00:02 2009 Build counts: Tree Total Broken Panic @@ -6,17 +6,17 @@ ccache 1 1 0 distcc 0 0 0 ldb 28 28 0 -libreplace 2 1 0 +libreplace 1 1 0 lorikeet 0 0 0 -pidl 3 3 0 +pidl 1 1 0 ppp 0 0 0 -rsync2 0 0 +rsync1 0 0 samba-docs 0 0 0 samba-web0 0 0 -samba_3_current 1 1 0 -samba_3_master 26 25 5 -samba_3_next 4 3 0 -samba_4_0_test 28 28 0 -talloc 28 28 0 +samba_3_current 0 0 0 +samba_3_master 26 26 5 +samba_3_next 1 1 0 +samba_4_0_test 28 28 1 +talloc 2 2 0 tdb 26 26 0
[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-714-gbfd3a6f
The branch, master has been updated
via bfd3a6f13aa935950142a24bf331feb98f987bde (commit)
from 36e889f2cf5497717bdffede0c2f82e7fee79275 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit bfd3a6f13aa935950142a24bf331feb98f987bde
Author: Stefan Metzmacher me...@sernet.de
Date: Thu Sep 24 21:35:38 2009 +0200
s3:winbindd_cm: don't invalidate the whole connection when just samr gave
ACCCESS_DENIED
metze
---
Summary of changes:
source3/winbindd/winbindd_cm.c | 13 -
1 files changed, 12 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 05df19f..9a78839 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -2165,7 +2165,18 @@ NTSTATUS cm_connect_sam(struct winbindd_domain *domain,
TALLOC_CTX *mem_ctx,
done:
- if (!NT_STATUS_IS_OK(result)) {
+ if (NT_STATUS_EQUAL(result, NT_STATUS_ACCESS_DENIED)) {
+ /*
+* if we got access denied, we might just have no access rights
+* to talk to the remote samr server server (e.g. when we are a
+* PDC and we are connecting a w2k8 pdc via an interdomain
+* trust). In that case do not invalidate the whole connection
+* stack
+*/
+ TALLOC_FREE(conn-samr_pipe);
+ ZERO_STRUCT(conn-sam_domain_handle);
+ return result;
+ } else if (!NT_STATUS_IS_OK(result)) {
invalidate_cm_connection(conn);
return result;
}
--
Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-1.0.90-23-gedb58a4
The branch, master has been updated
via edb58a417bfeb094cbbbf96caec8e2918256dad9 (commit)
via 4364419a486c1995bea56dab603cc4960e7c8e7a (commit)
via 74e416108df6934f45ca646d709785dd76ab3c35 (commit)
via 84e5a55a900b01903b80e23045edfc726d8d77a1 (commit)
from db7195d762f69577c4e28f0b0e0ded0ac7f91f0b (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit edb58a417bfeb094cbbbf96caec8e2918256dad9
Merge: db7195d762f69577c4e28f0b0e0ded0ac7f91f0b
4364419a486c1995bea56dab603cc4960e7c8e7a
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Fri Sep 25 17:34:59 2009 +1000
Merge commit 'obnox/master-rebase'
commit 4364419a486c1995bea56dab603cc4960e7c8e7a
Author: Michael Adam ob...@samba.org
Date: Thu Sep 10 16:21:01 2009 +0200
Revert dont check if commit failed, we do allow the commit to fail
sometimes
This reverts commit affa6f47432507e84b7e76b88a2c27fff8e6e2e4.
Transaction commit should not be allowed to fail.
This is a fatal error.
Michael
commit 74e416108df6934f45ca646d709785dd76ab3c35
Author: Michael Adam ob...@samba.org
Date: Thu Sep 10 16:20:26 2009 +0200
Revert allow the transaction commit to fail
This reverts commit 7a6134e684c9ac4763bf198ef1410867b6082c94.
Transaction commit should not be allowed to fail.
This is a fatal error.
Michael
commit 84e5a55a900b01903b80e23045edfc726d8d77a1
Author: Michael Adam ob...@samba.org
Date: Tue Aug 4 09:45:50 2009 +0200
ctdb_client: fix race in starting concurrent transactions on a single node
There are two races in concurrent transactions on a single node.
One in starting a transaction, and one with committing (replaying).
This commit closes the first race by storing the pid in the
transaction-lock record and comparing the own pid against it
as a measure to prevent starting a second transaction when
a second node has come inbetween and changed the pid in the lock
record.
Michael
---
Summary of changes:
client/ctdb_client.c | 25 -
tests/src/ctdb_persistent.c |2 +-
tests/src/ctdb_transaction.c |2 +-
3 files changed, 26 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index 1f5bb4c..9621435 100644
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -3107,11 +3107,13 @@ static int ctdb_transaction_fetch_start(struct
ctdb_transaction_handle *h)
{
struct ctdb_record_handle *rh;
TDB_DATA key;
+ TDB_DATA data;
struct ctdb_ltdb_header header;
TALLOC_CTX *tmp_ctx;
const char *keyname = CTDB_TRANSACTION_LOCK_KEY;
int ret;
struct ctdb_db_context *ctdb_db = h-ctdb_db;
+ pid_t pid;
key.dptr = discard_const(keyname);
key.dsize = strlen(keyname);
@@ -3130,6 +3132,21 @@ again:
talloc_free(tmp_ctx);
return -1;
}
+ /*
+* store the pid in the database:
+* it is not enough that the node is dmaster...
+*/
+ pid = getpid();
+ data.dptr = (unsigned char *)pid;
+ data.dsize = sizeof(pid_t);
+ ret = ctdb_ltdb_store(ctdb_db, key, (rh-header), data);
+ if (ret != 0) {
+ DEBUG(DEBUG_ERR, (__location__ Failed to store pid in
+ transaction record\n));
+ talloc_free(tmp_ctx);
+ return -1;
+ }
+
talloc_free(rh);
ret = tdb_transaction_start(ctdb_db-ltdb-tdb);
@@ -3139,13 +3156,19 @@ again:
return -1;
}
- ret = ctdb_ltdb_fetch(ctdb_db, key, header, tmp_ctx, NULL);
+ ret = ctdb_ltdb_fetch(ctdb_db, key, header, tmp_ctx, data);
if (ret != 0 || header.dmaster != ctdb_db-ctdb-pnn) {
tdb_transaction_cancel(ctdb_db-ltdb-tdb);
talloc_free(tmp_ctx);
goto again;
}
+ if ((data.dsize != sizeof(pid_t)) || (*(pid_t *)(data.dptr) != pid)) {
+ tdb_transaction_cancel(ctdb_db-ltdb-tdb);
+ talloc_free(tmp_ctx);
+ goto again;
+ }
+
talloc_free(tmp_ctx);
return 0;
diff --git a/tests/src/ctdb_persistent.c b/tests/src/ctdb_persistent.c
index 4a50aa7..8110ce1 100644
--- a/tests/src/ctdb_persistent.c
+++ b/tests/src/ctdb_persistent.c
@@ -164,7 +164,7 @@ static void test_store_records(struct ctdb_context *ctdb,
struct event_context *
ret = ctdb_transaction_commit(h);
if (ret != 0) {
DEBUG(DEBUG_ERR,(Failed to commit transaction\n));
- //exit(1);
+ exit(1);
}
/* store the
[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-715-g0650423
The branch, master has been updated via 0650423edf72a07c55ec1f9516f657d635c3a49a (commit) from bfd3a6f13aa935950142a24bf331feb98f987bde (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 0650423edf72a07c55ec1f9516f657d635c3a49a Author: Günther Deschner g...@samba.org Date: Thu Sep 24 23:39:18 2009 +0200 s3-libndr: fix build warning. Guenther --- Summary of changes: source3/librpc/ndr/util.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/librpc/ndr/util.c b/source3/librpc/ndr/util.c index 0510caa..1318bd8 100644 --- a/source3/librpc/ndr/util.c +++ b/source3/librpc/ndr/util.c @@ -107,6 +107,9 @@ const char *ndr_errstr(enum ndr_err_code err) case NDR_ERR_UNREAD_BYTES: return NDR_ERR_UNREAD_BYTES; break; + case NDR_ERR_NDR64: + return NDR_ERR_NDR64; + break; } return talloc_asprintf(talloc_tos(), Unknown NDR error: %d, err); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-718-g956740a
The branch, master has been updated
via 956740aa6fe59940bd59786e096d4062288fa587 (commit)
via 85276e120c192b6a874f51ddee9b59339a87753b (commit)
via fb1eb112672c30d7086881922036066b55436a01 (commit)
from 0650423edf72a07c55ec1f9516f657d635c3a49a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 956740aa6fe59940bd59786e096d4062288fa587
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Wed Sep 23 19:40:14 2009 +0200
s4:LDIFs - enhance the section comments
commit 85276e120c192b6a874f51ddee9b59339a87753b
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Fri Sep 25 10:43:42 2009 +0200
s4:auth/gensec/schannel - fix a const warning
commit fb1eb112672c30d7086881922036066b55436a01
Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de
Date: Fri Sep 25 10:17:17 2009 +0200
s3:smbd/password - move list pointers into blocks
---
Summary of changes:
source3/smbd/password.c| 12 ++--
source4/auth/gensec/schannel.c |3 ++-
source4/setup/provision.ldif |4
source4/setup/provision_configuration.ldif |8
4 files changed, 20 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 4c1cef4..755ff5d 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -551,14 +551,13 @@ bool user_in_list(struct smbd_server_connection *sconn,
static bool user_ok(struct smbd_server_connection *sconn,
const char *user, int snum)
{
- char **valid, **invalid;
bool ret;
- valid = invalid = NULL;
ret = True;
if (lp_invalid_users(snum)) {
- invalid = str_list_copy(talloc_tos(), lp_invalid_users(snum));
+ char **invalid = str_list_copy(talloc_tos(),
+ lp_invalid_users(snum));
if (invalid
str_list_substitute(invalid, %S, lp_servicename(snum))) {
@@ -570,11 +569,12 @@ static bool user_ok(struct smbd_server_connection *sconn,
(const char **)invalid);
}
}
+ TALLOC_FREE(invalid);
}
- TALLOC_FREE(invalid);
if (ret lp_valid_users(snum)) {
- valid = str_list_copy(talloc_tos(), lp_valid_users(snum));
+ char **valid = str_list_copy(talloc_tos(),
+ lp_valid_users(snum));
if ( valid
str_list_substitute(valid, %S, lp_servicename(snum)) ) {
@@ -586,8 +586,8 @@ static bool user_ok(struct smbd_server_connection *sconn,
(const char **)valid);
}
}
+ TALLOC_FREE(valid);
}
- TALLOC_FREE(valid);
if (ret lp_onlyuser(snum)) {
char **user_list = str_list_make_v3(
diff --git a/source4/auth/gensec/schannel.c b/source4/auth/gensec/schannel.c
index 69c50f8..f911dd3 100644
--- a/source4/auth/gensec/schannel.c
+++ b/source4/auth/gensec/schannel.c
@@ -314,7 +314,8 @@ static NTSTATUS schannel_check_packet(struct
gensec_security *gensec_security,
struct schannel_state);
return netsec_incoming_packet(state, mem_ctx, false,
- data, length, sig);
+ discard_const_p(uint8_t, data),
+ length, sig);
}
/*
seal a packet
diff --git a/source4/setup/provision.ldif b/source4/setup/provision.ldif
index d46406e..0e30efc 100644
--- a/source4/setup/provision.ldif
+++ b/source4/setup/provision.ldif
@@ -131,6 +131,8 @@ objectClass: dfsConfiguration
isCriticalSystemObject: TRUE
showInAdvancedViewOnly: FALSE
+# Domain updates
+
dn: CN=DomainUpdates,CN=System,${DOMAINDN}
objectClass: top
objectClass: container
@@ -360,6 +362,8 @@ objectClass: top
objectClass: container
revision: 8
+# End domain updates
+
dn: CN=File Replication Service,CN=System,${DOMAINDN}
objectClass: top
objectClass: applicationSettings
diff --git a/source4/setup/provision_configuration.ldif
b/source4/setup/provision_configuration.ldif
index 9a3c03c..48b4dad 100644
--- a/source4/setup/provision_configuration.ldif
+++ b/source4/setup/provision_configuration.ldif
@@ -639,6 +639,8 @@ appliesTo: bf967a8f-0de6-11d0-a285-00aa003049e2
localizationDisplayId: 28
validAccesses: 256
+# End extended rights
+
# Forest updates
dn: CN=ForestUpdates,${CONFIGDN}
@@ -802,6 +804,8 @@ objectClass: top
objectClass: container
revision: 9
+# End forest updates
+
dn: CN=LostAndFoundConfig,${CONFIGDN}
objectClass: top
objectClass: lostAndFound
@@ -848,6
[SCM] Samba Shared Repository - branch v3-5-test updated - release-4-0-0alpha8-1464-g56f5886
The branch, v3-5-test has been updated
via 56f58860020151cdb720b865b9338d86320f73a6 (commit)
from 50268ab18489b3508cf2ef35069dc0bcb585fbd9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 56f58860020151cdb720b865b9338d86320f73a6
Author: Jeff Layton jlay...@redhat.com
Date: Fri Sep 25 06:47:39 2009 -0400
mount.cifs: print output to stderr
When a mount fails, mount.cifs often prints an error message. In most
cases, this error goes to stdout instead of stderr like it should. Fix
it to print errors to stderr instead.
Reported-by: Jan Engelhardt jeng...@gmx.de
Signed-off-by: Jeff Layton jlay...@redhat.com
---
Summary of changes:
client/mount.cifs.c | 209 +--
1 files changed, 101 insertions(+), 108 deletions(-)
Changeset truncated at 500 lines:
diff --git a/client/mount.cifs.c b/client/mount.cifs.c
index 4387f59..1c04e13 100644
--- a/client/mount.cifs.c
+++ b/client/mount.cifs.c
@@ -273,31 +273,34 @@ BB end finish BB */
static char * check_for_domain(char **);
-static void mount_cifs_usage(void)
+static void mount_cifs_usage(FILE *stream)
{
- printf(\nUsage: %s remotetarget dir -o options\n, thisprogram);
- printf(\nMount the remote target, specified as a UNC name,);
- printf( to a local directory.\n\nOptions:\n);
- printf(\tuser=arg\n\tpass=arg\n\tdom=arg\n);
- printf(\nLess commonly used options:);
-
printf(\n\tcredentials=filename,guest,perm,noperm,setuids,nosetuids,rw,ro,);
-
printf(\n\tsep=char,iocharset=codepage,suid,nosuid,exec,noexec,serverino,);
-
printf(\n\tmapchars,nomapchars,nolock,servernetbiosname=SRV_RFC1001NAME);
- printf(\n\tdirectio,nounix,cifsacl,sec=authentication
mechanism,sign);
- printf(\n\nOptions not needed for servers supporting CIFS Unix
extensions);
- printf(\n\t(e.g. unneeded for mounts to most Samba versions):);
- printf(\n\tuid=uid,gid=gid,dir_mode=mode,file_mode=mode,sfu);
- printf(\n\nRarely used options:);
-
printf(\n\tport=tcpport,rsize=size,wsize=size,unc=unc_name,ip=ip_address,);
-
printf(\n\tdev,nodev,nouser_xattr,netbiosname=OUR_RFC1001NAME,hard,soft,intr,);
-
printf(\n\tnointr,ignorecase,noposixpaths,noacl,prefixpath=path,nobrl);
- printf(\n\tin6_addr);
- printf(\n\nOptions are described in more detail in the manual page);
- printf(\n\tman 8 mount.cifs\n);
- printf(\nTo display the version number of the mount helper:);
- printf(\n\t%s -V\n,thisprogram);
+ fprintf(stream, \nUsage: %s remotetarget dir -o options\n,
thisprogram);
+ fprintf(stream, \nMount the remote target, specified as a UNC name,);
+ fprintf(stream, to a local directory.\n\nOptions:\n);
+ fprintf(stream, \tuser=arg\n\tpass=arg\n\tdom=arg\n);
+ fprintf(stream, \nLess commonly used options:);
+ fprintf(stream,
\n\tcredentials=filename,guest,perm,noperm,setuids,nosetuids,rw,ro,);
+ fprintf(stream,
\n\tsep=char,iocharset=codepage,suid,nosuid,exec,noexec,serverino,);
+ fprintf(stream,
\n\tmapchars,nomapchars,nolock,servernetbiosname=SRV_RFC1001NAME);
+ fprintf(stream, \n\tdirectio,nounix,cifsacl,sec=authentication
mechanism,sign);
+ fprintf(stream, \n\nOptions not needed for servers supporting CIFS
Unix extensions);
+ fprintf(stream, \n\t(e.g. unneeded for mounts to most Samba
versions):);
+ fprintf(stream,
\n\tuid=uid,gid=gid,dir_mode=mode,file_mode=mode,sfu);
+ fprintf(stream, \n\nRarely used options:);
+ fprintf(stream,
\n\tport=tcpport,rsize=size,wsize=size,unc=unc_name,ip=ip_address,);
+ fprintf(stream,
\n\tdev,nodev,nouser_xattr,netbiosname=OUR_RFC1001NAME,hard,soft,intr,);
+ fprintf(stream,
\n\tnointr,ignorecase,noposixpaths,noacl,prefixpath=path,nobrl);
+ fprintf(stream, \n\nOptions are described in more detail in the manual
page);
+ fprintf(stream, \n\tman 8 mount.cifs\n);
+ fprintf(stream, \nTo display the version number of the mount helper:);
+ fprintf(stream, \n\t%s -V\n,thisprogram);
SAFE_FREE(mountpassword);
+
+ if (stream == stderr)
+ exit(EX_USAGE);
+ exit(0);
}
/* caller frees username if necessary */
@@ -348,7 +351,7 @@ static int open_cred_file(char * file_name)
}
}
if(length 4086) {
- printf(mount.cifs failed due to
malformed username in credentials file);
+ fprintf(stderr, mount.cifs failed due
to malformed username in credentials file\n);
memset(line_buf,0,4096);
[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-719-g014a3a9
The branch, master has been updated
via 014a3a992612269344511181a6701bacc816c934 (commit)
from 956740aa6fe59940bd59786e096d4062288fa587 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 014a3a992612269344511181a6701bacc816c934
Author: Günther Deschner g...@samba.org
Date: Fri Sep 25 12:17:17 2009 +0200
lib/util: fix build warning.
Guenther
---
Summary of changes:
lib/util/genrand.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/genrand.c b/lib/util/genrand.c
index 1519931..8c7d88a 100644
--- a/lib/util/genrand.c
+++ b/lib/util/genrand.c
@@ -407,7 +407,7 @@ _PUBLIC_ char** generate_unique_strs(TALLOC_CTX *mem_ctx,
size_t len,
strs = talloc_array(mem_ctx, char *, num);
for (i = 0; i num; i++) {
- char *retstr = talloc_zero_size(mem_ctx, len + 1);
+ char *retstr = (char *)talloc_zero_size(mem_ctx, len + 1);
rem = i;
for (j = len - 1; j = 0; j--) {
place = s_pow(c_size, j);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-720-g76d8365
The branch, master has been updated via 76d836570e22c8916a00c723d86eb3be3d706223 (commit) from 014a3a992612269344511181a6701bacc816c934 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 76d836570e22c8916a00c723d86eb3be3d706223 Author: Simo Sorce sso...@redhat.com Date: Fri Sep 25 10:59:04 2009 -0400 Fixing timeval calculation The code was always doubling microseconds when attempting to round up. --- Summary of changes: lib/tevent/tevent_timed.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/tevent/tevent_timed.c b/lib/tevent/tevent_timed.c index d75653d..cc51bf6 100644 --- a/lib/tevent/tevent_timed.c +++ b/lib/tevent/tevent_timed.c @@ -114,7 +114,7 @@ struct timeval tevent_timeval_add(const struct timeval *tv, uint32_t secs, tv2.tv_sec += secs; tv2.tv_usec += usecs; tv2.tv_sec += tv2.tv_usec / 100; - tv2.tv_usec += tv2.tv_usec % 100; + tv2.tv_usec = tv2.tv_usec % 100; return tv2; } -- Samba Shared Repository
Re: [SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-942-g7bc566a
On Mon, 2009-09-21 at 23:49 +0200, Jelmer Vernooij wrote: Hi Andrew, Oliver, Sorry if this has already been fixed since.. Andrew Bartlett wrote: diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 8a7ed6a..39c3fff 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -36,6 +36,7 @@ import socket import param import registry import samba +import subprocess from auth import system_session from samba import version, Ldb, substitute_var, valid_netbios_name, check_all_substituted, \ DS_BEHAVIOR_WIN2008 subprocess is a relatively new Python package, depending on it would mean that we can't support some of the older python versions that we support at the moment (it's = 2.4 IIRC). Do we really need one of the features from subprocess or could we perhaps fall back to something also present in older versions of Python (os.popen2?). I'm quite happy with this. We handle the case where we can't call terminate() - a newer feature, and it seems to work on enough systems. Andrew Bartlett -- Andrew Bartletthttp://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org Samba Developer, Cisco Inc. signature.asc Description: This is a digitally signed message part
svn commit: samba-web r1324 - in trunk: .
Author: abartlet
Date: 2009-09-25 09:56:46 -0600 (Fri, 25 Sep 2009)
New Revision: 1324
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1324
Log:
Remove mirror redirect JS, now we don't do mirrors
Removed:
trunk/redirect_us.html
Modified:
trunk/header_columns.html
trunk/header_wide.html
Changeset:
Modified: trunk/header_columns.html
===
--- trunk/header_columns.html 2009-09-19 06:05:59 UTC (rev 1323)
+++ trunk/header_columns.html 2009-09-25 15:56:46 UTC (rev 1324)
@@ -52,15 +52,6 @@
input type=submit value=Go /
/form
span|/span
- form action=no_script_yet.cgi name=mirrorForm
-select name=mirrorLocation
onchange=changeMirror(this.form.mirrorLocation)
-option selected=selectedChoose A Mirror/option
-!--#include virtual=/samba/menu_options.html --
-/select
-noscript
- spanJavascript must be enabled for this menu to work./span
-/noscript
- /form
/div
/div
Modified: trunk/header_wide.html
===
--- trunk/header_wide.html 2009-09-19 06:05:59 UTC (rev 1323)
+++ trunk/header_wide.html 2009-09-25 15:56:46 UTC (rev 1324)
@@ -50,16 +50,6 @@
input type=text size=15 name=words value= /
input type=submit value=Go /
/form
- span|/span
- form action=no_script_required.cgi name=mirrorForm
-select name=mirrorLocation
onchange=changeMirror(this.form.mirrorLocation)
-option selected=selectedChoose A Mirror/option
-!--#include virtual=/samba/menu_options.html --
-/select
-noscript
- spanJavascript must be enabled for this menu to work./span
-/noscript
- /form
/div
/div
Deleted: trunk/redirect_us.html
===
--- trunk/redirect_us.html 2009-09-19 06:05:59 UTC (rev 1323)
+++ trunk/redirect_us.html 2009-09-25 15:56:46 UTC (rev 1324)
@@ -1,48 +0,0 @@
-html
-
-head
-
-titleSamba -- Opening Windows to a Wider World/title
-
-meta http-equiv=Content-Type content=text/html; charset=utf-8 /
-meta http-equiv=Content-Language content=en-us /
-meta name=keywords content=Samba SMB CIFS /
-meta name=description content=Home of Samba, the SMB file server /
-
-!--#include virtual=/samba/redirect_include.html --
-
-script type=text/javascript
-!-- Hide from old browsers
-function loadUSMirror()
-{
-if (randomMirror.length 0) {
-window.location = randomMirror[n];
-} else {
-window.location = http://us1.samba.org/samba/;;
-}
-}
-// end hide --
-/script
-
-/head
-
-
-body onload=loadUSMirror()
-noscript
-h2Samba -- Opening Windows to a Wider World/h2
-pstrongJavaScript/strong is strongnot/strong required to use the
Samba web site,
-but strong enabling JavaScript/strong will add some useful features, mostly
-to do with content display and format./p
-
-h3Please choose a mirror/h3
-
-h4For the samba.org web site:/h4
-!--#include virtual=/samba/web_hosts.html --
-
-h4For download ftp sites:/h4
-!--#include virtual=/samba/ftp_hosts.html --
-/noscript
-!--#include virtual=/samba/local_footer.html --
-/body
-/html
-
svn commit: samba-web r1325 - in trunk: .
Author: abartlet Date: 2009-09-25 10:01:52 -0600 (Fri, 25 Sep 2009) New Revision: 1325 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1325 Log: Fix typos and misinformation on the IRC page Modified: trunk/irc.html Changeset: Modified: trunk/irc.html === --- trunk/irc.html 2009-09-25 15:56:46 UTC (rev 1324) +++ trunk/irc.html 2009-09-25 16:01:52 UTC (rev 1325) @@ -4,7 +4,8 @@ h2Samba IRC Channels/h2 -pSamba is discussed on two IRC channels on the a href=http://www.freenode.net/;FreeNode/a network(irc.freenode.net)./p +pSamba is discussed on two IRC channels on the a +href=http://www.freenode.net/;FreeNode/a network (irc.freenode.net)./p h3#samba/h3 @@ -12,7 +13,7 @@ Please keep a few things in mind:/p ul - liMake sure you have read the right parts of the a href=docs/man/documentation/a before asking a question./li + liMake sure you have read the right parts of the a href=docs/documentation/a before asking a question./li liDon't ask if there is anybody who can help, just ask your question. If there is somebody who knows the answer, (s)he will reply./li liMake sure you are either running the latest version of Samba or have verified that your problem is not fixed in a later release then
svn commit: samba-web r1326 - in trunk: .
Author: abartlet Date: 2009-09-25 10:06:15 -0600 (Fri, 25 Sep 2009) New Revision: 1326 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1326 Log: fix formatting inconsistancy Modified: trunk/header_columns.html Changeset: Modified: trunk/header_columns.html === --- trunk/header_columns.html 2009-09-25 16:01:52 UTC (rev 1325) +++ trunk/header_columns.html 2009-09-25 16:06:15 UTC (rev 1326) @@ -51,7 +51,6 @@ input type=text size=15 name=words value= / input type=submit value=Go / /form - span|/span /div /div
svn commit: samba-web r1327 - in trunk: .
Author: jra Date: 2009-09-25 11:03:50 -0600 (Fri, 25 Sep 2009) New Revision: 1327 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1327 Log: Added blog post #2. Jeremy. Modified: trunk/index.html Changeset: Modified: trunk/index.html === --- trunk/index.html2009-09-25 16:06:15 UTC (rev 1326) +++ trunk/index.html2009-09-25 17:03:50 UTC (rev 1327) @@ -24,7 +24,10 @@ h2Latest News/h2 !--#include virtual=/samba/news/headlines.html -- -h4a name=latest9 September 2009/a/h4 +h4a name=latest25 September 2009/a/h4 +p class=headlineA new Samba Team Blog post can be read a href=http://news.samba.org/developers/Samba_Team_Blog_2;here./a/p + +h49 September 2009/a/h4 p class=headlineSamba 3.4.1 Available for Download/p pThis is the latest stable release of the Samba 3.4 series./p @@ -35,8 +38,6 @@ See a href=/samba/history/samba-3.4.1.htmlthe release notes for more info/a./p -h2Samba Team Starts a Blog/h2 - h412 August 2009/h4 p class=headlineSamba 3.2.14 Available for Download/p @@ -56,6 +57,7 @@ Planning/a Wiki page for more information. /p +h2Samba Team Starts a Blog/h2 h407 August 2009/h4 p class=headlineThe first Samba Team Blog post can be read a href=http://news.samba.org/developers/Samba_Team_Blog_1/;here./a/p
[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-721-g9a9202e
The branch, master has been updated
via 9a9202e7bdd2e20e6a4aa719515438271ef82c75 (commit)
from 76d836570e22c8916a00c723d86eb3be3d706223 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9a9202e7bdd2e20e6a4aa719515438271ef82c75
Author: Matthieu Patou m...@matws.net
Date: Wed Sep 23 00:51:25 2009 +0400
pythonbindings: allow add() to have an array of controls as second parameter
Signed-off-by: Jelmer Vernooij jel...@samba.org
---
Summary of changes:
source4/lib/ldb/pyldb.c | 63 --
source4/lib/ldb/tests/python/api.py |8
2 files changed, 67 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/lib/ldb/pyldb.c b/source4/lib/ldb/pyldb.c
index b4f03dc..1ba5109 100644
--- a/source4/lib/ldb/pyldb.c
+++ b/source4/lib/ldb/pyldb.c
@@ -663,21 +663,32 @@ static PyObject *py_ldb_add(PyLdbObject *self, PyObject
*args)
Py_ssize_t dict_pos, msg_pos;
struct ldb_message_element *msgel;
struct ldb_message *msg;
+ struct ldb_context *ldb_ctx;
+ struct ldb_request *req;
PyObject *key, *value;
+ PyObject *py_controls = Py_None;
TALLOC_CTX *mem_ctx;
+ struct ldb_control **parsed_controls;
- if (!PyArg_ParseTuple(args, O, py_msg))
+ if (!PyArg_ParseTuple(args, O|O, py_msg, py_controls ))
return NULL;
+ ldb_ctx = PyLdb_AsLdbContext(self);
mem_ctx = talloc_new(NULL);
-
+ if (py_controls == Py_None) {
+ parsed_controls = NULL;
+ } else {
+ const char **controls = PyList_AsStringList(ldb_ctx,
py_controls, controls);
+ parsed_controls = ldb_parse_control_strings(ldb_ctx, ldb_ctx,
controls);
+ talloc_free(controls);
+ }
if (PyDict_Check(py_msg)) {
PyObject *dn_value = PyDict_GetItemString(py_msg, dn);
msg = ldb_msg_new(mem_ctx);
msg-elements = talloc_zero_array(msg, struct
ldb_message_element, PyDict_Size(py_msg));
msg_pos = dict_pos = 0;
if (dn_value) {
- if (!PyObject_AsDn(msg, dn_value,
PyLdb_AsLdbContext(self), msg-dn)) {
+ if (!PyObject_AsDn(msg, dn_value, ldb_ctx, msg-dn)) {
PyErr_SetString(PyExc_TypeError, unable to
import dn object);
talloc_free(mem_ctx);
return NULL;
@@ -713,8 +724,52 @@ static PyObject *py_ldb_add(PyLdbObject *self, PyObject
*args)
} else {
msg = PyLdbMessage_AsMessage(py_msg);
}
+
+ ret = ldb_msg_sanity_check(ldb_ctx, msg);
+if (ret != LDB_SUCCESS) {
+ PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret,
PyLdb_AsLdbContext(self));
+ talloc_free(mem_ctx);
+ return NULL;
+}
+
+ret = ldb_build_add_req(req, ldb_ctx, ldb_ctx,
+msg,
+parsed_controls,
+NULL,
+ldb_op_default_callback,
+NULL);
+
+if (ret != LDB_SUCCESS) {
+ PyErr_SetString(PyExc_TypeError, failed to build request);
+ talloc_free(mem_ctx);
+ return NULL;
+ }
+
+/* do request and autostart a transaction */
+ /* Then let's LDB handle the message error in case of pb as they are
meaningful */
- ret = ldb_add(PyLdb_AsLdbContext(self), msg);
+ret = ldb_transaction_start(ldb_ctx);
+if (ret != LDB_SUCCESS) {
+ talloc_free(req);
+ talloc_free(mem_ctx);
+ PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret,
PyLdb_AsLdbContext(self));
+}
+
+ret = ldb_request(ldb_ctx, req);
+if (ret == LDB_SUCCESS) {
+ret = ldb_wait(req-handle, LDB_WAIT_ALL);
+}
+
+ if (ret == LDB_SUCCESS) {
+ret = ldb_transaction_commit(ldb_ctx);
+} else {
+ ldb_transaction_cancel(ldb_ctx);
+ if (ldb_ctx-err_string == NULL) {
+ /* no error string was setup by the backend */
+ ldb_asprintf_errstring(ldb_ctx, %s (%d),
ldb_strerror(ret), ret);
+ }
+ }
+ talloc_free(req);
talloc_free(mem_ctx);
PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret,
PyLdb_AsLdbContext(self));
diff --git a/source4/lib/ldb/tests/python/api.py
b/source4/lib/ldb/tests/python/api.py
index 133bd18..956908d 100755
--- a/source4/lib/ldb/tests/python/api.py
+++ b/source4/lib/ldb/tests/python/api.py
@@
[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-722-g390cd90
The branch, master has been updated
via 390cd90c8f0004136290e9e67d0e27f0ac00fe2c (commit)
from 9a9202e7bdd2e20e6a4aa719515438271ef82c75 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 390cd90c8f0004136290e9e67d0e27f0ac00fe2c
Author: Jelmer Vernooij jel...@samba.org
Date: Sat Sep 26 01:34:22 2009 +0200
pidl(s4.python): Fix arguments to PyCObject_FromVoidPtr for string_array's.
Caught by Guenther.
---
Summary of changes:
pidl/lib/Parse/Pidl/Samba4/Python.pm |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm
b/pidl/lib/Parse/Pidl/Samba4/Python.pm
index 3baaa67..eb8bd31 100644
--- a/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -998,7 +998,7 @@ sub ConvertScalarToPython($$$)
}
# Not yet supported
- if ($ctypename eq string_array) { return
PyCObject_FromVoidPtr($cvar); }
+ if ($ctypename eq string_array) { return
PyCObject_FromVoidPtr($cvar, talloc_free); }
if ($ctypename eq ipv4address) { return PyString_FromString($cvar);
}
if ($ctypename eq pointer) {
return PyCObject_FromVoidPtr($cvar, talloc_free);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-723-ga6d4eec
The branch, master has been updated via a6d4eec3a5bef5ed4b388961d5a50309e24ed970 (commit) from 390cd90c8f0004136290e9e67d0e27f0ac00fe2c (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a6d4eec3a5bef5ed4b388961d5a50309e24ed970 Author: Jelmer Vernooij jel...@samba.org Date: Sat Sep 26 02:38:09 2009 +0200 samba.tests.provision: Remove broken become_dc test. --- Summary of changes: source4/scripting/python/samba/tests/provision.py | 26 + 1 files changed, 1 insertions(+), 25 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py index 7a259f7..f340735 100644 --- a/source4/scripting/python/samba/tests/provision.py +++ b/source4/scripting/python/samba/tests/provision.py @@ -18,7 +18,7 @@ # import os -from samba.provision import setup_secretsdb, secretsdb_become_dc, findnss +from samba.provision import setup_secretsdb, findnss import samba.tests from ldb import Dn from samba import param @@ -44,30 +44,6 @@ class ProvisionTestCase(samba.tests.TestCaseInTempDir): del ldb os.unlink(path) -def test_become_dc(self): -path = os.path.join(self.tempdir, secrets.ldb) -secrets_ldb = setup_secretsdb(path, setup_path, None, None, lp=lp) -try: -secretsdb_become_dc(secrets_ldb, setup_path, domain=EXAMPLE, - realm=example, netbiosname=myhost, - domainsid=S-5-22, keytab_path=keytab.path, - samdb_url=ldap://url/;, - dns_keytab_path=dns.keytab, dnspass=bla, - machinepass=machinepass, dnsdomain=example.com) -self.assertEquals(0, - len(secrets_ldb.search(samAccountName=krbtgt,flatname=EXAMPLE,CN=Principals))) -self.assertEquals(keytab.path, -secrets_ldb.searchone(basedn=flatname=EXAMPLE,CN=primary domains, - expression=(privateKeytab=*), - attribute=privateKeytab)) -self.assertEquals(S-5-22, -secrets_ldb.searchone(basedn=flatname=EXAMPLE,CN=primary domains, - expression=objectSid=*, attribute=objectSid)) - -finally: -del secrets_ldb -os.unlink(path) - class FindNssTests(unittest.TestCase): Test findnss() function. -- Samba Shared Repository
Re: [SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-1424-g1d9a95e
Hi Matthias, On Mon, 2009-09-07 at 01:44 -0500, Matthias Dieter Wallnöfer wrote: commit 5f2832a5dc02e6d240c398e3fada4c92ae99d4ea Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de Date: Mon Aug 17 21:29:47 2009 +0200 s4:samldb - Major rework This fixes up the change of the primary group of a user when using the ADUC console: - When the primaryGroupId attribute changes, we have to delete the member/memberOf attribute reference of the new primary group and add one for the old primary group. - Deny deletion of primary groups according to Windows Server (so we cannot have invalid primaryGroupID attributes in our AD). - We cannot add a primary group directly before it isn't a secondary one of a user account. - We cannot add a secondary reference (member attribute) when the group has been chosen as primary one. This also removes the LDB templates which are basically overhead now. This should also fix bug #6599. This patch removes setup_templatesdb from samba.samdb, which is still being used by samba.tests.samdb. Cheers, Jelmer -- Jelmer Vernooij jel...@samba.org - http://samba.org/~jelmer/ Jabber: jel...@jabber.fsfe.org signature.asc Description: This is a digitally signed message part
[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-725-ga77b5d2
The branch, master has been updated
via a77b5d2a977d0f89ebe454aca1dba6e8b698ec3e (commit)
via 0959ae927649ad0ee2c237d4ef8b1eb41866561e (commit)
from a6d4eec3a5bef5ed4b388961d5a50309e24ed970 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a77b5d2a977d0f89ebe454aca1dba6e8b698ec3e
Author: Jeremy Allison j...@samba.org
Date: Fri Sep 25 21:39:52 2009 -0700
Rewrite vfs_transparent example for the new VFS changes.
Jeremy.
commit 0959ae927649ad0ee2c237d4ef8b1eb41866561e
Author: Jeremy Allison j...@samba.org
Date: Fri Sep 25 20:51:50 2009 -0700
Fix vfs module sample for new interface.
Jeremy.
---
Summary of changes:
examples/VFS/shadow_copy_test.c | 11 +-
examples/VFS/skel_transparent.c | 422 +++
2 files changed, 296 insertions(+), 137 deletions(-)
Changeset truncated at 500 lines:
diff --git a/examples/VFS/shadow_copy_test.c b/examples/VFS/shadow_copy_test.c
index 1ba46b7..fab7007 100644
--- a/examples/VFS/shadow_copy_test.c
+++ b/examples/VFS/shadow_copy_test.c
@@ -2,6 +2,7 @@
* TEST implementation of an Shadow Copy module
*
* Copyright (C) Stefan Metzmacher 2003
+ * Copyright (C) Jeremy Allison 2009.
*
* 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
@@ -74,13 +75,11 @@ static int test_get_shadow_copy_data(vfs_handle_struct
*handle, files_struct *fs
/* VFS operations structure */
-static vfs_op_tuple shadow_copy_test_ops[] = {
- {SMB_VFS_OP(test_get_shadow_copy_data),
SMB_VFS_OP_GET_SHADOW_COPY_DATA,SMB_VFS_LAYER_OPAQUE},
-
- {SMB_VFS_OP(NULL), SMB_VFS_OP_NOOP,
SMB_VFS_LAYER_NOOP}
+static struct vfs_fn_pointers vfs_test_shadow_copy_fns = {
+ .get_shadow_copy_data = test_get_shadow_copy_data
};
-NTSTATUS init_module(void)
+NTSTATUS vfs_shadow_copy_test_init(void)
{
- return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, shadow_copy_test,
shadow_copy_test_ops);
+ return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, shadow_copy_test,
vfs_test_shadow_copy_fns);
}
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index cce1d13..2029a65 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -5,6 +5,7 @@
* Copyright (C) Tim Potter, 1999-2000
* Copyright (C) Alexander Bokovoy, 2002
* Copyright (C) Stefan (metze) Metzmacher, 2003
+ * Copyright (C) Jeremy Allison 2009
*
* 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
@@ -74,6 +75,11 @@ static int skel_statvfs(struct vfs_handle_struct *handle,
const char *path, stru
return SMB_VFS_NEXT_STATVFS(handle, path, statbuf);
}
+static uint32_t skel_fs_capabilities(struct vfs_handle_struct *handle, enum
timestamp_set_resolution *p_ts_res)
+{
+ return SMB_VFS_NEXT_FS_CAPABILITIES(handle, p_ts_res);
+}
+
static SMB_STRUCT_DIR *skel_opendir(vfs_handle_struct *handle, const char
*fname, const char *mask, uint32 attr)
{
return SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
@@ -88,7 +94,7 @@ static SMB_STRUCT_DIRENT *skel_readdir(vfs_handle_struct
*handle,
static void skel_seekdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp,
long offset)
{
- return SMB_VFS_NEXT_SEEKDIR(handle, dirp, offset);
+ SMB_VFS_NEXT_SEEKDIR(handle, dirp, offset);
}
static long skel_telldir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp)
@@ -96,9 +102,9 @@ static long skel_telldir(vfs_handle_struct *handle,
SMB_STRUCT_DIR *dirp)
return SMB_VFS_NEXT_TELLDIR(handle, dirp);
}
-static void skel_rewinddir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp)
+static void skel_rewind_dir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp)
{
- return SMB_VFS_NEXT_REWINDDIR(handle, dirp);
+ SMB_VFS_NEXT_REWINDDIR(handle, dirp);
}
static int skel_mkdir(vfs_handle_struct *handle, const char *path, mode_t
mode)
@@ -116,18 +122,56 @@ static int skel_closedir(vfs_handle_struct *handle,
SMB_STRUCT_DIR *dir)
return SMB_VFS_NEXT_CLOSEDIR(handle, dir);
}
+static void skel_init_search_op(struct vfs_handle_struct *handle,
SMB_STRUCT_DIR *dirp)
+{
+ SMB_VFS_NEXT_INIT_SEARCH_OP(handle, dirp);
+}
+
static int skel_open(vfs_handle_struct *handle, struct smb_filename *smb_fname,
files_struct *fsp, int flags, mode_t mode)
{
return SMB_VFS_NEXT_OPEN(handle, smb_fname, fsp, flags, mode);
}
-static int skel_close(vfs_handle_struct *handle, files_struct *fsp)
+static NTSTATUS skel_create_file(struct vfs_handle_struct *handle,
+struct smb_request *req,
+
[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-726-g2d13513
The branch, master has been updated
via 2d13513796e4a88130a7fc57bcb4f047f122e824 (commit)
from a77b5d2a977d0f89ebe454aca1dba6e8b698ec3e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2d13513796e4a88130a7fc57bcb4f047f122e824
Author: Jeremy Allison j...@samba.org
Date: Fri Sep 25 21:43:13 2009 -0700
Remove unused static fn.
Jeremy.
---
Summary of changes:
examples/VFS/skel_transparent.c |5 -
1 files changed, 0 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 2029a65..c86e0b7 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -701,11 +701,6 @@ static int skel_set_offline(struct vfs_handle_struct
*handle, const char *path)
return SMB_VFS_NEXT_SET_OFFLINE(handle, path);
}
-static bool skel_is_remotestorage(struct vfs_handle_struct *handle, const char
*path)
-{
- return SMB_VFS_NEXT_IS_REMOTESTORAGE(handle, path);
-}
-
/* VFS operations structure */
struct vfs_fn_pointers skel_transparent_fns = {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-728-g8762254
The branch, master has been updated
via 8762254c7e51fe6855f3bc1e401adc7f435c02d7 (commit)
via 2f1835eb8c8d9b6419c2e2e63238a8242b84cf4d (commit)
from 2d13513796e4a88130a7fc57bcb4f047f122e824 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8762254c7e51fe6855f3bc1e401adc7f435c02d7
Author: Jeremy Allison j...@samba.org
Date: Fri Sep 25 22:19:27 2009 -0700
Fix the opaque sample module for the new VFS interface.
Jeremy.
commit 2f1835eb8c8d9b6419c2e2e63238a8242b84cf4d
Author: Jeremy Allison j...@samba.org
Date: Fri Sep 25 22:02:18 2009 -0700
Update the advice for the new VFS system.
Jeremy.
---
Summary of changes:
examples/VFS/skel_opaque.c | 605 +--
examples/VFS/skel_transparent.c |7 +-
2 files changed, 392 insertions(+), 220 deletions(-)
Changeset truncated at 500 lines:
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index a0cb533..243621e 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -1,10 +1,11 @@
/*
- * Skeleton VFS module. Implements passthrough operation of all VFS
- * calls to disk functions.
+ * Skeleton VFS module. Implements dummy versions of all VFS
+ * functions.
*
* Copyright (C) Tim Potter, 1999-2000
* Copyright (C) Alexander Bokovoy, 2002
* Copyright (C) Stefan (metze) Metzmacher, 2003
+ * Copyright (C) Jeremy Allison 2009
*
* 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
@@ -28,261 +29,336 @@
*/
/* If you take this file as template for your module
- * please make sure that you remove all vfswrap_* functions and
- * implement your own function!!
- *
- * for functions you didn't want to provide implement dummy functions
- * witch return ERROR and errno = ENOSYS; !
- *
- * --metze
- */
-
-/* NOTE: As of approximately Samba 3.0.24, the vfswrap_* functions are not
- * global symbols. They are included here only as an pointer that opaque
- * operations should not call further into the VFS.
+ * you must re-implement every function.
*/
static int skel_connect(vfs_handle_struct *handle, const char *service, const
char *user)
{
- return 0;
+ errno = ENOSYS;
+ return -1;
}
-static void skel_disconnect(vfs_handle_struct *handle, connection_struct *conn)
+static void skel_disconnect(vfs_handle_struct *handle)
{
- return;
+ ;
}
static uint64_t skel_disk_free(vfs_handle_struct *handle, const char *path,
bool small_query, uint64_t *bsize,
uint64_t *dfree, uint64_t *dsize)
{
- return vfswrap_disk_free(NULL, path, small_query, bsize,
-dfree, dsize);
+ *bsize = 0;
+ *dfree = 0;
+ *dsize = 0;
+ return 0;
}
static int skel_get_quota(vfs_handle_struct *handle, enum SMB_QUOTA_TYPE
qtype, unid_t id, SMB_DISK_QUOTA *dq)
{
- return vfswrap_get_quota(NULL, qtype, id, dq);
+ errno = ENOSYS;
+ return -1;
}
static int skel_set_quota(vfs_handle_struct *handle, enum SMB_QUOTA_TYPE
qtype, unid_t id, SMB_DISK_QUOTA *dq)
{
- return vfswrap_set_quota(NULL, qtype, id, dq);
+ errno = ENOSYS;
+ return -1;
}
static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct
*fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels)
{
- return vfswrap_get_shadow_copy_data(NULL, fsp, shadow_copy_data,
labels);
+ errno = ENOSYS;
+ return -1;
}
-static int skel_statvfs(struct vfs_handle_struct *handle, const char *path,
struct vfs_statvfs_struct *statbuf)
+static int skel_statvfs(struct vfs_handle_struct *handle, const char *path,
struct vfs_statvfs_struct *statbuf)
{
- return vfswrap_statvfs(NULL, path, statbuf);
+ errno = ENOSYS;
+ return -1;
+}
+
+static uint32_t skel_fs_capabilities(struct vfs_handle_struct *handle, enum
timestamp_set_resolution *p_ts_res)
+{
+ return 0;
}
static SMB_STRUCT_DIR *skel_opendir(vfs_handle_struct *handle, const char
*fname, const char *mask, uint32 attr)
{
- return vfswrap_opendir(NULL, fname, mask, attr);
+ return NULL;
}
static SMB_STRUCT_DIRENT *skel_readdir(vfs_handle_struct *handle,
SMB_STRUCT_DIR *dirp,
SMB_STRUCT_STAT *sbuf)
{
- return vfswrap_readdir(NULL, dirp, sbuf);
+ return NULL;
}
static void skel_seekdir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp,
long offset)
{
- vfswrap_seekdir(NULL, dirp, offset);
+ ;
}
static long skel_telldir(vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp)
{
- return vfswrap_telldir(NULL, dirp);
+ return (long)-1;
}
-static void
