svn commit: samba r22543 - in branches: SAMBA_3_0/source/include SAMBA_3_0_25/source/include
Author: jra
Date: 2007-04-28 02:51:55 + (Sat, 28 Apr 2007)
New Revision: 22543
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22543
Log:
Fix bad call to talloc_strict (too few args).
Should fix build farm breakage.
Jeremy.
Modified:
branches/SAMBA_3_0/source/include/smb_macros.h
branches/SAMBA_3_0_25/source/include/smb_macros.h
Changeset:
Modified: branches/SAMBA_3_0/source/include/smb_macros.h
===
--- branches/SAMBA_3_0/source/include/smb_macros.h 2007-04-27 23:18:41 UTC
(rev 22542)
+++ branches/SAMBA_3_0/source/include/smb_macros.h 2007-04-28 02:51:55 UTC
(rev 22543)
@@ -282,7 +282,7 @@
#define TALLOC_REALLOC_ARRAY(ctx, ptr, type, count) (type
*)_talloc_realloc_array(ctx, ptr, sizeof(type), count, #type)
#define talloc_destroy(ctx) talloc_free(ctx)
#define TALLOC_FREE(ctx) do { if ((ctx) != NULL) {talloc_free(ctx); ctx=NULL;}
} while(0)
-#define TALLOC_SIZE(ctx, size) talloc_strict(ctx, size)
+#define TALLOC_SIZE(ctx, size) talloc_strict(ctx, size, __location__)
#define TALLOC_ZERO_SIZE(ctx, size) talloc_zero_size_strict(ctx, size)
/* only define PARANOID_MALLOC_CHECKER with --enable-developer and not
compiling
Modified: branches/SAMBA_3_0_25/source/include/smb_macros.h
===
--- branches/SAMBA_3_0_25/source/include/smb_macros.h 2007-04-27 23:18:41 UTC
(rev 22542)
+++ branches/SAMBA_3_0_25/source/include/smb_macros.h 2007-04-28 02:51:55 UTC
(rev 22543)
@@ -282,7 +282,7 @@
#define TALLOC_REALLOC_ARRAY(ctx, ptr, type, count) (type
*)_talloc_realloc_array(ctx, ptr, sizeof(type), count, #type)
#define talloc_destroy(ctx) talloc_free(ctx)
#define TALLOC_FREE(ctx) do { if ((ctx) != NULL) {talloc_free(ctx); ctx=NULL;}
} while(0)
-#define TALLOC_SIZE(ctx, size) talloc_strict(ctx, size)
+#define TALLOC_SIZE(ctx, size) talloc_strict(ctx, size, __location__)
#define TALLOC_ZERO_SIZE(ctx, size) talloc_zero_size_strict(ctx, size)
/* only define PARANOID_MALLOC_CHECKER with --enable-developer and not
compiling
Build status as of Sat Apr 28 00:00:01 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-04-27 00:00:23.0 + +++ /home/build/master/cache/broken_results.txt 2007-04-28 00:00:22.0 + @@ -1,25 +1,25 @@ -Build status as of Fri Apr 27 00:00:02 2007 +Build status as of Sat Apr 28 00:00:01 2007 Build counts: Tree Total Broken Panic SOC 0 0 0 build_farm 0 0 0 -ccache 35 6 0 +ccache 36 6 0 ctdb 0 0 0 distcc 4 0 0 -ldb 33 5 0 -libreplace 32 11 0 -lorikeet-heimdal 29 14 0 -pidl 18 6 0 +ldb 34 6 0 +libreplace 31 10 0 +lorikeet-heimdal 30 15 0 +pidl 19 6 0 ppp 14 0 0 python 0 0 0 -rsync37 18 0 +rsync35 16 0 samba0 0 0 samba-docs 0 0 0 samba-gtk3 3 0 -samba4 37 26 4 -samba_3_040 21 1 -smb-build30 29 0 +samba4 38 27 4 +samba_3_040 41 0 +smb-build31 30 0 talloc 36 2 0 -tdb 33 2 0 +tdb 34 2 0
svn commit: samba r22542 - in branches: SAMBA_3_0/source/auth SAMBA_3_0/source/include SAMBA_3_0/source/lib SAMBA_3_0/source/libaddns SAMBA_3_0/source/libmsrpc SAMBA_3_0/source/libsmb SAMBA_3_0/source
Author: jra Date: 2007-04-27 23:18:41 + (Fri, 27 Apr 2007) New Revision: 22542 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22542 Log: Move over to using the _strict varients of the talloc calls. No functional changes. Looks bigger than it is :-). Jeremy. Modified: branches/SAMBA_3_0/source/auth/auth_util.c branches/SAMBA_3_0/source/include/smb_macros.h branches/SAMBA_3_0/source/lib/data_blob.c branches/SAMBA_3_0/source/lib/launchd.c branches/SAMBA_3_0/source/libaddns/dns.h branches/SAMBA_3_0/source/libmsrpc/cac_samr.c branches/SAMBA_3_0/source/libmsrpc/cac_winreg.c branches/SAMBA_3_0/source/libmsrpc/libmsrpc_internal.c branches/SAMBA_3_0/source/libsmb/cliquota.c branches/SAMBA_3_0/source/locking/locking.c branches/SAMBA_3_0/source/modules/nfs4_acls.c branches/SAMBA_3_0/source/modules/vfs_aixacl2.c branches/SAMBA_3_0/source/modules/vfs_gpfs.c branches/SAMBA_3_0/source/nsswitch/idmap.c branches/SAMBA_3_0/source/nsswitch/idmap_ad.c branches/SAMBA_3_0/source/nsswitch/idmap_ldap.c branches/SAMBA_3_0/source/nsswitch/idmap_rid.c branches/SAMBA_3_0/source/nsswitch/idmap_tdb.c branches/SAMBA_3_0/source/nsswitch/winbindd_async.c branches/SAMBA_3_0/source/printing/notify.c branches/SAMBA_3_0/source/python/py_ntsec.c branches/SAMBA_3_0/source/rpc_parse/parse_buffer.c branches/SAMBA_3_0/source/rpc_parse/parse_eventlog.c branches/SAMBA_3_0/source/rpc_parse/parse_misc.c branches/SAMBA_3_0/source/rpc_parse/parse_net.c branches/SAMBA_3_0/source/rpc_parse/parse_prs.c branches/SAMBA_3_0/source/rpc_server/srv_echo_nt.c branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c branches/SAMBA_3_0/source/rpc_server/srv_spoolss_nt.c branches/SAMBA_3_0/source/rpc_server/srv_srvsvc_nt.c branches/SAMBA_3_0/source/smbd/conn.c branches/SAMBA_3_0/source/smbd/fake_file.c branches/SAMBA_3_0/source/smbd/notify_inotify.c branches/SAMBA_3_0/source/smbd/notify_internal.c branches/SAMBA_3_0/source/smbd/ntquotas.c branches/SAMBA_3_0/source/smbd/nttrans.c branches/SAMBA_3_0/source/smbd/password.c branches/SAMBA_3_0/source/smbd/trans2.c branches/SAMBA_3_0/source/smbd/vfs.c branches/SAMBA_3_0_25/source/auth/auth_util.c branches/SAMBA_3_0_25/source/include/smb_macros.h branches/SAMBA_3_0_25/source/lib/data_blob.c branches/SAMBA_3_0_25/source/libaddns/dns.h branches/SAMBA_3_0_25/source/libmsrpc/cac_samr.c branches/SAMBA_3_0_25/source/libmsrpc/cac_winreg.c branches/SAMBA_3_0_25/source/libmsrpc/libmsrpc_internal.c branches/SAMBA_3_0_25/source/libsmb/cliquota.c branches/SAMBA_3_0_25/source/locking/locking.c branches/SAMBA_3_0_25/source/modules/nfs4_acls.c branches/SAMBA_3_0_25/source/modules/vfs_aixacl2.c branches/SAMBA_3_0_25/source/modules/vfs_gpfs.c branches/SAMBA_3_0_25/source/nsswitch/idmap.c branches/SAMBA_3_0_25/source/nsswitch/idmap_ad.c branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c branches/SAMBA_3_0_25/source/nsswitch/idmap_rid.c branches/SAMBA_3_0_25/source/nsswitch/idmap_tdb.c branches/SAMBA_3_0_25/source/nsswitch/winbindd_async.c branches/SAMBA_3_0_25/source/printing/notify.c branches/SAMBA_3_0_25/source/rpc_parse/parse_buffer.c branches/SAMBA_3_0_25/source/rpc_parse/parse_dfs.c branches/SAMBA_3_0_25/source/rpc_parse/parse_eventlog.c branches/SAMBA_3_0_25/source/rpc_parse/parse_misc.c branches/SAMBA_3_0_25/source/rpc_parse/parse_net.c branches/SAMBA_3_0_25/source/rpc_parse/parse_prs.c branches/SAMBA_3_0_25/source/rpc_server/srv_samr_nt.c branches/SAMBA_3_0_25/source/rpc_server/srv_spoolss_nt.c branches/SAMBA_3_0_25/source/smbd/conn.c branches/SAMBA_3_0_25/source/smbd/fake_file.c branches/SAMBA_3_0_25/source/smbd/notify_inotify.c branches/SAMBA_3_0_25/source/smbd/notify_internal.c branches/SAMBA_3_0_25/source/smbd/ntquotas.c branches/SAMBA_3_0_25/source/smbd/nttrans.c branches/SAMBA_3_0_25/source/smbd/trans2.c branches/SAMBA_3_0_25/source/smbd/vfs.c Changeset: Sorry, the patch is too large (2092 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22542
svn commit: samba r22541 - in branches: SAMBA_3_0/source/lib/talloc SAMBA_3_0_25/source/lib/talloc SAMBA_4_0/source/lib/talloc
Author: jra Date: 2007-04-27 22:04:27 + (Fri, 27 Apr 2007) New Revision: 22541 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22541 Log: Added talloc_size_strict macro. Jeremy. Modified: branches/SAMBA_3_0/source/lib/talloc/talloc.h branches/SAMBA_3_0_25/source/lib/talloc/talloc.h branches/SAMBA_4_0/source/lib/talloc/talloc.h Changeset: Modified: branches/SAMBA_3_0/source/lib/talloc/talloc.h === --- branches/SAMBA_3_0/source/lib/talloc/talloc.h 2007-04-27 21:58:10 UTC (rev 22540) +++ branches/SAMBA_3_0/source/lib/talloc/talloc.h 2007-04-27 22:04:27 UTC (rev 22541) @@ -84,6 +84,7 @@ /* useful macros for creating type checked pointers */ #define talloc(ctx, type) (type *)talloc_named_const(ctx, sizeof(type), #type) #define talloc_size(ctx, size) talloc_named_const(ctx, size, __location__) +#define talloc_size_strict(ctx, size) talloc_strict(ctx, size, __location__) #define talloc_ptrtype(ctx, ptr) (_TALLOC_TYPEOF(ptr))talloc_size(ctx, sizeof(*(ptr))) #define talloc_new(ctx) talloc_named_const(ctx, 0, "talloc_new: " __location__) Modified: branches/SAMBA_3_0_25/source/lib/talloc/talloc.h === --- branches/SAMBA_3_0_25/source/lib/talloc/talloc.h2007-04-27 21:58:10 UTC (rev 22540) +++ branches/SAMBA_3_0_25/source/lib/talloc/talloc.h2007-04-27 22:04:27 UTC (rev 22541) @@ -80,6 +80,7 @@ /* useful macros for creating type checked pointers */ #define talloc(ctx, type) (type *)talloc_named_const(ctx, sizeof(type), #type) #define talloc_size(ctx, size) talloc_named_const(ctx, size, __location__) +#define talloc_size_strict(ctx, size) talloc_strict(ctx, size, __location__) #define talloc_ptrtype(ctx, ptr) (_TALLOC_TYPEOF(ptr))talloc_size(ctx, sizeof(*(ptr))) #define talloc_new(ctx) talloc_named_const(ctx, 0, "talloc_new: " __location__) Modified: branches/SAMBA_4_0/source/lib/talloc/talloc.h === --- branches/SAMBA_4_0/source/lib/talloc/talloc.h 2007-04-27 21:58:10 UTC (rev 22540) +++ branches/SAMBA_4_0/source/lib/talloc/talloc.h 2007-04-27 22:04:27 UTC (rev 22541) @@ -84,6 +84,7 @@ /* useful macros for creating type checked pointers */ #define talloc(ctx, type) (type *)talloc_named_const(ctx, sizeof(type), #type) #define talloc_size(ctx, size) talloc_named_const(ctx, size, __location__) +#define talloc_size_strict(ctx, size) talloc_strict(ctx, size, __location__) #define talloc_ptrtype(ctx, ptr) (_TALLOC_TYPEOF(ptr))talloc_size(ctx, sizeof(*(ptr))) #define talloc_new(ctx) talloc_named_const(ctx, 0, "talloc_new: " __location__)
svn commit: samba r22540 - in branches: SAMBA_3_0/source/lib/talloc SAMBA_3_0_25/source/lib/talloc SAMBA_4_0/source/lib/talloc
Author: jra Date: 2007-04-27 21:58:10 + (Fri, 27 Apr 2007) New Revision: 22540 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22540 Log: Added _strict varients of the macro calls - added prototypes. Jeremy. Modified: branches/SAMBA_3_0/source/lib/talloc/talloc.h branches/SAMBA_3_0_25/source/lib/talloc/talloc.h branches/SAMBA_4_0/source/lib/talloc/talloc.h Changeset: Modified: branches/SAMBA_3_0/source/lib/talloc/talloc.h === --- branches/SAMBA_3_0/source/lib/talloc/talloc.h 2007-04-27 21:09:16 UTC (rev 22539) +++ branches/SAMBA_3_0/source/lib/talloc/talloc.h 2007-04-27 21:58:10 UTC (rev 22540) @@ -92,6 +92,7 @@ /* Varient of talloc_zero that returns NULL if size is zero. */ #define talloc_zero_strict(ctx, type) (type *)_talloc_zero_strict(ctx, sizeof(type), #type) #define talloc_zero_size(ctx, size) _talloc_zero(ctx, size, __location__) +#define talloc_zero_size_strict(ctx, size) _talloc_zero_strict(ctx, size, __location__) #define talloc_zero_array(ctx, type, count) (type *)_talloc_zero_array(ctx, sizeof(type), count, #type) /* Varient of talloc_zero_array that returns NULL if count is zero. */ @@ -100,6 +101,7 @@ /* Varient of talloc_array that returns NULL if count is zero. */ #define talloc_array_strict(ctx, type, count) (type *)_talloc_array_strict(ctx, sizeof(type), count, #type) #define talloc_array_size(ctx, size, count) _talloc_array(ctx, size, count, __location__) +#define talloc_array_size_strict(ctx, size, count) _talloc_array_strict(ctx, size, count, __location__) #define talloc_array_ptrtype(ctx, ptr, count) (_TALLOC_TYPEOF(ptr))talloc_array_size(ctx, sizeof(*(ptr)), count) #define talloc_realloc(ctx, p, type, count) (type *)_talloc_realloc_array(ctx, p, sizeof(type), count, #type) @@ -160,7 +162,9 @@ void talloc_enable_leak_report(void); void talloc_enable_leak_report_full(void); void *_talloc_zero(const void *ctx, size_t size, const char *name); +void *_talloc_zero_strict(const void *ctx, size_t size, const char *name); void *_talloc_memdup(const void *t, const void *p, size_t size, const char *name); +void *_talloc_memdup_strict(const void *t, const void *p, size_t size, const char *name); char *talloc_strdup(const void *t, const char *p); char *talloc_strndup(const void *t, const char *p, size_t n); char *talloc_append_string(const void *t, char *orig, const char *append); @@ -169,7 +173,9 @@ char *talloc_asprintf(const void *t, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3); char *talloc_asprintf_append(char *s, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3); void *_talloc_array(const void *ctx, size_t el_size, unsigned count, const char *name); +void *_talloc_array_strict(const void *ctx, size_t el_size, unsigned count, const char *name); void *_talloc_zero_array(const void *ctx, size_t el_size, unsigned count, const char *name); +void *_talloc_zero_array_strict(const void *ctx, size_t el_size, unsigned count, const char *name); void *_talloc_realloc_array(const void *ctx, void *ptr, size_t el_size, unsigned count, const char *name); void *talloc_realloc_fn(const void *context, void *ptr, size_t size); void *talloc_autofree_context(void); Modified: branches/SAMBA_3_0_25/source/lib/talloc/talloc.h === --- branches/SAMBA_3_0_25/source/lib/talloc/talloc.h2007-04-27 21:09:16 UTC (rev 22539) +++ branches/SAMBA_3_0_25/source/lib/talloc/talloc.h2007-04-27 21:58:10 UTC (rev 22540) @@ -88,6 +88,7 @@ /* Varient of talloc_zero that returns NULL if size is zero. */ #define talloc_zero_strict(ctx, type) (type *)_talloc_zero_strict(ctx, sizeof(type), #type) #define talloc_zero_size(ctx, size) _talloc_zero(ctx, size, __location__) +#define talloc_zero_size_strict(ctx, size) _talloc_zero_strict(ctx, size, __location__) #define talloc_zero_array(ctx, type, count) (type *)_talloc_zero_array(ctx, sizeof(type), count, #type) /* Varient of talloc_zero_array that returns NULL if count is zero. */ @@ -96,6 +97,7 @@ /* Varient of talloc_array that returns NULL if count is zero. */ #define talloc_array_strict(ctx, type, count) (type *)_talloc_array_strict(ctx, sizeof(type), count, #type) #define talloc_array_size(ctx, size, count) _talloc_array(ctx, size, count, __location__) +#define talloc_array_size_strict(ctx, size, count) _talloc_array_strict(ctx, size, count, __location__) #define talloc_array_ptrtype(ctx, ptr, count) (_TALLOC_TYPEOF(ptr))talloc_array_size(ctx, sizeof(*(ptr)), count) #define talloc_realloc(ctx, p, type, count) (type *)_talloc_realloc_array(ctx, p, sizeof(type), count, #type) @@ -156,7 +158,9 @@ void talloc_enable_leak_report(void); void talloc_enable_leak_report_full(void); void *_talloc_zero(const void *ctx, size_t size, const char *name); +void *_talloc_zero_strict(const void *ctx, size_t size, const char *name); void *_tallo
svn commit: samba r22539 - in branches: SAMBA_3_0/source/lib/talloc SAMBA_3_0_25/source/lib/talloc SAMBA_4_0/source/lib/talloc
Author: jra
Date: 2007-04-27 21:09:16 + (Fri, 27 Apr 2007)
New Revision: 22539
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22539
Log:
Added _strict varients of the talloc calls to
return NULL on size == 0 varients.
Jeremy.
Modified:
branches/SAMBA_3_0/source/lib/talloc/talloc.c
branches/SAMBA_3_0/source/lib/talloc/talloc.h
branches/SAMBA_3_0_25/source/lib/talloc/talloc.c
branches/SAMBA_3_0_25/source/lib/talloc/talloc.h
branches/SAMBA_4_0/source/lib/talloc/talloc.c
branches/SAMBA_4_0/source/lib/talloc/talloc.h
Changeset:
Modified: branches/SAMBA_3_0/source/lib/talloc/talloc.c
===
--- branches/SAMBA_3_0/source/lib/talloc/talloc.c 2007-04-27 17:35:15 UTC
(rev 22538)
+++ branches/SAMBA_3_0/source/lib/talloc/talloc.c 2007-04-27 21:09:16 UTC
(rev 22539)
@@ -1087,6 +1087,28 @@
}
+/*
+ talloc and zero memory.
+ Strict version - returns NULL if size is zero.
+*/
+void *_talloc_zero_strict(const void *ctx, size_t size, const char *name)
+{
+ void *p;
+
+ if (unlikely(size == 0)) {
+ return NULL;
+ }
+
+ p = _talloc_named_const(ctx, size, name);
+
+ if (p) {
+ memset(p, '\0', size);
+ }
+
+ return p;
+}
+
+
/*
memdup with a talloc.
*/
@@ -1102,6 +1124,26 @@
}
/*
+ memdup with a talloc.
+ Strict version - returns NULL if size is zero.
+*/
+void *_talloc_memdup_strict(const void *t, const void *p, size_t size, const
char *name)
+{
+ void *newp;
+
+ if (unlikely(size == 0)) {
+ return NULL;
+ }
+
+ newp = _talloc_named_const(t, size, name);
+ if (likely(newp)) {
+ memcpy(newp, p, size);
+ }
+
+ return newp;
+}
+
+/*
strdup with a talloc
*/
char *talloc_strdup(const void *t, const char *p)
@@ -1282,6 +1324,23 @@
}
/*
+ alloc an array, checking for integer overflow in the array size.
+ Strict version - returns NULL if count or el_size are zero.
+*/
+void *_talloc_array_strict(const void *ctx, size_t el_size, unsigned count,
const char *name)
+{
+ if (count >= MAX_TALLOC_SIZE/el_size) {
+ return NULL;
+ }
+
+ if (el_size == 0 || count == 0) {
+ return NULL;
+ }
+
+ return _talloc_named_const(ctx, el_size * count, name);
+}
+
+/*
alloc an zero array, checking for integer overflow in the array size
*/
void *_talloc_zero_array(const void *ctx, size_t el_size, unsigned count,
const char *name)
@@ -1292,7 +1351,24 @@
return _talloc_zero(ctx, el_size * count, name);
}
+/*
+ alloc an zero array, checking for integer overflow in the array size
+ Strict version - returns NULL if count or el_size are zero.
+*/
+void *_talloc_zero_array_strict(const void *ctx, size_t el_size, unsigned
count, const char *name)
+{
+ if (count >= MAX_TALLOC_SIZE/el_size) {
+ return NULL;
+ }
+ if (el_size == 0 || count == 0) {
+ return NULL;
+ }
+
+ return _talloc_zero(ctx, el_size * count, name);
+}
+
+
/*
realloc an array, checking for integer overflow in the array size
*/
@@ -1421,3 +1497,14 @@
}
return 0;
}
+
+/*
+ Talloc wrapper that returns NULL if size == 0.
+*/
+void *talloc_strict(const void *context, size_t size, const char *name)
+{
+ if (unlikely(size == 0)) {
+ return NULL;
+ }
+ return _talloc_named_const(context, size, name);
+}
Modified: branches/SAMBA_3_0/source/lib/talloc/talloc.h
===
--- branches/SAMBA_3_0/source/lib/talloc/talloc.h 2007-04-27 17:35:15 UTC
(rev 22538)
+++ branches/SAMBA_3_0/source/lib/talloc/talloc.h 2007-04-27 21:09:16 UTC
(rev 22539)
@@ -89,10 +89,16 @@
#define talloc_new(ctx) talloc_named_const(ctx, 0, "talloc_new: " __location__)
#define talloc_zero(ctx, type) (type *)_talloc_zero(ctx, sizeof(type), #type)
+/* Varient of talloc_zero that returns NULL if size is zero. */
+#define talloc_zero_strict(ctx, type) (type *)_talloc_zero_strict(ctx,
sizeof(type), #type)
#define talloc_zero_size(ctx, size) _talloc_zero(ctx, size, __location__)
#define talloc_zero_array(ctx, type, count) (type *)_talloc_zero_array(ctx,
sizeof(type), count, #type)
+/* Varient of talloc_zero_array that returns NULL if count is zero. */
+#define talloc_zero_array_strict(ctx, type, count) (type
*)_talloc_zero_array_strict(ctx, sizeof(type), count, #type)
#define talloc_array(ctx, type, count) (type *)_talloc_array(ctx,
sizeof(type), count, #type)
+/* Varient of talloc_array that returns NULL if count is zero. */
+#define talloc_array_strict(ctx, type, count) (type
*)_talloc_array_strict(ctx, sizeof(type), count, #type)
#define talloc_array_size(ctx, size, count) _talloc_array(ctx, size, count,
__location__)
#define talloc_array_ptrtype(ctx, ptr, count)
svn commit: samba r22538 - in branches/SAMBA_4_0/source/torture/rpc: .
Author: metze
Date: 2007-04-27 17:35:15 + (Fri, 27 Apr 2007)
New Revision: 22538
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22538
Log:
same day late at night in au...:-)
fix the strcasecmp_m() returns 0 for a match
also use the correct array element to fill priv->dcinfo
the fixes the problems where ldb changes the order of the search results
when changing the main dc netbios name from "localhost" to "localtest"
metze
Modified:
branches/SAMBA_4_0/source/torture/rpc/drsuapi.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/drsuapi.c
===
--- branches/SAMBA_4_0/source/torture/rpc/drsuapi.c 2007-04-27 15:26:40 UTC
(rev 22537)
+++ branches/SAMBA_4_0/source/torture/rpc/drsuapi.c 2007-04-27 17:35:15 UTC
(rev 22538)
@@ -139,19 +139,18 @@
case 1:
for (k=0; k < r.out.ctr.ctr1.count; k++) {
if
(strcasecmp_m(r.out.ctr.ctr1.array[k].netbios_name,
-
torture_join_netbios_name(priv->join))) {
+
torture_join_netbios_name(priv->join)) == 0) {
found = True;
+ break;
}
}
break;
case 2:
- if (r.out.ctr.ctr2.count > 0) {
- priv->dcinfo=
r.out.ctr.ctr2.array[0];
- }
for (k=0; k < r.out.ctr.ctr2.count; k++) {
if
(strcasecmp_m(r.out.ctr.ctr2.array[k].netbios_name,
-
torture_join_netbios_name(priv->join))) {
+
torture_join_netbios_name(priv->join)) == 0) {
found = True;
+ priv->dcinfo=
r.out.ctr.ctr2.array[k];
break;
}
}
Rev 206: added install target in http://samba.org/~tridge/ctdb
revno: 206 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Fri 2007-04-27 17:24:10 +0200 message: added install target modified: Makefile.inmakefile.in-20061117234101-o3qt14umlg9en8z0-1 === modified file 'Makefile.in' --- a/Makefile.in 2007-04-26 12:51:41 + +++ b/Makefile.in 2007-04-27 15:24:10 + @@ -105,5 +105,12 @@ rm -f config.log config.status config.cache config.h rm -f Makefile +install: + mkdir -p $(bindir) + mkdir -p $(includedir) + cp $(BINS) $(bindir) + cp $(srcdir)/include/ctdb.h $(includedir) + + realdistclean: distclean rm -f configure config.h.in
svn commit: samba r22537 - in branches/SAMBA_3_0/source/rpc_client: .
Author: obnox
Date: 2007-04-27 15:26:40 + (Fri, 27 Apr 2007)
New Revision: 22537
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22537
Log:
Use a (more speaking) macro when there is one.
Modified:
branches/SAMBA_3_0/source/rpc_client/cli_lsarpc.c
Changeset:
Modified: branches/SAMBA_3_0/source/rpc_client/cli_lsarpc.c
===
--- branches/SAMBA_3_0/source/rpc_client/cli_lsarpc.c 2007-04-27 14:31:26 UTC
(rev 22536)
+++ branches/SAMBA_3_0/source/rpc_client/cli_lsarpc.c 2007-04-27 15:26:40 UTC
(rev 22537)
@@ -164,7 +164,7 @@
NT_STATUS_UNSUCCESSFUL );
if (!NT_STATUS_IS_OK(r.status) &&
- NT_STATUS_V(r.status) != NT_STATUS_V(STATUS_SOME_UNMAPPED)) {
+ !NT_STATUS_EQUAL(r.status, STATUS_SOME_UNMAPPED)) {
/* An actual error occured */
result = r.status;
Rev 89: merged tridge's branch in http://samba.org/~tridge/psomogyi/
revno: 89 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Peter Somogyi <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Fri 2007-04-27 17:13:16 +0200 message: merged tridge's branch modified: .bzrignore bzrignore-20061117235536-slq8jlz2b5161dfm-1 common/cmdline.c cmdline.c-20070416041216-w1zvz91bkdsgjckw-1 common/ctdb.c ctdb.c-20061127094323-t50f58d65iaao5of-2 common/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1 common/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1 common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1 common/ctdb_ltdb.c ctdb_ltdb.c-20061128065342-to93h6eejj5kon81-2 common/ctdb_message.c ctdb_message.c-20070208224107-9dnio7x7z33prrmt-1 include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 tests/ctdb_bench.c ctdb_bench.c-20061219052637-2liagoglohxb6p7s-1 tests/ctdb_fetch.c ctdb_fetch.c-20070405031748-f7gslozfj3rwh5ie-1 tests/ctdb_fetch1.cctdb_fetch1.c-20070412111848-xawz6wqk9r0v8jdk-1 tests/ctdb_messaging.c ctdb_messaging.c-20070411034205-6d6vne56pbih2x1p-1 tests/ctdb_test.c ctdb_test.c-20061117234101-o3qt14umlg9en8z0-16 tools/ctdb_control.c ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1 revno: 44.1.161 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Fri 2007-04-27 17:10:47 +0200 message: always use allocated packets to avoid alignment errors revno: 44.1.160 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Fri 2007-04-27 16:53:52 +0200 message: merge from ronnie revno: 44.1.153.1.7 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Sat 2007-04-28 00:31:45 +1000 message: make srvid 64 bits instead of 32 bits revno: 44.1.153.1.6 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Fri 2007-04-27 23:41:45 +1000 message: merge from tridge revno: 44.1.159 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Fri 2007-04-27 16:42:43 +0200 message: some debug code revno: 44.1.158 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Fri 2007-04-27 15:26:13 +0200 message: merged broadcast messages from ronnie revno: 44.1.153.1.5 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Fri 2007-04-27 23:16:17 +1000 message: add a special VNN that means "all" nodes so that a message can be broadcasted to all daemons in the cluster change the message dispatch routine for sending messages so that it allows several clients to use the same srvid messages are then passed on to all clients that have that srvid revno: 44.1.157 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Fri 2007-04-27 15:14:36 +0200 message: debug level controls revno: 44.1.156 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Fri 2007-04-27 14:49:44 +0200 message: nicer testing of control data size rev
Rev 88: ctdb/ib: disconnect error handling rearrangement in http://samba.org/~tridge/psomogyi/
revno: 88
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Peter Somogyi <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Fri 2007-04-27 17:12:20 +0200
message:
ctdb/ib: disconnect error handling rearrangement
modified:
ib/ibwrapper.c ibwrapper.c-20061204130028-0125b4f5a72f4b11
=== modified file 'ib/ibwrapper.c'
--- a/ib/ibwrapper.c2007-04-26 14:54:24 +
+++ b/ib/ibwrapper.c2007-04-27 15:12:20 +
@@ -534,13 +534,14 @@
case RDMA_CM_EVENT_DISCONNECTED:
DEBUG(11, ("RDMA_CM_EVENT_DISCONNECTED\n"));
- if ((rc=rdma_ack_cm_event(event)))
- DEBUG(0, ("disc/rdma_ack_cm_event failed with %d\n",
rc));
- event = NULL; /* don't ack more */
-
if (cma_id!=pctx->cm_id) {
- DEBUG(0, ("client DISCONNECT event cm_id=%p\n",
cma_id));
+ DEBUG(1, ("client DISCONNECT event cm_id=%p\n",
cma_id));
conn = talloc_get_type(cma_id->context, struct
ibw_conn);
+
+ if ((rc=rdma_ack_cm_event(event)))
+ DEBUG(0, ("disc/rdma_ack_cm_event failed with
%d\n", rc));
+ event = NULL; /* don't ack it any more */
+
conn->state = IBWC_DISCONNECTED;
pctx->connstate_func(NULL, conn);
}
Rev 205: always use allocated packets to avoid alignment errors in http://samba.org/~tridge/ctdb
revno: 205
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Fri 2007-04-27 17:10:47 +0200
message:
always use allocated packets to avoid alignment errors
modified:
common/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1
common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
=== modified file 'common/ctdb_client.c'
--- a/common/ctdb_client.c 2007-04-27 14:31:45 +
+++ b/common/ctdb_client.c 2007-04-27 15:10:47 +
@@ -381,7 +381,7 @@
void *private_data)
{
- struct ctdb_req_register c;
+ struct ctdb_req_register *c;
int res;
/* if the domain socket is not yet open, open it */
@@ -389,15 +389,15 @@
ctdb_socket_connect(ctdb);
}
- ZERO_STRUCT(c);
-
- c.hdr.length = sizeof(c);
- c.hdr.ctdb_magic = CTDB_MAGIC;
- c.hdr.ctdb_version = CTDB_VERSION;
- c.hdr.operation= CTDB_REQ_REGISTER;
- c.srvid= srvid;
-
- res = ctdb_client_queue_pkt(ctdb, &c.hdr);
+ c = ctdbd_allocate_pkt(ctdb, sizeof(*c));
+ c->hdr.length = sizeof(*c);
+ c->hdr.ctdb_magic = CTDB_MAGIC;
+ c->hdr.ctdb_version = CTDB_VERSION;
+ c->hdr.operation= CTDB_REQ_REGISTER;
+ c->srvid= srvid;
+
+ res = ctdb_client_queue_pkt(ctdb, &c->hdr);
+ talloc_free(c);
if (res != 0) {
return res;
}
@@ -446,15 +446,14 @@
*/
void ctdb_connect_wait(struct ctdb_context *ctdb)
{
- struct ctdb_req_connect_wait r;
+ struct ctdb_req_connect_wait *r;
int res;
- ZERO_STRUCT(r);
-
- r.hdr.length = sizeof(r);
- r.hdr.ctdb_magic = CTDB_MAGIC;
- r.hdr.ctdb_version = CTDB_VERSION;
- r.hdr.operation = CTDB_REQ_CONNECT_WAIT;
+ r = ctdbd_allocate_pkt(ctdb, sizeof(*r));
+ r->hdr.length = sizeof(*r);
+ r->hdr.ctdb_magic = CTDB_MAGIC;
+ r->hdr.ctdb_version = CTDB_VERSION;
+ r->hdr.operation = CTDB_REQ_CONNECT_WAIT;
DEBUG(3,("ctdb_connect_wait: sending to ctdbd\n"));
@@ -463,7 +462,8 @@
ctdb_socket_connect(ctdb);
}
- res = ctdb_queue_send(ctdb->daemon.queue, (uint8_t *)&r.hdr,
r.hdr.length);
+ res = ctdb_queue_send(ctdb->daemon.queue, (uint8_t *)&r->hdr,
r->hdr.length);
+ talloc_free(r);
if (res != 0) {
DEBUG(0,(__location__ " Failed to queue a connect wait
request\n"));
return;
@@ -596,23 +596,24 @@
*/
void ctdb_shutdown(struct ctdb_context *ctdb)
{
- struct ctdb_req_shutdown r;
- int len;
+ struct ctdb_req_shutdown *r;
/* if the domain socket is not yet open, open it */
if (ctdb->daemon.sd==-1) {
ctdb_socket_connect(ctdb);
}
- len = sizeof(struct ctdb_req_shutdown);
- ZERO_STRUCT(r);
- r.hdr.length = len;
- r.hdr.ctdb_magic = CTDB_MAGIC;
- r.hdr.ctdb_version = CTDB_VERSION;
- r.hdr.operation= CTDB_REQ_SHUTDOWN;
- r.hdr.reqid= 0;
-
- ctdb_client_queue_pkt(ctdb, &(r.hdr));
+ r = ctdbd_allocate_pkt(ctdb, sizeof(*r));
+ ZERO_STRUCT(*r);
+ r->hdr.length = sizeof(*r);
+ r->hdr.ctdb_magic = CTDB_MAGIC;
+ r->hdr.ctdb_version = CTDB_VERSION;
+ r->hdr.operation= CTDB_REQ_SHUTDOWN;
+ r->hdr.reqid= 0;
+
+ ctdb_client_queue_pkt(ctdb, &(r->hdr));
+
+ talloc_free(r);
/* this event loop will terminate once we receive the reply */
while (1) {
=== modified file 'common/ctdb_daemon.c'
--- a/common/ctdb_daemon.c 2007-04-27 14:31:45 +
+++ b/common/ctdb_daemon.c 2007-04-27 15:10:47 +
@@ -216,23 +216,23 @@
static void daemon_request_connect_wait(struct ctdb_client *client,
struct ctdb_req_connect_wait *c)
{
- struct ctdb_reply_connect_wait r;
+ struct ctdb_reply_connect_wait *r;
int res;
/* first wait - in the daemon */
ctdb_daemon_connect_wait(client->ctdb);
/* now send the reply */
- ZERO_STRUCT(r);
-
- r.hdr.length = sizeof(r);
- r.hdr.ctdb_magic = CTDB_MAGIC;
- r.hdr.ctdb_version = CTDB_VERSION;
- r.hdr.operation = CTDB_REPLY_CONNECT_WAIT;
- r.vnn = ctdb_get_vnn(client->ctdb);
- r.num_connected = client->ctdb->num_connected;
+ r = ctdbd_allocate_pkt(client, sizeof(*r));
+ r->hdr.length = sizeof(*r);
+ r->hdr.ctdb_magic = CTDB_MAGIC;
+ r->hdr.ctdb_version = CTDB_VERSION;
+ r->hdr.operation = CTDB_REPLY_CONNECT_WAIT;
+ r->vnn = ctdb_get_vnn(client->ctdb);
+ r->num_connected = c
Rev 204: merge from ronnie in http://samba.org/~tridge/ctdb
revno: 204 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Fri 2007-04-27 16:53:52 +0200 message: merge from ronnie modified: common/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1 common/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1 common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1 common/ctdb_message.c ctdb_message.c-20070208224107-9dnio7x7z33prrmt-1 include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 tests/ctdb_bench.c ctdb_bench.c-20061219052637-2liagoglohxb6p7s-1 tests/ctdb_fetch.c ctdb_fetch.c-20070405031748-f7gslozfj3rwh5ie-1 tests/ctdb_fetch1.cctdb_fetch1.c-20070412111848-xawz6wqk9r0v8jdk-1 tests/ctdb_messaging.c ctdb_messaging.c-20070411034205-6d6vne56pbih2x1p-1 revno: 197.1.7 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Sat 2007-04-28 00:31:45 +1000 message: make srvid 64 bits instead of 32 bits revno: 197.1.6 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Fri 2007-04-27 23:41:45 +1000 message: merge from tridge Diff too large for email (304, the limit is 200).
Rev 203: some debug code in http://samba.org/~tridge/ctdb
revno: 203
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Fri 2007-04-27 16:42:43 +0200
message:
some debug code
modified:
common/ctdb_control.c
ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1
include/ctdb_private.h
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
=== modified file 'common/ctdb_control.c'
--- a/common/ctdb_control.c 2007-04-27 13:14:36 +
+++ b/common/ctdb_control.c 2007-04-27 14:42:43 +
@@ -51,9 +51,13 @@
switch (opcode) {
case CTDB_CONTROL_PROCESS_EXISTS: {
pid_t pid;
+ int32_t ret;
CHECK_CONTROL_DATA_SIZE(sizeof(pid));
pid = *(pid_t *)indata.dptr;
- return kill(pid, 0);
+ ret = kill(pid, 0);
+ DEBUG(5,("process_exists on %u:%u gave %d\n",
+ctdb->vnn, pid, ret));
+ return ret;
}
case CTDB_CONTROL_SET_DEBUG: {
=== modified file 'include/ctdb_private.h'
--- a/include/ctdb_private.h2007-04-27 13:26:13 +
+++ b/include/ctdb_private.h2007-04-27 14:42:43 +
@@ -34,6 +34,8 @@
#define CTDB_CURRENT_NODE 0xF001
#define CTDB_BROADCAST_VNN 0xF002
+
+
/*
an installed ctdb remote call
*/
svn commit: samba r22536 - in branches/SAMBA_4_0/source/libnet: .
Author: metze
Date: 2007-04-27 14:31:26 + (Fri, 27 Apr 2007)
New Revision: 22536
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22536
Log:
resolve name before passing to cldap
metze
Modified:
branches/SAMBA_4_0/source/libnet/libnet_site.c
Changeset:
Modified: branches/SAMBA_4_0/source/libnet/libnet_site.c
===
--- branches/SAMBA_4_0/source/libnet/libnet_site.c 2007-04-27 14:23:08 UTC
(rev 22535)
+++ branches/SAMBA_4_0/source/libnet/libnet_site.c 2007-04-27 14:31:26 UTC
(rev 22536)
@@ -24,6 +24,7 @@
#include "lib/ldb/include/ldb.h"
#include "lib/ldb/include/ldb_errors.h"
#include "librpc/rpc/dcerpc.h"
+#include "libcli/resolve/resolve.h"
/*
* 1. Setup a CLDAP socket.
@@ -128,6 +129,8 @@
const char *server_dn_str;
const char *config_dn_str;
+ struct nbt_name name;
+ const char *dest_addr = NULL;
tmp_ctx = talloc_named(libnet_r, 0, "libnet_JoinSite temp context");
if (!tmp_ctx) {
@@ -142,8 +145,16 @@
return NT_STATUS_NO_MEMORY;
}
+ make_nbt_name_client(&name, libnet_r->out.samr_binding->host);
+ status = resolve_name(&name, r, &dest_addr, NULL);
+ if (!NT_STATUS_IS_OK(status)) {
+ libnet_r->out.error_string = NULL;
+ talloc_free(tmp_ctx);
+ return status;
+ }
+
/* Resolve the site name and AD DN's. */
- r->in.dest_address = libnet_r->out.samr_binding->host;
+ r->in.dest_address = dest_addr;
r->in.netbios_name = libnet_r->in.netbios_name;
r->in.domain_dn_str = libnet_r->out.domain_dn_str;
@@ -152,7 +163,7 @@
libnet_r->out.error_string =
talloc_steal(libnet_r, r->out.error_string);
talloc_free(tmp_ctx);
- return NT_STATUS_NO_MEMORY;
+ return status;
}
config_dn_str = r->out.config_dn_str;
svn commit: samba r22535 - in branches/SAMBA_4_0/source: .
Author: metze
Date: 2007-04-27 14:23:08 + (Fri, 27 Apr 2007)
New Revision: 22535
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22535
Log:
pass down $(TESTS) to all test variants
metze
Modified:
branches/SAMBA_4_0/source/main.mk
Changeset:
Modified: branches/SAMBA_4_0/source/main.mk
===
--- branches/SAMBA_4_0/source/main.mk 2007-04-27 14:17:28 UTC (rev 22534)
+++ branches/SAMBA_4_0/source/main.mk 2007-04-27 14:23:08 UTC (rev 22535)
@@ -315,12 +315,12 @@
valgrindtest-quick: all
SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes
--num-callers=30" \
VALGRIND="valgrind -q --num-callers=30
--log-file=${selftest_prefix}/valgrind.log" \
- $(SELFTEST) --quick --immediate --socket-wrapper
+ $(SELFTEST) --quick --immediate --socket-wrapper $(TESTS)
valgrindtest-all: everything
SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes
--num-callers=30" \
VALGRIND="valgrind -q --num-callers=30
--log-file=${selftest_prefix}/valgrind.log" \
- $(SELFTEST) --immediate --socket-wrapper
+ $(SELFTEST) --immediate --socket-wrapper $(TESTS)
valgrindtest-env: everything
SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes
--num-callers=30" \
@@ -331,11 +331,11 @@
gdbtest-quick: all
SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run " \
- $(SELFTEST) --immediate --quick --socket-wrapper
+ $(SELFTEST) --immediate --quick --socket-wrapper $(TESTS)
gdbtest-all: everything
SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run " \
- $(SELFTEST) --immediate --socket-wrapper
+ $(SELFTEST) --immediate --socket-wrapper $(TESTS)
gdbtest-env: everything
SMBD_VALGRIND="xterm -n smbd -e $(srcdir)/script/gdb_run " \
svn commit: samba r22534 - in branches/SAMBA_4_0/source/librpc/rpc: .
Author: metze
Date: 2007-04-27 14:17:28 + (Fri, 27 Apr 2007)
New Revision: 22534
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22534
Log:
don't remove socket and fd_event before we told the
packet layer.
also fix double free (left over from cut-n-paste)
metze
Modified:
branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c
===
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c 2007-04-27 14:00:27 UTC
(rev 22533)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c 2007-04-27 14:17:28 UTC
(rev 22534)
@@ -50,24 +50,22 @@
if (!sock) return;
+ if (sock->packet) {
+ packet_recv_disable(sock->packet);
+ packet_set_fde(sock->packet, NULL);
+ packet_set_socket(sock->packet, NULL);
+ }
+
if (sock->fde) {
talloc_free(sock->fde);
sock->fde = NULL;
}
if (sock->sock) {
- talloc_free(sock->fde);
- sock->fde = NULL;
talloc_free(sock->sock);
sock->sock = NULL;
}
- if (sock->packet) {
- packet_recv_disable(sock->packet);
- packet_set_fde(sock->packet, NULL);
- packet_set_socket(sock->packet, NULL);
- }
-
if (NT_STATUS_EQUAL(NT_STATUS_UNSUCCESSFUL, status)) {
status = NT_STATUS_UNEXPECTED_NETWORK_ERROR;
}
svn commit: samba r22533 - in branches/SAMBA_3_0/source/smbd: .
Author: vlendec
Date: 2007-04-27 14:00:27 + (Fri, 27 Apr 2007)
New Revision: 22533
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22533
Log:
Use lib functions where we have them
Modified:
branches/SAMBA_3_0/source/smbd/server.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/server.c
===
--- branches/SAMBA_3_0/source/smbd/server.c 2007-04-27 13:12:44 UTC (rev
22532)
+++ branches/SAMBA_3_0/source/smbd/server.c 2007-04-27 14:00:27 UTC (rev
22533)
@@ -309,7 +309,7 @@
int s;
int maxfd = 0;
int i;
- struct timeval idle_timeout = {0, 0};
+ struct timeval idle_timeout = timeval_zero();
if (server_mode == SERVER_MODE_INETD) {
return open_sockets_inetd();
@@ -383,7 +383,8 @@
sizeof(listen_set));
num = sys_select(maxfd+1,&lfds,NULL,NULL,
- idle_timeout.tv_sec ? &idle_timeout : NULL);
+timeval_is_zero(&idle_timeout) ?
+NULL : &idle_timeout);
if (num == -1 && errno == EINTR) {
if (got_sig_term) {
Rev 87: ctdb/ib: merge-fix: ibw_init called twice in http://samba.org/~tridge/psomogyi/
revno: 87
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Peter Somogyi <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Fri 2007-04-27 15:54:50 +0200
message:
ctdb/ib: merge-fix: ibw_init called twice
modified:
ib/ibw_ctdb_init.c
ibw_ctdb_init.c-20070102171305-cn2z4k7ibx8141d5-1
=== modified file 'ib/ibw_ctdb_init.c'
--- a/ib/ibw_ctdb_init.c2007-04-26 14:54:24 +
+++ b/ib/ibw_ctdb_init.c2007-04-27 13:54:50 +
@@ -74,12 +74,7 @@
*/
static int ctdb_ibw_start(struct ctdb_context *ctdb)
{
- int i, ret;
-
- ret = ctdb_ibw_init(ctdb);
- if (ret != 0) {
- return ret;
- }
+ int i;
for (i=0; inum_nodes; i++) {
if (ctdb_ibw_add_node(ctdb->nodes[i]) != 0) {
Rev 202: merged broadcast messages from ronnie in http://samba.org/~tridge/ctdb
revno: 202
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Fri 2007-04-27 15:26:13 +0200
message:
merged broadcast messages from ronnie
modified:
common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
common/ctdb_message.c
ctdb_message.c-20070208224107-9dnio7x7z33prrmt-1
include/ctdb_private.h
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
revno: 197.1.5
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Fri 2007-04-27 23:16:17 +1000
message:
add a special VNN that means "all" nodes so that a message can be
broadcasted to all daemons in the cluster
change the message dispatch routine for sending messages so that it
allows several clients to use the same srvid
messages are then passed on to all clients that have that srvid
=== modified file 'common/ctdb_daemon.c'
--- a/common/ctdb_daemon.c 2007-04-27 08:43:52 +
+++ b/common/ctdb_daemon.c 2007-04-27 13:16:17 +
@@ -266,7 +266,7 @@
ctdb_request_message(client->ctdb, (struct ctdb_req_header *)c);
return;
}
-
+
/* its for a remote node */
data.dptr = &c->data[0];
data.dsize = c->datalen;
=== modified file 'common/ctdb_message.c'
--- a/common/ctdb_message.c 2007-04-19 21:47:37 +
+++ b/common/ctdb_message.c 2007-04-27 13:16:17 +
@@ -39,16 +39,11 @@
/* XXX we need a must faster way of finding the matching srvid
- maybe a tree? */
for (ml=ctdb->message_list;ml;ml=ml->next) {
- if (ml->srvid == srvid || ml->srvid == CTDB_SRVID_ALL) break;
- }
- if (ml == NULL) {
- DEBUG(1,(__location__ " daemon vnn:%d no msg handler for
srvid=%u\n",
-ctdb_get_vnn(ctdb), srvid));
- /* no registered message handler */
- return -1;
+ if (ml->srvid == srvid || ml->srvid == CTDB_SRVID_ALL) {
+ ml->message_handler(ctdb, srvid, data,
ml->message_private);
+ }
}
- ml->message_handler(ctdb, srvid, data, ml->message_private);
return 0;
}
@@ -141,8 +136,28 @@
r->srvid = srvid;
r->datalen = data.dsize;
memcpy(&r->data[0], data.dptr, data.dsize);
-
- ctdb_queue_packet(ctdb, &r->hdr);
+
+ if (vnn != CTDB_BROADCAST_VNN) {
+ ctdb_queue_packet(ctdb, &r->hdr);
+ } else {
+ struct ctdb_node *node;
+ int i;
+
+ /* this was a broadcast message
+ loop over all other nodes and send them each a copy
+ */
+ for (i=0; inodes[i];
+
+ /* we do not send the message to ourself */
+ if (node && node->vnn!=ctdb->vnn) {
+ r->hdr.destnode = node->vnn;
+ ctdb_queue_packet(ctdb, &r->hdr);
+ }
+ }
+ /* also make sure to dispatch the message locally */
+ ctdb_dispatch_message(ctdb, srvid, data);
+ }
talloc_free(r);
return 0;
=== modified file 'include/ctdb_private.h'
--- a/include/ctdb_private.h2007-04-27 13:14:36 +
+++ b/include/ctdb_private.h2007-04-27 13:26:13 +
@@ -30,9 +30,10 @@
#define CTDB_DS_ALIGNMENT 8
-#define CTDB_NULL_FUNC 0xf001
-#define CTDB_CURRENT_NODE 0xF001
+#define CTDB_NULL_FUNC 0xF001
+#define CTDB_CURRENT_NODE 0xF001
+#define CTDB_BROADCAST_VNN 0xF002
/*
an installed ctdb remote call
*/
svn commit: samba-web r1106 - in trunk: .
Author: sfrench Date: 2007-04-27 13:24:18 + (Fri, 27 Apr 2007) New Revision: 1106 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1106 Log: Update cifs client home page to indicate new version numbers Modified: trunk/Linux_CIFS_client.html Changeset: Modified: trunk/Linux_CIFS_client.html === --- trunk/Linux_CIFS_client.html2007-04-25 12:19:28 UTC (rev 1105) +++ trunk/Linux_CIFS_client.html2007-04-27 13:24:18 UTC (rev 1106) @@ -1,90 +1,114 @@ - - - -Linux CIFS Client - - - - - - - -LATEST UPDATES - cifs vfs version 1.45 is accepted into mainline kernel (2.6.18) and includes full posix byte range locking support to current Samba servers, and also has much improved posix locking support to other servers, even those which do not support the CIFS POSIX protocol extensions. cifs 1.45 also includes much improved support for legacy servers including OS/2 and Windows 9x. A backported version of cifs 1.45 which builds on old kernel versions is also available. cifs vfs 1.46 is current in the cifs-2.6.git tree. - - - - - - - - CIFS VFS - - - - Advanced Common Internet File System for - Linux - - - - - - http://us1.samba.org/samba/images/penguin.gif"; src="samba/images/penguin.gif"> - mailto:[EMAIL PROTECTED]">Questions to developers - -https://bugzilla.samba.org/buglist.cgi?query_format=specific&order=relevance+desc&bug_status=__open__&product=CifsVFS&content=";>Search for open bugs in bugzilla -Download -CIFS Testing -Suggested test plan (under construction) -http://www.kernel.org/git/gitweb.cgi?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;h=7b4ac096cd114d34e623bafaed91b85ba4a95e62";>Installation -http://www.kernel.org/git/gitweb.cgi?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;h=8cc881694e2911d0a2eff3ca7eb5dd5efc0503d3";>Todo list -http://www.snia.org/tech_activities/CIFS/CIFS-TR-1p00_FINAL.pdf";>SNIA -CIFS Specification -http://www.kernel.org/git/gitweb.cgi?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;h=72fdc10dfdd7c94327ad87efff1dec2adbb67cbd";>Authors/Thankshttp://oss.software.ibm.com/developer/opensource/linux/presentations/samba/ut_cifs.pdf";>r - - - - The CIFS VFS is a virtual file system for Linux to allow access to servers - and storage appliances compliant with the SNIA CIFS Specification version - 1.0 or later. Popular servers such as Samba, Windows - 2000, Windows XP and many others support CIFS by default. The - CIFS VFS provides some support for older servers based on the more - primitive SMB (Server Message Block) protocol (you also can use the Linux filesystem - smbfs as an alternative for accessing these). CIFS VFS is designed to take - advantage of advanced network filesystem features such as locking, Unicode (advanced - internationalization), hardlinks, dfs (heirarchical, replicated name space), - distributed caching and uses native TCP names (rather than RFC1001, Netbios - names). Unlike some other network filesystems all key network function - including authentication is provided in kernel (and changes to mount and/or - a mount helper file are not required in order to enable the CIFS VFS). - With the addition of upcoming improvements to the mount helper (mount.cifs) - the CIFS VFS will be able to take advantage of the new CIFS URL specification - though. The Todo list includes some of the other features being - planned for future releases. The CIFS VFS has been tested with - Linux 2.4.14 and later as well as regular testing on Linux 2.6 (and has - been in the kernel source starting with Linux kernel 2.5.42. The CIFS client - is no longer considered "expiremental" in Linux versions after - 2.6.7 (cifs version 1.19) or later. Testing has been done on various hardware - architectures including x86 and even big endian zSeries hardware. - The cifs and smbfs filesystems can coexist on the same system and do not - conflict. - - The current version of the CIFS VFS has been backported to compile on 2.4 kernels, not just older 2.6. kernel versions). To download replacement files for the - fs/cifs directory which includes a relatively recent version of the cifs - vfs click http://pserver.samba.org/samba/ftp/cifs-cvs/cifs-1.45.tar.gz";>1.45 for 2.6 kernels (released August 2nd, 2006).CIFS VFS is licensed under the http://www.gnu.org/copyleft/gpl.html";>GNU General Public License - version 2 or later. - - - - - Thanks to SNIA, IBM and the Samba Team - http://us1.samba.org/samba/images/samba_banner.gif";> - for their assistance - and support. - - - -
Rev 201: debug level controls in http://samba.org/~tridge/ctdb
revno: 201 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Fri 2007-04-27 15:14:36 +0200 message: debug level controls modified: common/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1 common/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1 include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 tools/ctdb_control.c ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1 Diff too large for email (294, the limit is 200).
Rev 200: nicer testing of control data size in http://samba.org/~tridge/ctdb
revno: 200
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Fri 2007-04-27 14:49:44 +0200
message:
nicer testing of control data size
modified:
common/ctdb_control.c
ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1
=== modified file 'common/ctdb_control.c'
--- a/common/ctdb_control.c 2007-04-27 12:08:12 +
+++ b/common/ctdb_control.c 2007-04-27 12:49:44 +
@@ -33,6 +33,13 @@
void *private_data;
};
+#define CHECK_CONTROL_DATA_SIZE(size) do { \
+ if (indata.dsize != sizeof(pid_t)) { \
+DEBUG(0,(__location__ " Invalid data in opcode %u\n", opcode)); \
+return -1; \
+ } \
+ } while (0)
+
/*
process a control request
*/
@@ -43,15 +50,13 @@
switch (opcode) {
case CTDB_CONTROL_PROCESS_EXISTS: {
pid_t pid;
- if (indata.dsize != sizeof(pid_t)) {
- DEBUG(0,(__location__ " Invalid data in
CTDB_CONTROL_PROCESS_EXISTS\n"));
- return -1;
- }
+ CHECK_CONTROL_DATA_SIZE(sizeof(pid));
pid = *(pid_t *)indata.dptr;
return kill(pid, 0);
}
case CTDB_CONTROL_STATUS: {
+ CHECK_CONTROL_DATA_SIZE(0);
outdata->dptr = (uint8_t *)&ctdb->status;
outdata->dsize = sizeof(ctdb->status);
return 0;
@@ -59,7 +64,7 @@
case CTDB_CONTROL_GETVNNMAP: {
uint32_t i, len;
-
+ CHECK_CONTROL_DATA_SIZE(0);
len = 2+ctdb->vnn_map->size;
outdata->dsize = 4*len;
outdata->dptr = (unsigned char *)talloc_array(outdata,
uint32_t, len);
@@ -95,22 +100,21 @@
}
case CTDB_CONTROL_CONFIG: {
+ CHECK_CONTROL_DATA_SIZE(0);
outdata->dptr = (uint8_t *)ctdb;
outdata->dsize = sizeof(*ctdb);
return 0;
}
case CTDB_CONTROL_PING:
+ CHECK_CONTROL_DATA_SIZE(0);
return 0;
case CTDB_CONTROL_GETDBPATH: {
uint32_t db_id;
struct ctdb_db_context *ctdb_db;
- if (indata.dsize != sizeof(uint32_t)) {
- DEBUG(0,(__location__ " Invalid data in
CTDB_CONTROL_GETDBPATH\n"));
- return -1;
- }
+ CHECK_CONTROL_DATA_SIZE(db_id);
db_id = *(uint32_t *)indata.dptr;
ctdb_db = find_ctdb_db(ctdb, db_id);
if (ctdb_db == NULL) return -1;
svn commit: samba r22532 - in branches/SAMBA_3_0_25: . source
Author: jerry Date: 2007-04-27 13:12:44 + (Fri, 27 Apr 2007) New Revision: 22532 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22532 Log: Sync release notes from the release branch and bump version to 3.0.25rc4. Modified: branches/SAMBA_3_0_25/WHATSNEW.txt branches/SAMBA_3_0_25/source/VERSION Changeset: Modified: branches/SAMBA_3_0_25/WHATSNEW.txt === --- branches/SAMBA_3_0_25/WHATSNEW.txt 2007-04-27 11:13:37 UTC (rev 22531) +++ branches/SAMBA_3_0_25/WHATSNEW.txt 2007-04-27 13:12:44 UTC (rev 22532) @@ -1,9 +1,9 @@ = - Release Notes for Samba 3.0.25rc1 - Apr 9, 2007 + Release Notes for Samba 3.0.25rc3 + Apr 25, 2007 = -This is the first release candidate of the Samba 3.0.25 code base +This is the third release candidate of the Samba 3.0.25 code base and is provided for testing only. An RC release means that we are close to the final release but the code may still have a few remaining minor bugs. This release is *not* intended for production @@ -25,8 +25,9 @@ o Support for passing Windows security descriptors to a VFS plug-in allowing for multiple Unix ACL implements to running side by side on the Same server. - o Improved compatibility with Windows Vista clients. - o Man pages for VFS plug-ins. + o Improved compatibility with Windows Vista clients including +improved read performance with Linux servers. + o Man pages for IdMap and VFS plug-ins. Off-line Logons and AD Site Support @@ -41,16 +42,12 @@ New IdMap Interface for Winbindd -The 3.0.25 release of Samba will include a rewritten IdMap interface -for winbindd which replaces the "idmap backend" parameter. The -initial design document may be found at +The 3.0.25 release of Samba includes a rewritten IdMap interface +for winbindd which replaces the "idmap backend" parameter. Please +refer to the "idmap domains" description in the smb.conf(5) man +page for more details. - http://www.samba.org/~idra/samba3_newidmap.pdf -Please refer to the "idmap domains" description in the smb.conf(5) -man page for more details. - - Dynamic DNS Updates === @@ -70,10 +67,214 @@ on the same server including NFSv4 and GPFS ACLs. +VFS ReadAhead Plugin + + +Windows Vista introduces pipe-lined read support for improved +performance when transferring files. The new vfs_readahead plugin +allows Linux file servers to utilize additional Kernel buffers +for caching files in order to avoid Disk I/O wait time when serving +Vista clients. If you experience poor read performance between +Linux servers and Vista clients, please test the vfs_readahead +module by adding the following lines to the share definition +in smb.conf: + +[file_share] + vfs objects = readahead + +Note that this plugin will result in additional RAM requirements +due to the increased amount of kernel buffer caches used by smbd. +Please refer to vfs_readahead(8) for more information. + + +Windows Vista, Office 2007, and Offline Files += + +Research surrounding offline files, Windows Vista, and Microsoft +Office 2007 has revealed a incompatibility between these +applications and the "map acl inherit = no" setting in smb.conf. +Users requiring support client side caching (csc) and offline +files are encouraged to enable the "map acl inherit" for any +affected share definitions in the server's configuration. +Future versions of Samba will enable this setting by default. + +Please refer to the smb.conf(5) man page for more details on +"map acl inherit". + + ## Changes ### +Changes since 3.0.25rc2 +--- + +commits +--- + +o Jeremy Allison <[EMAIL PROTECTED]> +* Allow Well-Known and Local Groups to be stored in POSIX ACLs + as long as there is a SID/gid mapping entry available. +* Fix memory corruption bug in the CIFS POSIX open/mkdir. +* BUG 4536: Correctly delete symlinks pointing to a directory. + + +o Gerald (Jerry) Carter <[EMAIL PROTECTED]> +* Ensure winbindd honors the "idmap domains" option and not + default to idmap_tdb. +* Fix memory corruption caused by calling free() on talloc()'d + memory when adding and removing users from local groups. + + +o Guenther Deschner <[EMAIL PROTECTED]> +* Memory allocation error checks in libgpo. + + +o Jim McDonough <[EMAIL PROTECTED]> +* Fix crate_user() access checks when setting the "User Cannot + Change Password" flag. + + +o Simo Sorce <[EMAIL PROTECTED]> +* Fix linking flags used when creating shared libraries. +
Rev 199: merge from ronnie in http://samba.org/~tridge/ctdb
revno: 199 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Fri 2007-04-27 14:45:45 +0200 message: merge from ronnie modified: common/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1 common/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1 include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 tools/ctdb_control.c ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1 revno: 197.1.4 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Fri 2007-04-27 22:08:12 +1000 message: add a new control : SETVNNMAP to set the generation id and also the vnn map on a ctdbd daemon revno: 197.1.3 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Fri 2007-04-27 20:56:10 +1000 message: add a control to read the vnnmap configuration from a node add support in ctdb_control to fetch this information from a node revno: 197.1.2 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Ronnie Sahlberg <[EMAIL PROTECTED]> branch nick: ctdb timestamp: Fri 2007-04-27 19:01:27 +1000 message: merge from tridge Diff too large for email (272, the limit is 200).
svn commit: samba r22531 - in branches/SAMBA_4_0/source: dsdb/samdb/ldb_modules setup
Author: abartlet
Date: 2007-04-27 11:13:37 + (Fri, 27 Apr 2007)
New Revision: 22531
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22531
Log:
Fix up OpenLDAP schema map to almost pass 'make test'.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/entryUUID.c
branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3
branches/SAMBA_4_0/source/setup/schema_samba4.ldif
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/entryUUID.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/entryUUID.c
2007-04-27 10:06:34 UTC (rev 22530)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/entryUUID.c
2007-04-27 11:13:37 UTC (rev 22531)
@@ -356,11 +356,29 @@
.type = MAP_RENAME,
.u = {
.rename = {
-.remote_name = "sambaObjectClasses"
+.remote_name = "samba4ObjectClasses"
}
}
},
{
+ .local_name = "dITContentRules",
+ .type = MAP_RENAME,
+ .u = {
+ .rename = {
+.remote_name = "samba4DITContentRules"
+}
+ }
+ },
+ {
+ .local_name = "attributeTypes",
+ .type = MAP_RENAME,
+ .u = {
+ .rename = {
+.remote_name = "samba4AttributeTypes"
+}
+ }
+ },
+ {
.local_name = "sambaPassword",
.type = MAP_RENAME,
.u = {
Modified: branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3
===
--- branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3 2007-04-27
10:06:34 UTC (rev 22530)
+++ branches/SAMBA_4_0/source/setup/schema-map-openldap-2.3 2007-04-27
11:13:37 UTC (rev 22531)
@@ -2,7 +2,6 @@
name
labeledURI
createTimeStamp
-attributeTypes
objectClass
userPassword
seeAlso
@@ -12,11 +11,14 @@
distinguishedName
description
cn
-dITContentRules
top
#This shouldn't make it to the ldap server
sambaPassword
#These conflict with OpenLDAP builtins
+attributeTypes:samba4AttributeTypes
+2.5.21.5:1.3.6.1.4.1.7165.4.255.7
+dITContentRules:samba4DITContentRules
+2.5.21.2:1.3.6.1.4.1.7165.4.255.6
objectClasses:samba4ObjectClasses
2.5.21.6:1.3.6.1.4.1.7165.4.255.5
subSchema:samba4SubSchema
Modified: branches/SAMBA_4_0/source/setup/schema_samba4.ldif
===
--- branches/SAMBA_4_0/source/setup/schema_samba4.ldif 2007-04-27 10:06:34 UTC
(rev 22530)
+++ branches/SAMBA_4_0/source/setup/schema_samba4.ldif 2007-04-27 11:13:37 UTC
(rev 22531)
@@ -169,3 +169,5 @@
#Allocated: (modifyTimestamp) samba4ModifyTimestamp: 1.3.6.1.4.1.7165.4.255.3
#Allocated: (subSchema) samba4SubSchema: 1.3.6.1.4.1.7165.4.255.4
#Allocated: (objectClasses) samba4ObjectClasses: 1.3.6.1.4.1.7165.4.255.5
+#Allocated: (ditContentRules) samba4DitContentRules: 1.3.6.1.4.1.7165.4.255.6
+#Allocated: (attributeTypes) samba4AttributeTypes: 1.3.6.1.4.1.7165.4.255.7
svn commit: samba r22530 - in branches/SAMBA_4_0/source/setup: .
Author: metze
Date: 2007-04-27 10:06:34 + (Fri, 27 Apr 2007)
New Revision: 22530
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22530
Log:
use message() to make --quiet work
metze
Modified:
branches/SAMBA_4_0/source/setup/provision
Changeset:
Modified: branches/SAMBA_4_0/source/setup/provision
===
--- branches/SAMBA_4_0/source/setup/provision 2007-04-27 08:43:06 UTC (rev
22529)
+++ branches/SAMBA_4_0/source/setup/provision 2007-04-27 10:06:34 UTC (rev
22530)
@@ -120,10 +120,10 @@
var ldapmodule = (options["ldap-module"] != undefined);
if (options["aci"] != undefined) {
- println("set ACI: " + subobj["ACI"]);
+ message("set ACI: %s\n", subobj["ACI"]);
}
-println("set DOMAIN SID: " + subobj["DOMAINSID"]);
+message("set DOMAIN SID: %s\n", subobj["DOMAINSID"]);
if (ldapbackend) {
if (!ldapmodule) {
svn commit: samba r22529 - in branches/SAMBA_3_0/source/modules: .
Author: obnox Date: 2007-04-27 08:43:06 + (Fri, 27 Apr 2007) New Revision: 22529 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22529 Log: Add implementation of HP-UX ACLs in the new vfs-module framework. Modified: branches/SAMBA_3_0/source/modules/vfs_hpuxacl.c Changeset: Sorry, the patch is too large (1243 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22529
Rev 198: merge vnn_map code from ronnie in http://samba.org/~tridge/ctdb
revno: 198
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Fri 2007-04-27 11:01:03 +0200
message:
merge vnn_map code from ronnie
modified:
common/cmdline.c cmdline.c-20070416041216-w1zvz91bkdsgjckw-1
common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
common/ctdb_ltdb.c ctdb_ltdb.c-20061128065342-to93h6eejj5kon81-2
include/ctdb_private.h
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
revno: 197.1.1
merged: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Ronnie Sahlberg <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Fri 2007-04-27 18:43:52 +1000
message:
add a mapping table from a hash value to a lmaster vnn number
update ctdb_lmaster() return the lmaster based on this tables contents
initialize the vnn table based on number of nodes for now.
later when recovery is implemented the recovery process will populate
this mapping table.
=== modified file 'common/cmdline.c'
--- a/common/cmdline.c 2007-04-26 17:27:07 +
+++ b/common/cmdline.c 2007-04-27 08:43:52 +
@@ -66,7 +66,7 @@
struct ctdb_context *ctdb_cmdline_init(struct event_context *ev)
{
struct ctdb_context *ctdb;
- int ret;
+ int i, ret;
if (ctdb_cmdline.nlist == NULL || ctdb_cmdline.myaddress == NULL) {
printf("You must provide a node list with --nlist and an
address with --listen\n");
@@ -120,6 +120,31 @@
exit(1);
}
+ /* initialize the vnn mapping table */
+/*
+XXX we currently initialize it to the maximum number of nodes to
+XXX make it behave the same way as previously.
+XXX Once we have recovery working we should initialize this always to
+XXX generation==0 (==invalid) and let the recovery tool populate this
+XXX table for the daemons.
+*/
+ ctdb->vnn_map = talloc_zero(ctdb, struct ctdb_vnn_map);
+ if (ctdb->vnn_map == NULL) {
+ DEBUG(0,(__location__ " Unable to allocate vnn_map
structure\n"));
+ exit(1);
+ }
+ ctdb->vnn_map->generation = 1;
+ ctdb->vnn_map->size = 1024;
+ ctdb->vnn_map->map = talloc_array(ctdb->vnn_map, uint32_t,
ctdb->vnn_map->size);
+ if (ctdb->vnn_map->map == NULL) {
+ DEBUG(0,(__location__ " Unable to allocate vnn_map->map
structure\n"));
+ exit(1);
+ }
+ for(i=0;ivnn_map->size;i++){
+ ctdb->vnn_map->map[i] = i%ctdb->num_nodes;
+ }
+
+
return ctdb;
}
=== modified file 'common/ctdb_daemon.c'
--- a/common/ctdb_daemon.c 2007-04-26 21:10:35 +
+++ b/common/ctdb_daemon.c 2007-04-27 08:43:52 +
@@ -678,6 +678,7 @@
close(fd[1]);
+
ctdb->ev = event_context_init(NULL);
fde = event_add_fd(ctdb->ev, ctdb, fd[0], EVENT_FD_READ,
ctdb_read_from_parent, &fd[0]);
fde = event_add_fd(ctdb->ev, ctdb, ctdb->daemon.sd, EVENT_FD_READ,
ctdb_accept_client, ctdb);
=== modified file 'common/ctdb_ltdb.c'
--- a/common/ctdb_ltdb.c2007-04-26 21:10:35 +
+++ b/common/ctdb_ltdb.c2007-04-27 08:43:52 +
@@ -124,7 +124,12 @@
*/
uint32_t ctdb_lmaster(struct ctdb_context *ctdb, const TDB_DATA *key)
{
- return ctdb_hash(key) % ctdb->num_nodes;
+ uint32_t idx, lmaster;
+
+ idx = ctdb_hash(key) % ctdb->vnn_map->size;
+ lmaster = ctdb->vnn_map->map[idx];
+
+ return lmaster;
}
=== modified file 'include/ctdb_private.h'
--- a/include/ctdb_private.h2007-04-26 21:10:35 +
+++ b/include/ctdb_private.h2007-04-27 08:43:52 +
@@ -157,6 +157,14 @@
double max_lockwait_latency;
};
+/* table that contains the mapping between a hash value and lmaster
+ */
+struct ctdb_vnn_map {
+ uint32_t generation;
+ uint32_t size;
+ uint32_t *map;
+};
+
/* main state of the ctdb daemon */
struct ctdb_context {
struct event_context *ev;
@@ -181,6 +189,7 @@
struct ctdb_message_list *message_list;
struct ctdb_daemon_data daemon;
struct ctdb_status status;
+ struct ctdb_vnn_map *vnn_map;
};
struct ctdb_db_context {
