Rev 597: merge from ronnie in http://samba.org/~tridge/ctdb
revno: 597
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Thu 2007-08-30 17:16:23 +1000
message:
merge from ronnie
modified:
config/events.d/60.nfs nfs-20070601141008-hy3h4qgbk1jd2jci-1
revno: 432.1.238
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg [EMAIL PROTECTED]
branch nick: ctdb
timestamp: Thu 2007-08-30 15:27:45 +1000
message:
when we start 60.nfs we must make sure that the shared storage
nfs-state directory actually exists (by creating it)
or else the lock manager will not start
revno: 432.1.237
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg [EMAIL PROTECTED]
branch nick: ctdb
timestamp: Mon 2007-08-27 18:04:17 +1000
message:
merge from tridge
=== modified file 'config/events.d/60.nfs'
--- a/config/events.d/60.nfs2007-07-11 22:31:56 +
+++ b/config/events.d/60.nfs2007-08-30 05:27:45 +
@@ -14,7 +14,8 @@
case $cmd in
startup)
- mkdir -p /etc/ctdb/state/nfs
+ /bin/mkdir -p /etc/ctdb/state/nfs
+ /bin/mkdir -p ${STATD_SHARED_DIRECTORY}/${PUBLIC_IP}
/bin/mkdir -p /etc/ctdb/state/statd/ip
ctdb_wait_directories nfslock $STATD_SHARED_DIRECTORY
svn commit: samba r24796 - in branches/SAMBA_4_0/source/utils: .
Author: kai
Date: 2007-08-30 09:02:40 + (Thu, 30 Aug 2007)
New Revision: 24796
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24796
Log:
Add bounds checking to ntlm_auth, increase initial buffer size to 300 to avoid
one talloc/fgets loop in the common case, which is slightly over 200 for the KK
response.
Modified:
branches/SAMBA_4_0/source/utils/ntlm_auth.c
Changeset:
Modified: branches/SAMBA_4_0/source/utils/ntlm_auth.c
===
--- branches/SAMBA_4_0/source/utils/ntlm_auth.c 2007-08-30 06:45:11 UTC (rev
24795)
+++ branches/SAMBA_4_0/source/utils/ntlm_auth.c 2007-08-30 09:02:40 UTC (rev
24796)
@@ -38,7 +38,8 @@
#include lib/messaging/irpc.h
#include auth/ntlmssp/ntlmssp.h
-#define INITIAL_BUFFER_SIZE 200
+#define INITIAL_BUFFER_SIZE 300
+#define MAX_BUFFER_SIZE 63000
enum stdio_helper_mode {
SQUID_2_4_BASIC,
@@ -871,7 +872,7 @@
char *buf;
char tmp[INITIAL_BUFFER_SIZE+1];
unsigned int mux_id = 0;
- int length;
+ int length, buf_size = 0;
char *c;
struct mux_private {
unsigned int max_mux;
@@ -907,6 +908,15 @@
}
buf = talloc_append_string(buf, buf, tmp);
+ buf_size += INITIAL_BUFFER_SIZE;
+
+ if (buf_size MAX_BUFFER_SIZE) {
+ DEBUG(0, (Invalid Request (too large)\n));
+ x_fprintf(x_stdout, ERR\n);
+ talloc_free(buf);
+ return;
+ }
+
c = strchr(buf, '\n');
} while (c == NULL);
svn commit: samba r24798 - in branches/SAMBA_4_0/source: . torture/raw
Author: vlendec
Date: 2007-08-30 09:51:33 + (Thu, 30 Aug 2007)
New Revision: 24798
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24798
Log:
RAW-SAMBA3POSIXTIMEDLOCK
This adds the torture:localdir option, smbtorture expects the share to actually
reside in this directory. This might open up more solid posix vs cifs tests.
Modified:
branches/SAMBA_4_0/source/samba4-knownfail
branches/SAMBA_4_0/source/torture/raw/raw.c
branches/SAMBA_4_0/source/torture/raw/samba3misc.c
Changeset:
Modified: branches/SAMBA_4_0/source/samba4-knownfail
===
--- branches/SAMBA_4_0/source/samba4-knownfail 2007-08-30 09:15:07 UTC (rev
24797)
+++ branches/SAMBA_4_0/source/samba4-knownfail 2007-08-30 09:51:33 UTC (rev
24798)
@@ -13,3 +13,4 @@
RPC-EPMAPPER.*/Insert
RPC-EPMAPPER.*/InqObject
RPC-DFS.*
+RAW-SAMBA3POSIXTIMEDLOCK
Modified: branches/SAMBA_4_0/source/torture/raw/raw.c
===
--- branches/SAMBA_4_0/source/torture/raw/raw.c 2007-08-30 09:15:07 UTC (rev
24797)
+++ branches/SAMBA_4_0/source/torture/raw/raw.c 2007-08-30 09:51:33 UTC (rev
24798)
@@ -67,6 +67,8 @@
torture_suite_add_simple_test(suite, SAMBA3BADPATH,
torture_samba3_badpath);
torture_suite_add_simple_test(suite, SAMBA3CASEINSENSITIVE,
torture_samba3_caseinsensitive);
+ torture_suite_add_simple_test(suite, SAMBA3POSIXTIMEDLOCK,
+ torture_samba3_posixtimedlock);
torture_suite_add_simple_test(suite, SCAN-EAMAX, torture_max_eas);
suite-description = talloc_strdup(suite,
Modified: branches/SAMBA_4_0/source/torture/raw/samba3misc.c
===
--- branches/SAMBA_4_0/source/torture/raw/samba3misc.c 2007-08-30 09:15:07 UTC
(rev 24797)
+++ branches/SAMBA_4_0/source/torture/raw/samba3misc.c 2007-08-30 09:51:33 UTC
(rev 24798)
@@ -24,6 +24,7 @@
#include system/filesys.h
#include libcli/libcli.h
#include torture/util.h
+#include lib/events/events.h
#define CHECK_STATUS(status, correct) do { \
if (!NT_STATUS_EQUAL(status, correct)) { \
@@ -665,3 +666,153 @@
talloc_free(mem_ctx);
return ret;
}
+
+/*
+ * Check that Samba3 correctly deals with conflicting posix byte range locks
+ * on an underlying file
+ */
+
+BOOL torture_samba3_posixtimedlock(struct torture_context *tctx)
+{
+ struct smbcli_state *cli;
+ NTSTATUS status;
+ BOOL ret = True;
+ const char *dirname = posixlock;
+ const char *fname = locked;
+ const char *fpath;
+ const char *localdir;
+ const char *localname;
+ int fnum = -1;
+
+ int fd = -1;
+ struct flock posix_lock;
+
+ union smb_lock io;
+ struct smb_lock_entry lock_entry;
+ struct smbcli_request *req;
+
+ if (!torture_open_connection(cli, 0)) {
+ ret = False;
+ goto done;
+ }
+
+ smbcli_deltree(cli-tree, dirname);
+
+ status = smbcli_mkdir(cli-tree, dirname);
+ if (!NT_STATUS_IS_OK(status)) {
+ torture_warning(tctx, smbcli_mkdir failed: %s\n,
+ nt_errstr(status));
+ ret = False;
+ goto done;
+ }
+
+ if (!(fpath = talloc_asprintf(tctx, %s\\%s, dirname, fname))) {
+ torture_warning(tctx, talloc failed\n);
+ ret = False;
+ goto done;
+ }
+ fnum = smbcli_open(cli-tree, fpath, O_RDWR | O_CREAT, DENY_NONE);
+ if (fnum == -1) {
+ torture_warning(tctx, Could not create file %s: %s\n, fpath,
+ smbcli_errstr(cli-tree));
+ ret = False;
+ goto done;
+ }
+
+ if (!(localdir = torture_setting_string(tctx, localdir, NULL))) {
+ torture_warning(tctx, Need 'localdir' setting\n);
+ ret = False;
+ goto done;
+ }
+
+ if (!(localname = talloc_asprintf(tctx, %s/%s/%s, localdir, dirname,
+ fname))) {
+ torture_warning(tctx, talloc failed\n);
+ ret = False;
+ goto done;
+ }
+
+ /*
+* Lock a byte range from posix
+*/
+
+ fd = open(localname, O_RDWR);
+ if (fd == -1) {
+ torture_warning(tctx, open(%s) failed: %s\n,
+ localname, strerror(errno));
+ goto done;
+ }
+
+ posix_lock.l_type = F_WRLCK;
+ posix_lock.l_whence = SEEK_SET;
+ posix_lock.l_start = 0;
+ posix_lock.l_len = 1;
+
+ if (fcntl(fd, F_SETLK, posix_lock) == -1) {
+ torture_warning(tctx, fcntl failed: %s\n, strerror(errno));
+ ret = False;
+ goto done;
+ }
+
+ /*
Re: svn commit: samba r24787 - in branches/SAMBA_3_2_0/source: rpc_parse utils
On Wed, Aug 29, 2007 at 05:14:55PM +, [EMAIL PROTECTED] wrote: Author: jra Date: 2007-08-29 17:14:54 + (Wed, 29 Aug 2007) New Revision: 24787 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24787 Log: Janitor for Mimir. Mimir, you checked into SAMBA_3_2 and SAMBA_3_0 - this second branch is defunct. You should be checking into SAMBA_3_2_0 instead - this is what we will be shipping as 3.2.0. Oh, sorry. I thought I have already checked it into 3_2_0 after I found my samba3 tree was SAMBA_3_0. Thanks! cheers, -- Rafal Szczesniak Samba Team member http://www.samba.org signature.asc Description: Digital signature
svn commit: samba r24800 - in branches/SAMBA_4_0/source: .
Author: vlendec Date: 2007-08-30 10:32:22 + (Thu, 30 Aug 2007) New Revision: 24800 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24800 Log: Don't execute RAW-SAMBA3POSIXTIMEDLOCK Thanks jelmer, I was not aware of the difference between knownfail and skip Modified: branches/SAMBA_4_0/source/samba4-knownfail branches/SAMBA_4_0/source/samba4-skip Changeset: Modified: branches/SAMBA_4_0/source/samba4-knownfail === --- branches/SAMBA_4_0/source/samba4-knownfail 2007-08-30 09:52:21 UTC (rev 24799) +++ branches/SAMBA_4_0/source/samba4-knownfail 2007-08-30 10:32:22 UTC (rev 24800) @@ -13,4 +13,3 @@ RPC-EPMAPPER.*/Insert RPC-EPMAPPER.*/InqObject RPC-DFS.* -RAW-SAMBA3POSIXTIMEDLOCK Modified: branches/SAMBA_4_0/source/samba4-skip === --- branches/SAMBA_4_0/source/samba4-skip 2007-08-30 09:52:21 UTC (rev 24799) +++ branches/SAMBA_4_0/source/samba4-skip 2007-08-30 10:32:22 UTC (rev 24800) @@ -47,3 +47,4 @@ RPC-DSSYNC RPC-SAMSYNC LDAP-UPTODATEVECTOR +RAW-SAMBA3POSIXTIMEDLOCK
Rev 598: up the release number in http://samba.org/~tridge/ctdb
revno: 598 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Thu 2007-08-30 17:51:05 +1000 message: up the release number modified: packaging/RPM/ctdb.specctdb.spec-20070527204758-biuh7znabuwan3zn-3 === modified file 'packaging/RPM/ctdb.spec' --- a/packaging/RPM/ctdb.spec 2007-08-15 05:01:31 + +++ b/packaging/RPM/ctdb.spec 2007-08-30 07:51:05 + @@ -5,7 +5,7 @@ Packager: Samba Team [EMAIL PROTECTED] Name: ctdb Version: 1.0 -Release: 8 +Release: 9 Epoch: 0 License: GNU GPL version 3 Group: System Environment/Daemons
Rev 610: up the release number in http://samba.org/~tridge/3_0-ctdb
revno: 610 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: s3-ctdb-tridge timestamp: Thu 2007-08-30 17:51:56 +1000 message: up the release number modified: packaging/RHEL4-CTDB/samba.spec samba.spec-20070530192107-og9sp62ho5xuaaer-4 === modified file 'packaging/RHEL4-CTDB/samba.spec' --- a/packaging/RHEL4-CTDB/samba.spec 2007-07-24 00:38:17 + +++ b/packaging/RHEL4-CTDB/samba.spec 2007-08-30 07:51:56 + @@ -6,7 +6,7 @@ Packager: Samba Team [EMAIL PROTECTED] Name: samba Version: 3.0.25 -Release: ctdb.1 +Release: ctdb.2 Epoch:0 License: GNU GPL version 2 Group: System Environment/Daemons
svn commit: samba r24801 - in branches: SAMBA_3_2/source/nsswitch SAMBA_3_2_0/source/nsswitch
Author: gd
Date: 2007-08-30 11:26:17 + (Thu, 30 Aug 2007)
New Revision: 24801
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24801
Log:
When told to ignore the winbind cache also do so while trying to store entries.
Thanks Michael for pointing this out.
Guenther
Modified:
branches/SAMBA_3_2/source/nsswitch/winbindd_cache.c
branches/SAMBA_3_2_0/source/nsswitch/winbindd_cache.c
Changeset:
Modified: branches/SAMBA_3_2/source/nsswitch/winbindd_cache.c
===
--- branches/SAMBA_3_2/source/nsswitch/winbindd_cache.c 2007-08-30 10:32:22 UTC
(rev 24800)
+++ branches/SAMBA_3_2/source/nsswitch/winbindd_cache.c 2007-08-30 11:26:17 UTC
(rev 24801)
@@ -799,6 +799,10 @@
char *kstr;
TDB_DATA key, data;
+ if (opt_nocache) {
+ return;
+ }
+
va_start(ap, format);
smb_xvasprintf(kstr, format, ap);
va_end(ap);
Modified: branches/SAMBA_3_2_0/source/nsswitch/winbindd_cache.c
===
--- branches/SAMBA_3_2_0/source/nsswitch/winbindd_cache.c 2007-08-30
10:32:22 UTC (rev 24800)
+++ branches/SAMBA_3_2_0/source/nsswitch/winbindd_cache.c 2007-08-30
11:26:17 UTC (rev 24801)
@@ -799,6 +799,10 @@
char *kstr;
TDB_DATA key, data;
+ if (opt_nocache) {
+ return;
+ }
+
va_start(ap, format);
smb_xvasprintf(kstr, format, ap);
va_end(ap);
svn commit: samba r24802 - in branches: SAMBA_3_2/source/script/tests SAMBA_3_2_0/source/script/tests
Author: vlendec Date: 2007-08-30 14:16:20 + (Thu, 30 Aug 2007) New Revision: 24802 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24802 Log: Activate new tests RAW-SAMBA3CASEINSENSITIVE and RAW-SAMBA3POSIXTIMEDLOCK Modified: branches/SAMBA_3_2/source/script/tests/selftest.sh branches/SAMBA_3_2/source/script/tests/test_posix_s3.sh branches/SAMBA_3_2_0/source/script/tests/selftest.sh branches/SAMBA_3_2_0/source/script/tests/test_posix_s3.sh Changeset: Modified: branches/SAMBA_3_2/source/script/tests/selftest.sh === --- branches/SAMBA_3_2/source/script/tests/selftest.sh 2007-08-30 11:26:17 UTC (rev 24801) +++ branches/SAMBA_3_2/source/script/tests/selftest.sh 2007-08-30 14:16:20 UTC (rev 24802) @@ -200,6 +200,7 @@ TORTURE4_OPTIONS=$SAMBA4CONFIGURATION TORTURE4_OPTIONS=$TORTURE4_OPTIONS --maximum-runtime=$TORTURE_MAXTIME TORTURE4_OPTIONS=$TORTURE4_OPTIONS --target=samba3 +TORTURE4_OPTIONS=$TORTURE4_OPTIONS --option=torture:localdir=$PREFIX_ABS/tmp export TORTURE4_OPTIONS if [ x$RUN_FROM_BUILD_FARM = xyes ];then Modified: branches/SAMBA_3_2/source/script/tests/test_posix_s3.sh === --- branches/SAMBA_3_2/source/script/tests/test_posix_s3.sh 2007-08-30 11:26:17 UTC (rev 24801) +++ branches/SAMBA_3_2/source/script/tests/test_posix_s3.sh 2007-08-30 14:16:20 UTC (rev 24802) @@ -32,6 +32,7 @@ raw=$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK raw=$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE raw=$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH RAW-SFILEINFO-RENAME +raw=$raw RAW-SAMBA3CASEINSENSITIVE RAW-SAMBA3POSIXTIMEDLOCK rpc=RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC rpc=$rpc RPC-UNIXINFO RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC Modified: branches/SAMBA_3_2_0/source/script/tests/selftest.sh === --- branches/SAMBA_3_2_0/source/script/tests/selftest.sh2007-08-30 11:26:17 UTC (rev 24801) +++ branches/SAMBA_3_2_0/source/script/tests/selftest.sh2007-08-30 14:16:20 UTC (rev 24802) @@ -200,6 +200,7 @@ TORTURE4_OPTIONS=$SAMBA4CONFIGURATION TORTURE4_OPTIONS=$TORTURE4_OPTIONS --maximum-runtime=$TORTURE_MAXTIME TORTURE4_OPTIONS=$TORTURE4_OPTIONS --target=samba3 +TORTURE4_OPTIONS=$TORTURE4_OPTIONS --option=torture:localdir=$PREFIX_ABS/tmp export TORTURE4_OPTIONS if [ x$RUN_FROM_BUILD_FARM = xyes ];then Modified: branches/SAMBA_3_2_0/source/script/tests/test_posix_s3.sh === --- branches/SAMBA_3_2_0/source/script/tests/test_posix_s3.sh 2007-08-30 11:26:17 UTC (rev 24801) +++ branches/SAMBA_3_2_0/source/script/tests/test_posix_s3.sh 2007-08-30 14:16:20 UTC (rev 24802) @@ -32,6 +32,7 @@ raw=$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK raw=$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE raw=$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH RAW-SFILEINFO-RENAME +raw=$raw RAW-SAMBA3CASEINSENSITIVE RAW-SAMBA3POSIXTIMEDLOCK rpc=RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC rpc=$rpc RPC-UNIXINFO RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC
svn commit: samba r24803 - in branches: SAMBA_3_2/source/include SAMBA_3_2_0/source/include
Author: vlendec Date: 2007-08-30 14:55:32 + (Thu, 30 Aug 2007) New Revision: 24803 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24803 Log: For some funny reason us4/gcc seems to fall over the ' Modified: branches/SAMBA_3_2/source/include/smb_macros.h branches/SAMBA_3_2_0/source/include/smb_macros.h Changeset: Modified: branches/SAMBA_3_2/source/include/smb_macros.h === --- branches/SAMBA_3_2/source/include/smb_macros.h 2007-08-30 14:16:20 UTC (rev 24802) +++ branches/SAMBA_3_2/source/include/smb_macros.h 2007-08-30 14:55:32 UTC (rev 24803) @@ -277,7 +277,7 @@ #if 0 -Disable these now we've checked all code paths and ensured +Disable these now we have checked all code paths and ensured NULL returns on zero request. JRA. #define TALLOC(ctx, size) talloc_zeronull(ctx, size, __location__) Modified: branches/SAMBA_3_2_0/source/include/smb_macros.h === --- branches/SAMBA_3_2_0/source/include/smb_macros.h2007-08-30 14:16:20 UTC (rev 24802) +++ branches/SAMBA_3_2_0/source/include/smb_macros.h2007-08-30 14:55:32 UTC (rev 24803) @@ -278,7 +278,7 @@ #if 0 -Disable these now we've checked all code paths and ensured +Disable these now we have checked all code paths and ensured NULL returns on zero request. JRA. #define TALLOC(ctx, size) talloc_zeronull(ctx, size, __location__)
svn commit: samba r24804 - in branches: SAMBA_3_2/source/include SAMBA_3_2/source/libads SAMBA_3_2_0/source/include SAMBA_3_2_0/source/libads
Author: gd
Date: 2007-08-30 15:39:51 + (Thu, 30 Aug 2007)
New Revision: 24804
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24804
Log:
As a temporary workaround, also try to guess the server's principal in the
[EMAIL PROTECTED] case to make at least LDAP SASL binds
succeed with windows server 2008.
Guenther
Modified:
branches/SAMBA_3_2/source/include/ads.h
branches/SAMBA_3_2/source/libads/sasl.c
branches/SAMBA_3_2/source/libads/util.c
branches/SAMBA_3_2_0/source/include/ads.h
branches/SAMBA_3_2_0/source/libads/sasl.c
branches/SAMBA_3_2_0/source/libads/util.c
Changeset:
Modified: branches/SAMBA_3_2/source/include/ads.h
===
--- branches/SAMBA_3_2/source/include/ads.h 2007-08-30 14:55:32 UTC (rev
24803)
+++ branches/SAMBA_3_2/source/include/ads.h 2007-08-30 15:39:51 UTC (rev
24804)
@@ -394,4 +394,6 @@
#define ADS_EXTENDED_RIGHT_APPLY_GROUP_POLICY
edacfd8f-ffb3-11d1-b41d-00a0c968f939
+#define ADS_IGNORE_PRINCIPAL [EMAIL PROTECTED]
+
#endif /* _INCLUDE_ADS_H_ */
Modified: branches/SAMBA_3_2/source/libads/sasl.c
===
--- branches/SAMBA_3_2/source/libads/sasl.c 2007-08-30 14:55:32 UTC (rev
24803)
+++ branches/SAMBA_3_2/source/libads/sasl.c 2007-08-30 15:39:51 UTC (rev
24804)
@@ -657,55 +657,26 @@
ZERO_STRUCTP(p);
- /* I've seen a child Windows 2000 domain not send
- the principal name back in the first round of
+ /* I've seen a child Windows 2000 domain not send
+ the principal name back in the first round of
the SASL bind reply. So we guess based on server
name and realm. --jerry */
- if (given_principal) {
- p-string = SMB_STRDUP(given_principal);
- if (!p-string) {
- return ADS_ERROR(LDAP_NO_MEMORY);
- }
- } else if (ads-server.realm ads-server.ldap_server) {
- char *server, *server_realm;
+ /* Also try best guess when we get the w2k8 ignore
+ principal back - gd */
- server = SMB_STRDUP(ads-server.ldap_server);
- server_realm = SMB_STRDUP(ads-server.realm);
+ if (!given_principal ||
+ strequal(given_principal, ADS_IGNORE_PRINCIPAL)) {
- if (!server || !server_realm) {
- return ADS_ERROR(LDAP_NO_MEMORY);
+ status = ads_guess_service_principal(ads, given_principal,
+p-string);
+ if (!ADS_ERR_OK(status)) {
+ return status;
}
-
- strlower_m(server);
- strupper_m(server_realm);
- asprintf(p-string, ldap/[EMAIL PROTECTED], server,
server_realm);
-
- SAFE_FREE(server);
- SAFE_FREE(server_realm);
-
+ } else {
+ p-string = SMB_STRDUP(given_principal);
if (!p-string) {
return ADS_ERROR(LDAP_NO_MEMORY);
}
- } else if (ads-config.realm ads-config.ldap_server_name) {
- char *server, *server_realm;
-
- server = SMB_STRDUP(ads-config.ldap_server_name);
- server_realm = SMB_STRDUP(ads-config.realm);
-
- if (!server || !server_realm) {
- return ADS_ERROR(LDAP_NO_MEMORY);
- }
-
- strlower_m(server);
- strupper_m(server_realm);
- asprintf(p-string, ldap/[EMAIL PROTECTED], server,
server_realm);
-
- SAFE_FREE(server);
- SAFE_FREE(server_realm);
-
- if (!p-string) {
- return ADS_ERROR(LDAP_NO_MEMORY);
- }
}
initialize_krb5_error_table();
Modified: branches/SAMBA_3_2/source/libads/util.c
===
--- branches/SAMBA_3_2/source/libads/util.c 2007-08-30 14:55:32 UTC (rev
24803)
+++ branches/SAMBA_3_2/source/libads/util.c 2007-08-30 15:39:51 UTC (rev
24804)
@@ -51,4 +51,62 @@
SAFE_FREE(password);
return ret;
}
+
+ADS_STATUS ads_guess_service_principal(ADS_STRUCT *ads,
+ const char *given_principal,
+ char **returned_principal)
+{
+ char *princ = NULL;
+
+ if (ads-server.realm ads-server.ldap_server) {
+ char *server, *server_realm;
+
+ server = SMB_STRDUP(ads-server.ldap_server);
+ server_realm = SMB_STRDUP(ads-server.realm);
+
+ if (!server || !server_realm) {
+ return ADS_ERROR(LDAP_NO_MEMORY);
+ }
+
+ strlower_m(server);
+ strupper_m(server_realm);
+ asprintf(princ,
svn commit: samba r24805 - in branches: SAMBA_3_2/source SAMBA_3_2_0/source
Author: gd Date: 2007-08-30 15:55:59 + (Thu, 30 Aug 2007) New Revision: 24805 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24805 Log: When we can build the locator, build it. Guenther Modified: branches/SAMBA_3_2/source/Makefile.in branches/SAMBA_3_2_0/source/Makefile.in Changeset: Modified: branches/SAMBA_3_2/source/Makefile.in === --- branches/SAMBA_3_2/source/Makefile.in 2007-08-30 15:39:51 UTC (rev 24804) +++ branches/SAMBA_3_2/source/Makefile.in 2007-08-30 15:55:59 UTC (rev 24805) @@ -1000,7 +1000,7 @@ timelimit : SHOWFLAGS bin/[EMAIL PROTECTED]@ nsswitch : SHOWFLAGS bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ @WINBIND_NSS@ \ - @WINBIND_WINS_NSS@ bin/[EMAIL PROTECTED]@ + @WINBIND_WINS_NSS@ bin/[EMAIL PROTECTED]@ @SMB_KRB5_LOCATOR@ wins : SHOWFLAGS @WINBIND_WINS_NSS@ Modified: branches/SAMBA_3_2_0/source/Makefile.in === --- branches/SAMBA_3_2_0/source/Makefile.in 2007-08-30 15:39:51 UTC (rev 24804) +++ branches/SAMBA_3_2_0/source/Makefile.in 2007-08-30 15:55:59 UTC (rev 24805) @@ -986,7 +986,7 @@ timelimit : SHOWFLAGS bin/[EMAIL PROTECTED]@ nsswitch : SHOWFLAGS bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ @WINBIND_NSS@ \ - @WINBIND_WINS_NSS@ bin/[EMAIL PROTECTED]@ + @WINBIND_WINS_NSS@ bin/[EMAIL PROTECTED]@ @SMB_KRB5_LOCATOR@ wins : SHOWFLAGS @WINBIND_WINS_NSS@
svn commit: samba r24806 - in branches: SAMBA_3_2/source SAMBA_3_2_0/source
Author: gd Date: 2007-08-30 16:02:22 + (Thu, 30 Aug 2007) New Revision: 24806 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24806 Log: Fix the build, sorry... Guenther Modified: branches/SAMBA_3_2/source/Makefile.in branches/SAMBA_3_2_0/source/Makefile.in Changeset: Modified: branches/SAMBA_3_2/source/Makefile.in === --- branches/SAMBA_3_2/source/Makefile.in 2007-08-30 15:55:59 UTC (rev 24805) +++ branches/SAMBA_3_2/source/Makefile.in 2007-08-30 16:02:22 UTC (rev 24806) @@ -322,9 +322,9 @@ libads/krb5_setpw.o libads/ldap_user.o \ libads/ads_struct.o libads/kerberos_keytab.o \ libads/disp_sec.o libads/ads_utils.o libads/ldap_utils.o \ -libads/cldap.o libads/ldap_schema.o +libads/cldap.o libads/ldap_schema.o libads/util.o -LIBADS_SERVER_OBJ = libads/util.o libads/kerberos_verify.o libads/authdata.o +LIBADS_SERVER_OBJ = libads/kerberos_verify.o libads/authdata.o SECRETS_OBJ = passdb/secrets.o passdb/machine_sid.o Modified: branches/SAMBA_3_2_0/source/Makefile.in === --- branches/SAMBA_3_2_0/source/Makefile.in 2007-08-30 15:55:59 UTC (rev 24805) +++ branches/SAMBA_3_2_0/source/Makefile.in 2007-08-30 16:02:22 UTC (rev 24806) @@ -314,9 +314,9 @@ libads/krb5_setpw.o libads/ldap_user.o \ libads/ads_struct.o libads/kerberos_keytab.o \ libads/disp_sec.o libads/ads_utils.o libads/ldap_utils.o \ -libads/cldap.o libads/ldap_schema.o +libads/cldap.o libads/ldap_schema.o libads/util.o -LIBADS_SERVER_OBJ = libads/util.o libads/kerberos_verify.o libads/authdata.o +LIBADS_SERVER_OBJ = libads/kerberos_verify.o libads/authdata.o SECRETS_OBJ = passdb/secrets.o passdb/machine_sid.o
svn commit: samba r24807 - in branches: SAMBA_3_2/source/nsswitch SAMBA_3_2_0/source/nsswitch
Author: gd
Date: 2007-08-30 16:24:51 + (Thu, 30 Aug 2007)
New Revision: 24807
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24807
Log:
Add WINBINDD_LOCATOR_KDC_ADDRESS env which will be used for the case when the
locator gets called from within winbindd.
Guenther
Modified:
branches/SAMBA_3_2/source/nsswitch/winbindd_nss.h
branches/SAMBA_3_2/source/nsswitch/winbindd_util.c
branches/SAMBA_3_2_0/source/nsswitch/winbindd_nss.h
branches/SAMBA_3_2_0/source/nsswitch/winbindd_util.c
Changeset:
Modified: branches/SAMBA_3_2/source/nsswitch/winbindd_nss.h
===
--- branches/SAMBA_3_2/source/nsswitch/winbindd_nss.h 2007-08-30 16:02:22 UTC
(rev 24806)
+++ branches/SAMBA_3_2/source/nsswitch/winbindd_nss.h 2007-08-30 16:24:51 UTC
(rev 24807)
@@ -39,6 +39,7 @@
#define WINBINDD_PRIV_SOCKET_SUBDIR winbindd_privileged /* name of
subdirectory of lp_lockdir() to hold the 'privileged' pipe */
#define WINBINDD_DOMAIN_ENV WINBINDD_DOMAIN /* Environment variables */
#define WINBINDD_DONT_ENV_NO_WINBINDD
+#define WINBINDD_LOCATOR_KDC_ADDRESS WINBINDD_LOCATOR_KDC_ADDRESS
/* Update this when you change the interface. */
Modified: branches/SAMBA_3_2/source/nsswitch/winbindd_util.c
===
--- branches/SAMBA_3_2/source/nsswitch/winbindd_util.c 2007-08-30 16:02:22 UTC
(rev 24806)
+++ branches/SAMBA_3_2/source/nsswitch/winbindd_util.c 2007-08-30 16:24:51 UTC
(rev 24807)
@@ -1365,3 +1365,36 @@
return False;
}
+
+/*
+ /
+
+void winbindd_set_locator_kdc_env(const struct winbindd_domain *domain)
+{
+ char *var = NULL;
+ const char *kdc = NULL;
+
+ if (!domain) {
+ return;
+ }
+
+ kdc = inet_ntoa(domain-dcaddr.sin_addr);
+ if (!kdc) {
+ kdc = domain-dcname;
+ }
+
+ if (!kdc || !*kdc) {
+ return;
+ }
+
+ if (asprintf(var, %s_%s, WINBINDD_LOCATOR_KDC_ADDRESS,
+strupper_static(domain-alt_name)) == -1) {
+ return;
+ }
+
+ DEBUG(10,(winbindd_set_locator_kdc_env: setting var: %s to: %s\n,
+ var, kdc));
+
+ setenv(var, kdc, 1);
+ free(var);
+}
Modified: branches/SAMBA_3_2_0/source/nsswitch/winbindd_nss.h
===
--- branches/SAMBA_3_2_0/source/nsswitch/winbindd_nss.h 2007-08-30 16:02:22 UTC
(rev 24806)
+++ branches/SAMBA_3_2_0/source/nsswitch/winbindd_nss.h 2007-08-30 16:24:51 UTC
(rev 24807)
@@ -32,6 +32,7 @@
#define WINBINDD_PRIV_SOCKET_SUBDIR winbindd_privileged /* name of
subdirectory of lp_lockdir() to hold the 'privileged' pipe */
#define WINBINDD_DOMAIN_ENV WINBINDD_DOMAIN /* Environment variables */
#define WINBINDD_DONT_ENV_NO_WINBINDD
+#define WINBINDD_LOCATOR_KDC_ADDRESS WINBINDD_LOCATOR_KDC_ADDRESS
/* Update this when you change the interface. */
Modified: branches/SAMBA_3_2_0/source/nsswitch/winbindd_util.c
===
--- branches/SAMBA_3_2_0/source/nsswitch/winbindd_util.c2007-08-30
16:02:22 UTC (rev 24806)
+++ branches/SAMBA_3_2_0/source/nsswitch/winbindd_util.c2007-08-30
16:24:51 UTC (rev 24807)
@@ -1413,3 +1413,36 @@
return False;
}
+
+/*
+ /
+
+void winbindd_set_locator_kdc_env(const struct winbindd_domain *domain)
+{
+ char *var = NULL;
+ const char *kdc = NULL;
+
+ if (!domain) {
+ return;
+ }
+
+ kdc = inet_ntoa(domain-dcaddr.sin_addr);
+ if (!kdc) {
+ kdc = domain-dcname;
+ }
+
+ if (!kdc || !*kdc) {
+ return;
+ }
+
+ if (asprintf(var, %s_%s, WINBINDD_LOCATOR_KDC_ADDRESS,
+strupper_static(domain-alt_name)) == -1) {
+ return;
+ }
+
+ DEBUG(10,(winbindd_set_locator_kdc_env: setting var: %s to: %s\n,
+ var, kdc));
+
+ setenv(var, kdc, 1);
+ free(var);
+}
svn commit: samba r24808 - in branches: SAMBA_3_2/source/libaddns SAMBA_3_2_0/source/libaddns
Author: jra Date: 2007-08-30 17:34:47 + (Thu, 30 Aug 2007) New Revision: 24808 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24808 Log: Fix the same problem Volker noticed. For some funny reason us4/gcc seems to fall over the ' Jeremy. Modified: branches/SAMBA_3_2/source/libaddns/dns.h branches/SAMBA_3_2_0/source/libaddns/dns.h Changeset: Modified: branches/SAMBA_3_2/source/libaddns/dns.h === --- branches/SAMBA_3_2/source/libaddns/dns.h2007-08-30 16:24:51 UTC (rev 24807) +++ branches/SAMBA_3_2/source/libaddns/dns.h2007-08-30 17:34:47 UTC (rev 24808) @@ -88,7 +88,7 @@ #if 0 -Disable these now we've checked all code paths and ensured +Disable these now we have checked all code paths and ensured NULL returns on zero request. JRA. void *_talloc_zero_zeronull(const void *ctx, size_t size, const char *name); Modified: branches/SAMBA_3_2_0/source/libaddns/dns.h === --- branches/SAMBA_3_2_0/source/libaddns/dns.h 2007-08-30 16:24:51 UTC (rev 24807) +++ branches/SAMBA_3_2_0/source/libaddns/dns.h 2007-08-30 17:34:47 UTC (rev 24808) @@ -88,7 +88,7 @@ #if 0 -Disable these now we've checked all code paths and ensured +Disable these now we have checked all code paths and ensured NULL returns on zero request. JRA. void *_talloc_zero_zeronull(const void *ctx, size_t size, const char *name);
svn commit: samba r24810 - in branches/SAMBA_4_0: . source
Author: jelmer Date: 2007-08-30 20:42:07 + (Thu, 30 Aug 2007) New Revision: 24810 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24810 Log: Don't collide with time.h Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/headermap.txt Changeset: Property changes on: branches/SAMBA_4_0 ___ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/headermap.txt === --- branches/SAMBA_4_0/source/headermap.txt 2007-08-30 19:48:31 UTC (rev 24809) +++ branches/SAMBA_4_0/source/headermap.txt 2007-08-30 20:42:07 UTC (rev 24810) @@ -91,7 +91,7 @@ lib/cmdline/popt_common.h: samba/popt.h lib/util/dlinklist.h: dlinklist.h lib/util/data_blob.h: data_blob.h -lib/util/time.h: time.h +lib/util/time.h: util/time.h version.h: samba/version.h param/proto.h: param/proto.h param/param.h: param.h
svn commit: samba r24811 - in branches: SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd
Author: jra Date: 2007-08-30 21:46:42 + (Thu, 30 Aug 2007) New Revision: 24811 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24811 Log: Simple reformatting to fit the 80 columns rule. Jeremy. Modified: branches/SAMBA_3_2/source/smbd/filename.c branches/SAMBA_3_2_0/source/smbd/filename.c Changeset: Sorry, the patch is too large (791 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24811
svn commit: samba r24812 - in branches/SAMBA_4_0: . source source/include source/lib/util source/librpc/rpc source/pidl/lib/Parse/Pidl/Samba4 source/pidl/tests
Author: jelmer
Date: 2007-08-30 22:25:59 + (Thu, 30 Aug 2007)
New Revision: 24812
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24812
Log:
Fix headers for external users.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/headermap.txt
branches/SAMBA_4_0/source/include/core.h
branches/SAMBA_4_0/source/lib/util/data_blob.h
branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h
branches/SAMBA_4_0/source/main.mk
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
branches/SAMBA_4_0/source/pidl/tests/Util.pm
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/headermap.txt
===
--- branches/SAMBA_4_0/source/headermap.txt 2007-08-30 21:46:42 UTC (rev
24811)
+++ branches/SAMBA_4_0/source/headermap.txt 2007-08-30 22:25:59 UTC (rev
24812)
@@ -39,7 +39,6 @@
libcli/util/nt_status.h: core/ntstatus.h
libcli/cldap/cldap.h: cldap.h
lib/samba3/samba3.h: samba3.h
-include/core.h: core.h
librpc/gen_ndr/dcerpc.h: gen_ndr/dcerpc.h
librpc/gen_ndr/netlogon.h: gen_ndr/netlogon.h
librpc/gen_ndr/ndr_misc.h: gen_ndr/ndr_misc.h
@@ -90,7 +89,7 @@
librpc/gen_ndr/ndr_svcctl_c.h: dcerpc/ndr_svcctl_c.h
lib/cmdline/popt_common.h: samba/popt.h
lib/util/dlinklist.h: dlinklist.h
-lib/util/data_blob.h: data_blob.h
+lib/util/data_blob.h: util/data_blob.h
lib/util/time.h: util/time.h
version.h: samba/version.h
param/proto.h: param/proto.h
Modified: branches/SAMBA_4_0/source/include/core.h
===
--- branches/SAMBA_4_0/source/include/core.h2007-08-30 21:46:42 UTC (rev
24811)
+++ branches/SAMBA_4_0/source/include/core.h2007-08-30 22:25:59 UTC (rev
24812)
@@ -27,10 +27,6 @@
#include stdlib.h
-/* by making struct ldb_val and DATA_BLOB the same, we can simplify
- a fair bit of code */
-#define ldb_val datablob
-
/*
we use struct ipv4_addr to avoid having to include all the
system networking headers everywhere
Modified: branches/SAMBA_4_0/source/lib/util/data_blob.h
===
--- branches/SAMBA_4_0/source/lib/util/data_blob.h 2007-08-30 21:46:42 UTC
(rev 24811)
+++ branches/SAMBA_4_0/source/lib/util/data_blob.h 2007-08-30 22:25:59 UTC
(rev 24812)
@@ -19,6 +19,12 @@
#ifndef _SAMBA_DATABLOB_H_
#define _SAMBA_DATABLOB_H_
+#ifndef _PUBLIC_
+#define _PUBLIC_
+#endif
+
+#include talloc.h
+
/* used to hold an arbitrary blob of data */
typedef struct datablob {
uint8_t *data;
@@ -30,6 +36,10 @@
DATA_BLOB blob;
};
+/* by making struct ldb_val and DATA_BLOB the same, we can simplify
+ a fair bit of code */
+#define ldb_val datablob
+
#define data_blob(ptr, size) data_blob_named(ptr, size, DATA_BLOB:
__location__)
#define data_blob_talloc(ctx, ptr, size) data_blob_talloc_named(ctx, ptr,
size, DATA_BLOB: __location__)
#define data_blob_dup_talloc(ctx, blob) data_blob_talloc_named(ctx,
(blob)-data, (blob)-length, DATA_BLOB: __location__)
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h
===
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h 2007-08-30 21:46:42 UTC
(rev 24811)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h 2007-08-30 22:25:59 UTC
(rev 24812)
@@ -23,7 +23,7 @@
#ifndef __DCERPC_H__
#define __DCERPC_H__
-#include core.h
+#include lib/util/data_blob.h
#include librpc/gen_ndr/dcerpc.h
#include librpc/ndr/libndr.h
Modified: branches/SAMBA_4_0/source/main.mk
===
--- branches/SAMBA_4_0/source/main.mk 2007-08-30 21:46:42 UTC (rev 24811)
+++ branches/SAMBA_4_0/source/main.mk 2007-08-30 22:25:59 UTC (rev 24812)
@@ -32,8 +32,7 @@
include scripting/swig/config.mk
include kdc/config.mk
-DEFAULT_HEADERS = $(srcdir)/include/core.h \
- $(srcdir)/lib/util/dlinklist.h \
+DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \
$(srcdir)/version.h
binaries: $(BINARIES)
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
2007-08-30 21:46:42 UTC (rev 24811)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
2007-08-30 22:25:59 UTC (rev 24812)
@@ -382,7 +382,7 @@
%headerstructs = ();
pidl /* header auto-generated by pidl */\n\n;
if (!is_intree()) {
- pidl #include core.h\n;
+ pidl #include util/data_blob.h\n;
}
pidl #include stdint.h\n;
pidl \n;
Modified:
svn commit: samba r24813 - in branches: SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd
Author: jra
Date: 2007-08-30 23:07:10 + (Thu, 30 Aug 2007)
New Revision: 24813
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24813
Log:
Reformat to 80 columns.
Jeremy.
Modified:
branches/SAMBA_3_2/source/smbd/statcache.c
branches/SAMBA_3_2_0/source/smbd/statcache.c
Changeset:
Modified: branches/SAMBA_3_2/source/smbd/statcache.c
===
--- branches/SAMBA_3_2/source/smbd/statcache.c 2007-08-30 22:25:59 UTC (rev
24812)
+++ branches/SAMBA_3_2/source/smbd/statcache.c 2007-08-30 23:07:10 UTC (rev
24813)
@@ -1,21 +1,21 @@
-/*
+/*
Unix SMB/CIFS implementation.
stat cache code
Copyright (C) Andrew Tridgell 1992-2000
Copyright (C) Jeremy Allison 1999-2004
Copyright (C) Andrew Bartlett [EMAIL PROTECTED] 2003
Copyright (C) Volker Lendecke 2007
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see http://www.gnu.org/licenses/.
*/
@@ -33,14 +33,15 @@
*
* @param full_orig_name The original name as specified by the client
* @param orig_translated_path The name on our filesystem.
- *
- * @note Only the first strlen(orig_translated_path) characters are stored
+ *
+ * @note Only the first strlen(orig_translated_path) characters are stored
* into the cache. This means that full_orig_name will be internally
* truncated.
*
*/
-void stat_cache_add( const char *full_orig_name, const char *translated_path,
BOOL case_sensitive)
+void stat_cache_add( const char *full_orig_name, const char *translated_path,
+ BOOL case_sensitive)
{
size_t translated_path_length;
TDB_DATA data_val;
@@ -111,8 +112,12 @@
if (original_path_length != translated_path_length) {
if (original_path_length translated_path_length) {
- DEBUG(0, (OOPS - tried to store stat cache entry for
weird length paths [%s] %lu and [%s] %lu)!\n,
- original_path, (unsigned
long)original_path_length, translated_path, (unsigned
long)translated_path_length));
+ DEBUG(0, (OOPS - tried to store stat cache entry
+ for weird length paths [%s] %lu and [%s] %lu)!\n,
+ original_path,
+ (unsigned long)original_path_length,
+ translated_path,
+ (unsigned long)translated_path_length));
SAFE_FREE(original_path);
return;
}
@@ -127,15 +132,20 @@
/*
* New entry or replace old entry.
*/
-
+
data_val.dsize = translated_path_length + 1;
data_val.dptr = (uint8 *)translated_path;
- if (tdb_store_bystring(tdb_stat_cache, original_path, data_val,
TDB_REPLACE) != 0) {
- DEBUG(0,(stat_cache_add: Error storing entry %s - %s\n,
original_path, translated_path));
+ if (tdb_store_bystring(tdb_stat_cache, original_path, data_val,
+ TDB_REPLACE) != 0) {
+ DEBUG(0,(stat_cache_add: Error storing entry %s - %s\n,
+ original_path, translated_path));
} else {
DEBUG(5,(stat_cache_add: Added entry (%lx:size%x) %s - %s\n,
- (unsigned long)data_val.dptr, (unsigned
int)data_val.dsize, original_path, translated_path));
+ (unsigned long)data_val.dptr,
+ (unsigned int)data_val.dsize,
+ original_path,
+ translated_path));
}
SAFE_FREE(original_path);
@@ -149,10 +159,12 @@
*to be correct as far as the cache can tell us. We assume that
* it is a malloc'ed string, we free it if necessary.
* @param dirpath The path as far as the stat cache told us.
- * @param start A pointer into name, for where to 'start' in fixing the rest
of the name up.
+ * @param start A pointer into name, for where to 'start' in fixing the rest
+ * of the name up.
* @param psd A stat buffer, NOT from the cache, but just a side-effect.
*
- * @return True if we translated (and did a scuccessful stat on) the entire
name.
+ * @return True if we translated (and did a scuccessful stat on) the entire
+ *
svn commit: samba r24814 - in branches/SAMBA_4_0: . source/auth/gensec source/build/smb_build source/include source/lib/charset source/lib/events source/lib/registry source/lib/talloc source/lib/tdr s
Author: jelmer Date: 2007-08-30 23:15:12 + (Thu, 30 Aug 2007) New Revision: 24814 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24814 Log: Fix headers, trim core.h even more. Removed: branches/SAMBA_4_0/source/lib/util/module.c Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/auth/gensec/gensec.h branches/SAMBA_4_0/source/build/smb_build/makefile.pm branches/SAMBA_4_0/source/include/core.h branches/SAMBA_4_0/source/include/includes.h branches/SAMBA_4_0/source/lib/charset/charset.h branches/SAMBA_4_0/source/lib/charset/iconv.c branches/SAMBA_4_0/source/lib/events/events.h branches/SAMBA_4_0/source/lib/registry/hive.h branches/SAMBA_4_0/source/lib/registry/registry.h branches/SAMBA_4_0/source/lib/talloc/config.mk branches/SAMBA_4_0/source/lib/tdr/tdr.h branches/SAMBA_4_0/source/lib/util/config.mk branches/SAMBA_4_0/source/lib/util/util.h branches/SAMBA_4_0/source/libcli/libcli.h branches/SAMBA_4_0/source/librpc/ndr/libndr.h branches/SAMBA_4_0/source/param/param.h branches/SAMBA_4_0/source/param/util.c branches/SAMBA_4_0/source/rpc_server/dcerpc_server.h Changeset: Sorry, the patch is too large (587 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24814
Build status as of Fri Aug 31 00:00:01 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-08-30 00:01:04.0 + +++ /home/build/master/cache/broken_results.txt 2007-08-31 00:00:27.0 + @@ -1,4 +1,4 @@ -Build status as of Thu Aug 30 00:00:02 2007 +Build status as of Fri Aug 31 00:00:01 2007 Build counts: Tree Total Broken Panic @@ -7,7 +7,7 @@ ccache 28 9 0 ctdb 0 0 0 distcc 2 0 0 -ldb 26 4 0 +ldb 27 4 0 libreplace 26 8 0 lorikeet-heimdal 23 11 0 pidl 15 4 0 @@ -16,8 +16,8 @@ rsync28 11 0 samba-docs 0 0 0 samba-gtk2 2 0 -samba4 25 25 0 -samba_3_228 18 0 +samba4 25 20 0 +samba_3_229 18 0 smb-build25 25 0 talloc 28 1 0 tdb 27 3 0
svn commit: samba r24815 - in branches/SAMBA_4_0: . source/pidl source/pidl/lib/Parse/Pidl source/pidl/lib/Parse/Pidl/Samba4 source/pidl/tests
Author: jelmer Date: 2007-08-31 00:03:54 + (Fri, 31 Aug 2007) New Revision: 24815 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24815 Log: Support cpp_quote(). Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/pidl/idl.yp branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/IDL.pm branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm branches/SAMBA_4_0/source/pidl/pidl branches/SAMBA_4_0/source/pidl/tests/header.pl branches/SAMBA_4_0/source/pidl/tests/parse_idl.pl Changeset: Sorry, the patch is too large (3917 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24815
svn commit: samba r24816 - in branches/SAMBA_4_0: . source/include source/libcli source/librpc/idl source/ntvfs/common source/param source/pidl/lib/Parse/Pidl source/pidl/lib/Parse/Pidl/Samba4 source/
Author: jelmer
Date: 2007-08-31 00:31:32 + (Fri, 31 Aug 2007)
New Revision: 24816
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24816
Log:
Move the rest of the contents of core.h to more appropriate places.
include/ now only contains build system related headers, all other headers are
now near the source code they're related to.
Removed:
branches/SAMBA_4_0/source/include/core.h
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/include/includes.h
branches/SAMBA_4_0/source/libcli/libcli.h
branches/SAMBA_4_0/source/librpc/idl/security.idl
branches/SAMBA_4_0/source/ntvfs/common/brlock.h
branches/SAMBA_4_0/source/param/loadparm.h
branches/SAMBA_4_0/source/param/param.h
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Util.pm
branches/SAMBA_4_0/source/pidl/tests/util.pl
branches/SAMBA_4_0/source/torture/locktest.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Deleted: branches/SAMBA_4_0/source/include/core.h
===
--- branches/SAMBA_4_0/source/include/core.h2007-08-31 00:03:54 UTC (rev
24815)
+++ branches/SAMBA_4_0/source/include/core.h2007-08-31 00:31:32 UTC (rev
24816)
@@ -1,69 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- Core Samba data types
-
- Copyright (C) Andrew Tridgell 1992-2000
- Copyright (C) Stefan Metzmacher 2004
- Copyright (C) Jelmer Vernooij 2005
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see http://www.gnu.org/licenses/.
-*/
-
-#ifndef _SAMBA_CORE_H
-#define _SAMBA_CORE_H
-
-#include libcli/util/nt_status.h
-
-#include stdlib.h
-
-/*
- use the same structure for dom_sid2 as dom_sid. A dom_sid2 is really
- just a dom sid, but with the sub_auths represented as a conformant
- array. As with all in-structure conformant arrays, the array length
- is placed before the start of the structure. That's what gives rise
- to the extra num_auths elemenent. We don't want the Samba code to
- have to bother with such esoteric NDR details, so its easier to just
- define it as a dom_sid and use pidl magic to make it all work. It
- just means you need to mark a sid as a dom_sid2 in the IDL when you
- know it is of the conformant array variety
-*/
-#define dom_sid2 dom_sid
-
-/* same struct as dom_sid but inside a 28 bytes fixed buffer in NDR */
-#define dom_sid28 dom_sid
-
-
-
-/* passed to br lock code. FIXME: Move to one of the smb-specific headers */
-enum brl_type {
- READ_LOCK,
- WRITE_LOCK,
- PENDING_READ_LOCK,
- PENDING_WRITE_LOCK
-};
-
-enum server_role {
- ROLE_STANDALONE=0,
- ROLE_DOMAIN_MEMBER=1,
- ROLE_DOMAIN_CONTROLLER=2,
-};
-
-enum announce_as {/* Types of machine we can announce as. */
- ANNOUNCE_AS_NT_SERVER=1,
- ANNOUNCE_AS_WIN95=2,
- ANNOUNCE_AS_WFW=3,
- ANNOUNCE_AS_NT_WORKSTATION=4
-};
-
-#endif /* _SAMBA_CORE_H */
Modified: branches/SAMBA_4_0/source/include/includes.h
===
--- branches/SAMBA_4_0/source/include/includes.h2007-08-31 00:03:54 UTC
(rev 24815)
+++ branches/SAMBA_4_0/source/include/includes.h2007-08-31 00:31:32 UTC
(rev 24816)
@@ -109,9 +109,10 @@
#endif
/* Lists, trees, caching, database... */
+#include stdlib.h
+#include stdbool.h
#include talloc.h
-#include core.h
-#include stdbool.h
+#include libcli/util/nt_status.h
#include charset/charset.h
#include util/util.h
#include param/param.h
Modified: branches/SAMBA_4_0/source/libcli/libcli.h
===
--- branches/SAMBA_4_0/source/libcli/libcli.h 2007-08-31 00:03:54 UTC (rev
24815)
+++ branches/SAMBA_4_0/source/libcli/libcli.h 2007-08-31 00:31:32 UTC (rev
24816)
@@ -50,6 +50,17 @@
struct cli_credentials;
struct event_context;
+
+/* passed to br lock code. */
+enum brl_type {
+ READ_LOCK,
+ WRITE_LOCK,
+ PENDING_READ_LOCK,
+ PENDING_WRITE_LOCK
+};
+
+
+
#include libcli/raw/libcliraw.h
#include libcli/libcli_proto.h
Modified:
svn commit: samba r24817 - in branches/SAMBA_4_0: . source/rpc_server/winreg
Author: jelmer
Date: 2007-08-31 00:52:47 + (Fri, 31 Aug 2007)
New Revision: 24817
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24817
Log:
Don't REG_NONE for all value types. Patch from
Andrew Kroeger [EMAIL PROTECTED]
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/rpc_server/winreg/rpc_winreg.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/rpc_server/winreg/rpc_winreg.c
===
--- branches/SAMBA_4_0/source/rpc_server/winreg/rpc_winreg.c2007-08-31
00:31:32 UTC (rev 24816)
+++ branches/SAMBA_4_0/source/rpc_server/winreg/rpc_winreg.c2007-08-31
00:52:47 UTC (rev 24817)
@@ -408,7 +408,11 @@
}
/* Just asking for the size of the buffer */
- r-out.type = value_type;
+ r-out.type = talloc(mem_ctx, uint32_t);
+ if (!r-out.type) {
+ return WERR_NOMEM;
+ }
+ *r-out.type = value_type;
r-out.length = talloc(mem_ctx, uint32_t);
if (!r-out.length) {
return WERR_NOMEM;
svn commit: samba r24818 - in branches: .
Author: abartlet Date: 2007-08-31 01:31:39 + (Fri, 31 Aug 2007) New Revision: 24818 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24818 Log: Move Samba4 TP5 into another branch, ready for cutting an alpha1. Andrew Bartlett Added: branches/SAMBA_4_0_RELEASE_TP5/ Removed: branches/SAMBA_4_0_RELEASE/ Changeset: Copied: branches/SAMBA_4_0_RELEASE_TP5 (from rev 24817, branches/SAMBA_4_0_RELEASE)
svn commit: samba r24819 - in branches/SAMBA_4_0/source: . script
Author: abartlet
Date: 2007-08-31 01:52:37 + (Fri, 31 Aug 2007)
New Revision: 24819
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24819
Log:
We are preparing for alpha1, so update the mkversion script to cope with that.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/VERSION
branches/SAMBA_4_0/source/script/mkversion.sh
Changeset:
Modified: branches/SAMBA_4_0/source/VERSION
===
--- branches/SAMBA_4_0/source/VERSION 2007-08-31 01:31:39 UTC (rev 24818)
+++ branches/SAMBA_4_0/source/VERSION 2007-08-31 01:52:37 UTC (rev 24819)
@@ -47,9 +47,19 @@
# e.g. SAMBA_VERSION_TP_RELEASE=1 #
# - 4.0.0tp1 #
-SAMBA_VERSION_TP_RELEASE=6
+SAMBA_VERSION_TP_RELEASE=
+# For 'alpha' releases the version will be #
+# #
+# MAJOR.MINOR.RELEASEalphaTP_RELEASE #
+# #
+# e.g. SAMBA_VERSION_ALPHA_RELEASE=1 #
+# - 4.0.0alpha1 #
+
+SAMBA_VERSION_ALPHA_RELEASE=1
+
+
# For 'pre' releases the version will be #
# #
# MAJOR.MINOR.RELEASEprePRE_RELEASE#
Modified: branches/SAMBA_4_0/source/script/mkversion.sh
===
--- branches/SAMBA_4_0/source/script/mkversion.sh 2007-08-31 01:31:39 UTC
(rev 24818)
+++ branches/SAMBA_4_0/source/script/mkversion.sh 2007-08-31 01:52:37 UTC
(rev 24819)
@@ -20,6 +20,7 @@
SAMBA_VERSION_REVISION=`sed -n 's/^SAMBA_VERSION_REVISION=//p'
$SOURCE_DIR$VERSION_FILE`
SAMBA_VERSION_TP_RELEASE=`sed -n 's/^SAMBA_VERSION_TP_RELEASE=//p'
$SOURCE_DIR$VERSION_FILE`
+SAMBA_VERSION_ALPHA_RELEASE=`sed -n 's/^SAMBA_VERSION_ALPHA_RELEASE=//p'
$SOURCE_DIR$VERSION_FILE`
SAMBA_VERSION_PRE_RELEASE=`sed -n 's/^SAMBA_VERSION_PRE_RELEASE=//p'
$SOURCE_DIR$VERSION_FILE`
SAMBA_VERSION_RC_RELEASE=`sed -n 's/^SAMBA_VERSION_RC_RELEASE=//p'
$SOURCE_DIR$VERSION_FILE`
@@ -44,7 +45,7 @@
##
-## maybe add 3.0.22a or 4.0.0tp11 or 3.0.22pre1 or 3.0.22rc1
+## maybe add 3.0.22a or 4.0.0tp11 or 4.0.0alpha1 or 3.0.22pre1 or
3.0.22rc1
## We do not do pre or rc version on patch/letter releases
##
if test -n ${SAMBA_VERSION_REVISION};then
@@ -53,6 +54,9 @@
elif test -n ${SAMBA_VERSION_TP_RELEASE};then
SAMBA_VERSION_STRING=${SAMBA_VERSION_STRING}tp${SAMBA_VERSION_TP_RELEASE}
echo #define SAMBA_VERSION_TP_RELEASE ${SAMBA_VERSION_TP_RELEASE}
$OUTPUT_FILE
+elif test -n ${SAMBA_VERSION_ALPHA_RELEASE};then
+
SAMBA_VERSION_STRING=${SAMBA_VERSION_STRING}alpha${SAMBA_VERSION_ALPHA_RELEASE}
+echo #define SAMBA_VERSION_ALPHA_RELEASE ${SAMBA_VERSION_ALPHA_RELEASE}
$OUTPUT_FILE
elif test -n ${SAMBA_VERSION_PRE_RELEASE};then
## maybe add 3.0.22pre2
SAMBA_VERSION_STRING=${SAMBA_VERSION_STRING}pre${SAMBA_VERSION_PRE_RELEASE}
svn commit: samba r24820 - in branches: .
Author: abartlet Date: 2007-08-31 01:53:13 + (Fri, 31 Aug 2007) New Revision: 24820 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24820 Log: Branch for Samba4 alpha1 Andrew Bartlett Added: branches/SAMBA_4_0_RELEASE/ Changeset: Copied: branches/SAMBA_4_0_RELEASE (from rev 24819, branches/SAMBA_4_0)
svn commit: samba r24821 - in branches/SAMBA_4_0_RELEASE/source/script: .
Author: abartlet Date: 2007-08-31 02:35:16 + (Fri, 31 Aug 2007) New Revision: 24821 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24821 Log: Update the mkrelease.sh script and mkversion.sh to make releasing correct Samba4 tarballs harder to screw up. Andrew Bartlett Modified: branches/SAMBA_4_0_RELEASE/source/script/mkrelease.sh branches/SAMBA_4_0_RELEASE/source/script/mkversion.sh Changeset: Modified: branches/SAMBA_4_0_RELEASE/source/script/mkrelease.sh === --- branches/SAMBA_4_0_RELEASE/source/script/mkrelease.sh 2007-08-31 01:53:13 UTC (rev 24820) +++ branches/SAMBA_4_0_RELEASE/source/script/mkrelease.sh 2007-08-31 02:35:16 UTC (rev 24821) @@ -1,11 +1,24 @@ #!/bin/sh -VERSION=$1 +TMPDIR=`mktemp samba-X` +rm $TMPDIR || exit 1 +svn export . $TMPDIR || exit 1 -svn export . samba-$VERSION || exit 1 - -( cd samba-$VERSION/source +( cd $TMPDIR/source ./autogen.sh || exit 1 ./configure || exit 1 make dist || exit 1 -) tar -zcf samba-$VERSION.tar.gz samba-$VERSION +) || exit 1 + +VERSION=`sed -n 's/^SAMBA_VERSION_STRING=//p' $TMPDIR/source/version.h` +mv $TMPDIR samba-$VERSION || exit 1 +tar -cf samba-$VERSION.tar samba-$VERSION || exit 1 +echo Now run: +echo gpg --detach-sign --armor samba-$VERSION.tar +echo gzip samba-$VERSION.tar +echo And then upload +echo samba-$VERSION.tar.gz samba-$VERSION.tar.asc +echo to pub/samba/samba4/ on samba.org + + + Modified: branches/SAMBA_4_0_RELEASE/source/script/mkversion.sh === --- branches/SAMBA_4_0_RELEASE/source/script/mkversion.sh 2007-08-31 01:53:13 UTC (rev 24820) +++ branches/SAMBA_4_0_RELEASE/source/script/mkversion.sh 2007-08-31 02:35:16 UTC (rev 24821) @@ -174,6 +174,10 @@ fi fi +echo /* Version for mkrelease.sh: $OUTPUT_FILE +echo SAMBA_VERSION_STRING=$SAMBA_VERSION_STRING $OUTPUT_FILE +echo */ $OUTPUT_FILE + ## ## Add a release nickname ##
svn commit: samba r24822 - in branches/SAMBA_4_0/source/script: .
Author: abartlet Date: 2007-08-31 02:44:56 + (Fri, 31 Aug 2007) New Revision: 24822 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=24822 Log: Merge from SAMBA_4_0_RELEASE: Update the mkrelease.sh script and mkversion.sh to make releasing correct Samba4 tarballs harder to screw up. Andrew Bartlett Modified: branches/SAMBA_4_0/source/script/mkrelease.sh branches/SAMBA_4_0/source/script/mkversion.sh Changeset: Modified: branches/SAMBA_4_0/source/script/mkrelease.sh === --- branches/SAMBA_4_0/source/script/mkrelease.sh 2007-08-31 02:35:16 UTC (rev 24821) +++ branches/SAMBA_4_0/source/script/mkrelease.sh 2007-08-31 02:44:56 UTC (rev 24822) @@ -1,11 +1,24 @@ #!/bin/sh -VERSION=$1 +TMPDIR=`mktemp samba-X` +rm $TMPDIR || exit 1 +svn export . $TMPDIR || exit 1 -svn export . samba-$VERSION || exit 1 - -( cd samba-$VERSION/source +( cd $TMPDIR/source ./autogen.sh || exit 1 ./configure || exit 1 make dist || exit 1 -) tar -zcf samba-$VERSION.tar.gz samba-$VERSION +) || exit 1 + +VERSION=`sed -n 's/^SAMBA_VERSION_STRING=//p' $TMPDIR/source/version.h` +mv $TMPDIR samba-$VERSION || exit 1 +tar -cf samba-$VERSION.tar samba-$VERSION || exit 1 +echo Now run: +echo gpg --detach-sign --armor samba-$VERSION.tar +echo gzip samba-$VERSION.tar +echo And then upload +echo samba-$VERSION.tar.gz samba-$VERSION.tar.asc +echo to pub/samba/samba4/ on samba.org + + + Modified: branches/SAMBA_4_0/source/script/mkversion.sh === --- branches/SAMBA_4_0/source/script/mkversion.sh 2007-08-31 02:35:16 UTC (rev 24821) +++ branches/SAMBA_4_0/source/script/mkversion.sh 2007-08-31 02:44:56 UTC (rev 24822) @@ -174,6 +174,10 @@ fi fi +echo /* Version for mkrelease.sh: $OUTPUT_FILE +echo SAMBA_VERSION_STRING=$SAMBA_VERSION_STRING $OUTPUT_FILE +echo */ $OUTPUT_FILE + ## ## Add a release nickname ##
Rev 611: merged acl patch from Peter Somogyi in http://samba.org/~tridge/3_0-ctdb
revno: 611 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: s3-ctdb-tridge timestamp: Fri 2007-08-31 14:00:53 +1000 message: merged acl patch from Peter Somogyi modified: source/modules/nfs4_acls.c nfs4_acls.c-20070210173807-1wjifrbwaz6xnmgl-648 source/modules/vfs_gpfs.c vfs_gpfs.c-20070210173807-1wjifrbwaz6xnmgl-665 Diff too large for email (460, the limit is 200).
Rev 612: merged debug patch from volker in http://samba.org/~tridge/3_0-ctdb
revno: 612
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: s3-ctdb-tridge
timestamp: Fri 2007-08-31 14:08:30 +1000
message:
merged debug patch from volker
modified:
source/lib/dbwrap_ctdb.c dbwrap_ctdb.c-20070415131935-89u7zduywa3g216g-1
revno: 609.1.1
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Volker Lendecke [EMAIL PROTECTED]
branch nick: samba_3_0_ctdb
timestamp: Thu 2007-08-30 14:33:50 +0200
message:
Log at debug level 0 if smbd fails to lock a migrated record more
than 10 times for a single fetch_lock call
=== modified file 'source/lib/dbwrap_ctdb.c'
--- a/source/lib/dbwrap_ctdb.c 2007-06-03 03:51:12 +
+++ b/source/lib/dbwrap_ctdb.c 2007-08-30 12:33:50 +
@@ -102,6 +102,7 @@
struct db_ctdb_rec *crec;
NTSTATUS status;
TDB_DATA ctdb_data;
+ int migrate_attempts = 0;
if (!(result = talloc(mem_ctx, struct db_record))) {
DEBUG(0, (talloc failed\n));
@@ -162,6 +163,8 @@
tdb_chainunlock(ctx-wtdb-tdb, key);
talloc_set_destructor(result, NULL);
+ migrate_attempts += 1;
+
DEBUG(10, (ctdb_data.dptr = %p, dmaster = %u (%u)\n,
ctdb_data.dptr, ctdb_data.dptr ?
((struct ctdb_ltdb_header *)ctdb_data.dptr)-dmaster
: -1,
@@ -178,6 +181,11 @@
goto again;
}
+ if (migrate_attempts 10) {
+ DEBUG(0, (db_ctdb_fetch_locked needed %d attempts\n,
+ migrate_attempts));
+ }
+
memcpy(crec-header, ctdb_data.dptr, sizeof(crec-header));
result-value.dsize = ctdb_data.dsize - sizeof(crec-header);
Rev 613: fixed compilation errors in http://samba.org/~tridge/3_0-ctdb
revno: 613
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: s3-ctdb-tridge
timestamp: Fri 2007-08-31 14:23:58 +1000
message:
fixed compilation errors
modified:
source/modules/vfs_gpfs.c vfs_gpfs.c-20070210173807-1wjifrbwaz6xnmgl-665
=== modified file 'source/modules/vfs_gpfs.c'
--- a/source/modules/vfs_gpfs.c 2007-08-31 04:00:53 +
+++ b/source/modules/vfs_gpfs.c 2007-08-31 04:23:58 +
@@ -845,14 +845,6 @@
SMB_VFS_OP_SYS_ACL_DELETE_DEF_FILE,
SMB_VFS_LAYER_TRANSPARENT},
- {SMB_VFS_OP(gpfs_chmod),
-SMB_VFS_OP_CHMOD,
-SMB_VFS_LAYER_TRANSPARENT},
-
- {SMB_VFS_OP(gpfs_fchmod),
-SMB_VFS_OP_FCHMOD,
-SMB_VFS_LAYER_TRANSPARENT},
-
{ SMB_VFS_OP(vfs_gpfs_chmod), SMB_VFS_OP_CHMOD,
SMB_VFS_LAYER_TRANSPARENT },
