Re: Rev 632: make sure we set close on exec on any possibly inherited fds in http://samba.org/~tridge/ctdb

[Stefan (metze) Metzmacher]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

> +
> + /* on exec, don't inherit the fd */
> + v = fcntl(epoll_ev->epoll_fd, F_GETFD, 0);
> +fcntl(epoll_ev->epoll_fd, F_SETFD, v | FD_CLOEXEC);
> +

Hi Tridge,

can you please fix the leading whitespaces into a tab
and then merge this to samba4?

Thanks!

metze
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org

iD8DBQFG8MX8m70gjA5TCD8RAoieAJ9vcUrJ2zf0iauXFmOK0iDtVbhcyACgl+mD
p4VT9MMAa8gVN7quhzBC4uY=
=AI1V
-END PGP SIGNATURE-

Rev 620: a bit more information on this failure to try to track down the problem chris cowan is seeing in http://samba.org/~tridge/3_0-ctdb

[tridge]

revno: 620
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: s3-ctdb-tridge
timestamp: Wed 2007-09-19 13:05:17 +1000
message:
  a bit more information on this failure to try to track down the problem chris 
cowan is seeing
modified:
  source/lib/messages.c  messages.c-20070210173807-1wjifrbwaz6xnmgl-491
=== modified file 'source/lib/messages.c'
--- a/source/lib/messages.c 2007-09-14 09:29:17 +
+++ b/source/lib/messages.c 2007-09-19 03:05:17 +
@@ -1317,6 +1317,8 @@
}
 
if (!(ctx->inbuf = TALLOC_ARRAY(ctx, uint8, ctx->msglen))) {
+   DEBUG(0,("Failed to allocate inbuf of size %u\n",
+(unsigned)ctx->msglen));
cluster_fatal("talloc failed\n");
}
ctx->inbuflen = sizeof(uint32);

Rev 631: separate out the various fs display ops in http://samba.org/~tridge/ctdb

[tridge]

revno: 631
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Wed 2007-09-19 11:46:11 +1000
message:
  separate out the various fs display ops
modified:
  tools/ctdb_diagnostics 
ctdb_diagnostics-20070905041904-9d9r1qnt1j9qiwiz-1
=== modified file 'tools/ctdb_diagnostics'
--- a/tools/ctdb_diagnostics2007-09-17 05:31:33 +
+++ b/tools/ctdb_diagnostics2007-09-19 01:46:11 +
@@ -113,7 +113,9 @@
 
 Showing system and process status
 EOF
-show_all "df; df -i; mount"
+show_all "df"
+show_all "df -i"
+show_all "mount"
 show_all "w"
 show_all "ps axfw"
 show_all "dmesg"

Rev 632: make sure we set close on exec on any possibly inherited fds in http://samba.org/~tridge/ctdb

[tridge]

revno: 632
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Wed 2007-09-19 11:46:37 +1000
message:
  make sure we set close on exec on any possibly inherited fds
modified:
  lib/events/events_epoll.c  
events_epoll.c-20070501213746-4fxluwiq4rcxib8p-2
  lib/tdb/common/open.c  open.c-20070220022425-m1wibgjq7n5hahs6-8
  server/ctdb_recover.c  
ctdb_recover.c-20070503002147-admmfgt1oj6gexfo-1
=== modified file 'lib/events/events_epoll.c'
--- a/lib/events/events_epoll.c 2007-07-10 05:34:00 +
+++ b/lib/events/events_epoll.c 2007-09-19 01:46:37 +
@@ -90,7 +90,14 @@
 */
 static void epoll_init_ctx(struct epoll_event_context *epoll_ev)
 {
+   unsigned v;
+
epoll_ev->epoll_fd = epoll_create(64);
+
+   /* on exec, don't inherit the fd */
+   v = fcntl(epoll_ev->epoll_fd, F_GETFD, 0);
+fcntl(epoll_ev->epoll_fd, F_SETFD, v | FD_CLOEXEC);
+
epoll_ev->pid = getpid();
talloc_set_destructor(epoll_ev, epoll_ctx_destructor);
 }
@@ -105,6 +112,7 @@
 static void epoll_check_reopen(struct epoll_event_context *epoll_ev)
 {
struct fd_event *fde;
+   unsigned v;
 
if (epoll_ev->pid == getpid()) {
return;
@@ -116,6 +124,11 @@
DEBUG(0,("Failed to recreate epoll handle after fork\n"));
return;
}
+
+   /* on exec, don't inherit the fd */
+   v = fcntl(epoll_ev->epoll_fd, F_GETFD, 0);
+fcntl(epoll_ev->epoll_fd, F_SETFD, v | FD_CLOEXEC);
+
epoll_ev->pid = getpid();
for (fde=epoll_ev->fd_events;fde;fde=fde->next) {
epoll_add_event(epoll_ev, fde);

=== modified file 'lib/tdb/common/open.c'
--- a/lib/tdb/common/open.c 2007-07-10 05:32:27 +
+++ b/lib/tdb/common/open.c 2007-09-19 01:46:37 +
@@ -138,6 +138,7 @@
int rev = 0, locked = 0;
unsigned char *vp;
u32 vertest;
+   unsigned v;
 
if (!(tdb = (struct tdb_context *)calloc(1, sizeof *tdb))) {
/* Can't log this */
@@ -197,6 +198,10 @@
goto fail;  /* errno set by open(2) */
}
 
+   /* on exec, don't inherit the fd */
+   v = fcntl(tdb->fd, F_GETFD, 0);
+fcntl(tdb->fd, F_SETFD, v | FD_CLOEXEC);
+
/* ensure there is only one process initialising at once */
if (tdb->methods->tdb_brlock(tdb, GLOBAL_LOCK, F_WRLCK, F_SETLKW, 0, 1) 
== -1) {
TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_open_ex: failed to get 
global lock on %s: %s\n",

=== modified file 'server/ctdb_recover.c'
--- a/server/ctdb_recover.c 2007-09-04 00:06:36 +
+++ b/server/ctdb_recover.c 2007-09-19 01:46:37 +
@@ -661,6 +661,8 @@
return false;
}
 
+   set_close_on_exec(ctdb->recovery_lock_fd);
+
lock.l_type = F_WRLCK;
lock.l_whence = SEEK_SET;
lock.l_start = 0;

Rev 621: this is a temporary db. We should mark it clear-if-first in http://samba.org/~tridge/3_0-ctdb

[tridge]

revno: 621
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: s3-ctdb-tridge
timestamp: Wed 2007-09-19 13:09:40 +1000
message:
  this is a temporary db. We should mark it clear-if-first
modified:
  source/utils/status.c  status.c-20070210173807-1wjifrbwaz6xnmgl-1163
=== modified file 'source/utils/status.c'
--- a/source/utils/status.c 2007-06-17 21:00:00 +
+++ b/source/utils/status.c 2007-09-19 03:09:40 +
@@ -346,7 +346,7 @@
if ( show_processes ) {
struct db_context *db;
db = db_open(NULL, lock_path("sessionid.tdb"), 0,
-TDB_DEFAULT, O_RDWR, 0644);
+TDB_CLEAR_IF_FIRST, O_RDWR, 0644);
if (!db) {
d_printf("sessionid.tdb not initialised\n");
} else {

svn commit: samba r25221 - in branches/SAMBA_4_0/source/libcli/swig: .

[tpot]

Author: tpot
Date: 2007-09-19 01:59:06 + (Wed, 19 Sep 2007)
New Revision: 25221

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

Log:
Experiment with Jelmer's new generic loadparm code.

Modified:
   branches/SAMBA_4_0/source/libcli/swig/libcli_nbt.i


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/swig/libcli_nbt.i
===
--- branches/SAMBA_4_0/source/libcli/swig/libcli_nbt.i  2007-09-19 01:57:26 UTC 
(rev 25220)
+++ branches/SAMBA_4_0/source/libcli/swig/libcli_nbt.i  2007-09-19 01:59:06 UTC 
(rev 25221)
@@ -31,11 +31,16 @@
 #include "lib/talloc/talloc.h"
 #include "lib/events/events.h"
 #include "libcli/nbt/libnbt.h"
+#include "param/param.h"
 
 /* Undo strcpy safety macro as it's used by swig )-: */
 
 #undef strcpy
 
+/* Loadparm parameters */
+
+static struct loadparm_context lp_ctx;
+
 %}
 
 %apply bool { BOOL };
@@ -132,4 +137,6 @@
 NTSTATUS nbt_name_query(struct nbt_name_socket *nbtsock, 
TALLOC_CTX *mem_ctx, struct nbt_name_query *io);
 
-void lp_load(void);
+%init %{
+  loadparm_init(&lp_ctx);
+%}

svn commit: samba r25220 - in branches/SAMBA_4_0/source/lib/ldb/swig: .

[tpot]

Author: tpot
Date: 2007-09-19 01:57:26 + (Wed, 19 Sep 2007)
New Revision: 25220

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

Log:
Comment out obsolete functions.

Modified:
   branches/SAMBA_4_0/source/lib/ldb/swig/ldb.i


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/swig/ldb.i
===
--- branches/SAMBA_4_0/source/lib/ldb/swig/ldb.i2007-09-18 23:19:04 UTC 
(rev 25219)
+++ branches/SAMBA_4_0/source/lib/ldb/swig/ldb.i2007-09-19 01:57:26 UTC 
(rev 25220)
@@ -234,6 +234,6 @@
 
 /* DN operations */
 
-struct ldb_dn *ldb_dn_explode(void *mem_ctx, const char *dn);
+/* struct ldb_dn *ldb_dn_explode(void *mem_ctx, const char *dn); */
 
-char *ldb_dn_linearize(void *mem_ctx, const struct ldb_dn *dn);
+/* char *ldb_dn_linearize(void *mem_ctx, const struct ldb_dn *dn); */

Build status as of Wed Sep 19 00:00:02 2007

[build]

URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2007-09-18 
00:01:20.0 +
+++ /home/build/master/cache/broken_results.txt 2007-09-19 00:01:32.0 
+
@@ -1,4 +1,4 @@
-Build status as of Tue Sep 18 00:00:03 2007
+Build status as of Wed Sep 19 00:00:02 2007
 
 Build counts:
 Tree Total  Broken Panic 
@@ -9,16 +9,16 @@
 distcc   2  0  0 
 ldb  31 5  0 
 libreplace   30 8  0 
-lorikeet-heimdal 25 15 0 
+lorikeet-heimdal 26 16 0 
 pidl 18 4  0 
 ppp  11 8  0 
 python   0  0  0 
-rsync31 12 0 
+rsync31 16 0 
 samba-docs   0  0  0 
 samba-gtk3  3  0 
-samba4   28 17 2 
-samba_3_232 30 0 
+samba4   28 18 2 
+samba_3_232 31 0 
 smb-build29 29 0 
 talloc   31 1  0 
-tdb  31 3  0 
+tdb  30 3  0 
 

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

[jelmer]

Author: jelmer
Date: 2007-09-18 23:19:04 + (Tue, 18 Sep 2007)
New Revision: 25219

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

Log:
remove unused check for precompiled headers.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/lib/replace/libreplace.m4


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/lib/replace/libreplace.m4
===
--- branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2007-09-18 22:43:06 UTC 
(rev 25218)
+++ branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2007-09-18 23:19:04 UTC 
(rev 25219)
@@ -307,17 +307,6 @@
 fi 
 
 
-AC_CACHE_CHECK([that the C compiler can precompile header 
files],samba_cv_precompiled_headers, [
-   dnl Check whether the compiler can generate precompiled headers
-   touch conftest.h
-   if ${CC-cc} conftest.h 2> /dev/null && test -f conftest.h.gch; then
-   precompiled_headers=yes
-   else
-   precompiled_headers=no
-   fi])
-AC_SUBST(precompiled_headers)
-
-
 dnl Check if the C compiler understands volatile (it should, being ANSI).
 AC_CACHE_CHECK([that the C compiler understands volatile],samba_cv_volatile, [
AC_TRY_COMPILE([#include ],[volatile int i = 0],

svn commit: samba r25218 - in branches/SAMBA_4_0: source/lib/ldb/common source/lib/ldb/ldb_tdb source/lib/ldb/tests source/lib/ldb/tests/schema-tests testprogs/ejs

[abartlet]

Author: abartlet
Date: 2007-09-18 22:43:06 + (Tue, 18 Sep 2007)
New Revision: 25218

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

Log:
After discussion with Simo, remove the subclass support from LDB.

Subclass support was designed to avoid needing to spell out the full
list of objectClasses that an entry was in.  However, Samba4 now
enforces this restriction in the objectClass module, and the way
subclass matching was handled was complex and counter-intuitive in my
opinion (and did not match LDAP).

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/lib/ldb/common/attrib_handlers.c
   branches/SAMBA_4_0/source/lib/ldb/common/ldb_attributes.c
   branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_cache.c
   branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c
   branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.h
   branches/SAMBA_4_0/source/lib/ldb/tests/schema-tests/schema.ldif
   branches/SAMBA_4_0/source/lib/ldb/tests/test-tdb-features.sh
   branches/SAMBA_4_0/testprogs/ejs/ldb.js


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/common/attrib_handlers.c
===
--- branches/SAMBA_4_0/source/lib/ldb/common/attrib_handlers.c  2007-09-18 
13:47:10 UTC (rev 25217)
+++ branches/SAMBA_4_0/source/lib/ldb/common/attrib_handlers.c  2007-09-18 
22:43:06 UTC (rev 25218)
@@ -278,33 +278,6 @@
 }
 
 /*
-  compare two objectclasses, looking at subclasses
-*/
-int ldb_comparison_objectclass(struct ldb_context *ldb, void *mem_ctx,
- const struct ldb_val *v1, const struct 
ldb_val *v2)
-{
-   int ret, i;
-   const char **subclasses;
-   ret = ldb_comparison_fold(ldb, mem_ctx, v1, v2);
-   if (ret == 0) {
-   return 0;
-   }
-   subclasses = ldb_subclass_list(ldb, (char *)v1->data);
-   if (subclasses == NULL) {
-   return ret;
-   }
-   for (i=0;subclasses[i];i++) {
-   struct ldb_val vs;
-   vs.data = discard_const(subclasses[i]);
-   vs.length = strlen(subclasses[i]);
-   if (ldb_comparison_objectclass(ldb, mem_ctx, &vs, v2) == 0) {
-   return 0;
-   }
-   }
-   return ret;
-}
-
-/*
   compare two utc time values. 1 second resolution
 */
 int ldb_comparison_utctime(struct ldb_context *ldb, void *mem_ctx,
@@ -368,7 +341,7 @@
.ldif_read_fn= ldb_handler_copy,
.ldif_write_fn   = ldb_handler_copy,
.canonicalise_fn = ldb_handler_fold,
-   .comparison_fn   = ldb_comparison_objectclass
+   .comparison_fn   = ldb_comparison_fold
},
{ 
.name= LDB_SYNTAX_UTC_TIME,

Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_attributes.c
===
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb_attributes.c   2007-09-18 
13:47:10 UTC (rev 25217)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_attributes.c   2007-09-18 
22:43:06 UTC (rev 25218)
@@ -204,114 +204,3 @@
return LDB_SUCCESS;
 }
 
-/*
-  return the list of subclasses for a class
-*/
-const char **ldb_subclass_list(struct ldb_context *ldb, const char *classname)
-{
-   int i;
-   for (i=0;ischema.num_classes;i++) {
-   if (ldb_attr_cmp(classname, ldb->schema.classes[i].name) == 0) {
-   return (const char **)ldb->schema.classes[i].subclasses;
-   }
-   }
-   return NULL;
-}
-
-
-/*
-  add a new subclass
-*/
-static int ldb_subclass_new(struct ldb_context *ldb, const char *classname, 
const char *subclass)
-{
-   struct ldb_subclass *s, *c;
-   s = talloc_realloc(ldb, ldb->schema.classes, struct ldb_subclass, 
ldb->schema.num_classes+1);
-   if (s == NULL) goto failed;
-
-   ldb->schema.classes = s;
-   c = &s[ldb->schema.num_classes];
-   c->name = talloc_strdup(s, classname);
-   if (c->name == NULL) goto failed;
-
-   c->subclasses = talloc_array(s, char *, 2);
-   if (c->subclasses == NULL) goto failed;
-
-   c->subclasses[0] = talloc_strdup(c->subclasses, subclass);
-   if (c->subclasses[0] == NULL) goto failed;
-   c->subclasses[1] = NULL;
-
-   ldb->schema.num_classes++;
-
-   return 0;
-failed:
-   ldb_oom(ldb);
-   return -1;
-}
-
-/*
-  add a subclass
-*/
-int ldb_subclass_add(struct ldb_context *ldb, const char *classname, const 
char *subclass)
-{
-   int i, n;
-   struct ldb_subclass *c;
-   char **s;
-
-   for (i=0;ischema.num_classes;i++) {
-   if (ldb_attr_cmp(classname, ldb->schema.classes[i].name) == 0) {
-   break;
-   }
-   }
-   if (i == ldb->schema.num_classes) {
-   return ldb_subclass_new(ldb, classname, subclass);
-   }
-   c = &ldb->schema.classes[i];
-   
-   fo

svn commit: samba r25217 - in branches/SAMBA_4_0/source/client: .

[metze]

Author: metze
Date: 2007-09-18 13:47:10 + (Tue, 18 Sep 2007)
New Revision: 25217

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

Log:
#define TALLOC_DEPRECATED 1 to get talloc_append_string() macro

I'm not updating any code here, as in a few places the
existing code seems totaly broken to me...

metze
Modified:
   branches/SAMBA_4_0/source/client/client.c


Changeset:
Modified: branches/SAMBA_4_0/source/client/client.c
===
--- branches/SAMBA_4_0/source/client/client.c   2007-09-18 13:45:43 UTC (rev 
25216)
+++ branches/SAMBA_4_0/source/client/client.c   2007-09-18 13:47:10 UTC (rev 
25217)
@@ -20,6 +20,15 @@
along with this program.  If not, see .
 */
 
+/* 
+ * TODO: remove this ... and don't use talloc_append_string()
+ *
+ * NOTE: I'm not changing the code yet, because I assume there're
+ *   some bugs in the existing code and I'm not sure how to fix
+ *  them correctly.
+ */
+#define TALLOC_DEPRECATED 1
+
 #include "includes.h"
 #include "version.h"
 #include "libcli/libcli.h"

svn commit: samba r25216 - in branches/SAMBA_4_0/source/lib/talloc: .

[metze]

Author: metze
Date: 2007-09-18 13:45:43 + (Tue, 18 Sep 2007)
New Revision: 25216

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

Log:
make talloc_append_string() a deprecated macro instead of
having it as a real function.

metze
Modified:
   branches/SAMBA_4_0/source/lib/talloc/talloc.c
   branches/SAMBA_4_0/source/lib/talloc/talloc.h


Changeset:
Modified: branches/SAMBA_4_0/source/lib/talloc/talloc.c
===
--- branches/SAMBA_4_0/source/lib/talloc/talloc.c   2007-09-18 13:41:50 UTC 
(rev 25215)
+++ branches/SAMBA_4_0/source/lib/talloc/talloc.c   2007-09-18 13:45:43 UTC 
(rev 25216)
@@ -1133,32 +1133,6 @@
 }
 
 /*
- append to a talloced string 
-*/
-char *talloc_append_string(const void *t, char *orig, const char *append)
-{
-   char *ret;
-   size_t olen = strlen(orig);
-   size_t alenz;
-
-   if (!append)
-   return orig;
-
-   alenz = strlen(append) + 1;
-
-   ret = talloc_realloc(t, orig, char, olen + alenz);
-   if (!ret)
-   return NULL;
-
-   /* append the string with the trailing \0 */
-   memcpy(&ret[olen], append, alenz);
-
-   _talloc_set_name_const(ret, ret);
-
-   return ret;
-}
-
-/*
   strndup with a talloc
 */
 char *talloc_strndup(const void *t, const char *p, size_t n)

Modified: branches/SAMBA_4_0/source/lib/talloc/talloc.h
===
--- branches/SAMBA_4_0/source/lib/talloc/talloc.h   2007-09-18 13:41:50 UTC 
(rev 25215)
+++ branches/SAMBA_4_0/source/lib/talloc/talloc.h   2007-09-18 13:45:43 UTC 
(rev 25216)
@@ -111,6 +111,7 @@
 #define talloc_array_p(ctx, type, count) talloc_array(ctx, type, count)
 #define talloc_realloc_p(ctx, p, type, count) talloc_realloc(ctx, p, type, 
count)
 #define talloc_destroy(ctx) talloc_free(ctx)
+#define talloc_append_string(c, s, a) 
(s?talloc_strdup_append(s,a):talloc_strdup(c, a))
 #endif
 
 /* The following definitions come from talloc.c  */
@@ -178,6 +179,4 @@
 char *talloc_asprintf_append(char *s, const char *fmt, ...) 
PRINTF_ATTRIBUTE(2,3);
 char *talloc_asprintf_append_buffer(char *s, const char *fmt, ...) 
PRINTF_ATTRIBUTE(2,3);
 
-char *talloc_append_string(const void *t, char *orig, const char *append);
-
 #endif

svn commit: samba r25215 - in branches/SAMBA_4_0/source/lib/ldb: common ldb_tdb

[metze]

Author: metze
Date: 2007-09-18 13:41:50 + (Tue, 18 Sep 2007)
New Revision: 25215

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

Log:
replace talloc_append_string() with talloc_strdup_append_buffer()

metze
Modified:
   branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c
   branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c
===
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c   2007-09-18 13:33:44 UTC 
(rev 25214)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c   2007-09-18 13:41:50 UTC 
(rev 25215)
@@ -1279,6 +1279,7 @@
int i;
TALLOC_CTX *tmpctx;
char *cracked = NULL;
+   const char *format = (ex_format ? "\n" : "/" );
  
if ( ! ldb_dn_validate(dn)) {
return NULL;
@@ -1305,32 +1306,23 @@
 
/* Only domain components?  Finish here */
if (i < 0) {
-   if (ex_format) {
-   cracked = talloc_append_string(tmpctx, cracked, "\n");
-   } else {
-   cracked = talloc_append_string(tmpctx, cracked, "/");
-   }
+   cracked = talloc_strdup_append_buffer(cracked, format);
talloc_steal(mem_ctx, cracked);
goto done;
}
 
/* Now walk backwards appending remaining components */
for (; i > 0; i--) {
-   cracked = talloc_asprintf_append(cracked, "/%s", 
- ldb_dn_escape_value(tmpctx, 
dn->components[i].value));
+   cracked = talloc_asprintf_append_buffer(cracked, "/%s", 
+   
ldb_dn_escape_value(tmpctx, dn->components[i].value));
if (!cracked) {
goto done;
}
}
 
/* Last one, possibly a newline for the 'ex' format */
-   if (ex_format) {
-   cracked = talloc_asprintf_append(cracked, "\n%s",
- ldb_dn_escape_value(tmpctx, 
dn->components[i].value));
-   } else {
-   cracked = talloc_asprintf_append(cracked, "/%s", 
- ldb_dn_escape_value(tmpctx, 
dn->components[i].value));
-   }
+   cracked = talloc_asprintf_append_buffer(cracked, "%s%s", format,
+   ldb_dn_escape_value(tmpctx, 
dn->components[i].value));
 
talloc_steal(mem_ctx, cracked);
 done:

Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c
===
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c 2007-09-18 13:33:44 UTC 
(rev 25214)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c 2007-09-18 13:41:50 UTC 
(rev 25215)
@@ -145,7 +145,7 @@
goto failed;
}
 
-   key_str = talloc_append_string(ldb, key_str, dn_folded);
+   key_str = talloc_strdup_append_buffer(key_str, dn_folded);
if (!key_str) {
goto failed;
}

svn commit: samba r25214 - in branches/SAMBA_4_0/source/scripting/ejs: .

[metze]

Author: metze
Date: 2007-09-18 13:33:44 + (Tue, 18 Sep 2007)
New Revision: 25214

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

Log:
use talloc_strndup_append() instead of talloc_append_string()
and ugly hacks to handle the string termination.

metze
Modified:
   branches/SAMBA_4_0/source/scripting/ejs/literal.c


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/ejs/literal.c
===
--- branches/SAMBA_4_0/source/scripting/ejs/literal.c   2007-09-18 13:31:55 UTC 
(rev 25213)
+++ branches/SAMBA_4_0/source/scripting/ejs/literal.c   2007-09-18 13:33:44 UTC 
(rev 25214)
@@ -132,27 +132,11 @@
char *append,
int size)
 {
-char c;
-char *end_p = append + size;
-void *ret;
+   if (!orig) {
+   return talloc_strndup(ctx, append, size);
+   }
 
-/*
- * We need to null terminate the string to be copied.  Save character at
- * the size limit of the source string.
- */
-c = *end_p;
-
-/* Temporarily null-terminate it */
-*end_p = '\0';
-
-/* Append the requested data */
-ret = talloc_append_string(ctx, orig, append);
-
-/* Restore the original character in place of our temporary null byte */
-*end_p = c;
-
-/* Give 'em what they came for */
-return ret;
+   return talloc_strndup_append(orig, append, size);
 }
 
 

svn commit: samba r25213 - in branches/SAMBA_4_0/source/utils: .

[metze]

Author: metze
Date: 2007-09-18 13:31:55 + (Tue, 18 Sep 2007)
New Revision: 25213

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

Log:
use talloc_strdup_append_buffer() instead of talloc_append_string()

metze
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-09-18 13:31:05 UTC (rev 
25212)
+++ branches/SAMBA_4_0/source/utils/ntlm_auth.c 2007-09-18 13:31:55 UTC (rev 
25213)
@@ -902,8 +902,7 @@
static void *normal_private;
void **private;
 
-   buf = talloc(NULL, char);
-   buf[0] = '\0';
+   buf = talloc_strdup(NULL, "");
 
if (buf == NULL) {
DEBUG(0, ("Failed to allocate memory for reading the input "
@@ -926,7 +925,7 @@
exit(0);
}
 
-   buf = talloc_append_string(buf, buf, tmp);
+   buf = talloc_strdup_append_buffer(buf, tmp);
buf_size += INITIAL_BUFFER_SIZE;
 
if (buf_size > MAX_BUFFER_SIZE) {

svn commit: samba r25212 - in branches/SAMBA_4_0/source/libcli/util: .

[metze]

Author: metze
Date: 2007-09-18 13:31:05 + (Tue, 18 Sep 2007)
New Revision: 25212

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

Log:
merge some stuff from samba3

metze
Modified:
   branches/SAMBA_4_0/source/libcli/util/asn1.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/util/asn1.c
===
--- branches/SAMBA_4_0/source/libcli/util/asn1.c2007-09-18 13:25:48 UTC 
(rev 25211)
+++ branches/SAMBA_4_0/source/libcli/util/asn1.c2007-09-18 13:31:05 UTC 
(rev 25212)
@@ -360,6 +360,9 @@
 /* Peek into an ASN1 buffer, not advancing the pointer */
 BOOL asn1_peek(struct asn1_data *data, void *p, int len)
 {
+   if (data->has_error)
+   return False;
+
if (len < 0 || data->ofs + len < data->ofs || data->ofs + len < len)
return False;
 
@@ -405,7 +408,7 @@
return False;
}
 
-   if (!asn1_peek(data, &b, sizeof(b)))
+   if (!asn1_peek_uint8(data, &b))
return False;
 
return (b == tag);

svn commit: samba r25211 - in branches/SAMBA_4_0/source/lib/talloc: .

[metze]

Author: metze
Date: 2007-09-18 13:25:48 + (Tue, 18 Sep 2007)
New Revision: 25211

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

Log:
fix compiler warning

metze
Modified:
   branches/SAMBA_4_0/source/lib/talloc/talloc.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/talloc/talloc.c
===
--- branches/SAMBA_4_0/source/lib/talloc/talloc.c   2007-09-18 12:00:29 UTC 
(rev 25210)
+++ branches/SAMBA_4_0/source/lib/talloc/talloc.c   2007-09-18 13:25:48 UTC 
(rev 25211)
@@ -1315,6 +1315,10 @@
 
 static inline char *__talloc_vaslenprintf_append(char *s, size_t slen,
 const char *fmt, va_list ap)
+PRINTF_ATTRIBUTE(3,0);
+
+static inline char *__talloc_vaslenprintf_append(char *s, size_t slen,
+const char *fmt, va_list ap)
 {
ssize_t alen;
va_list ap2;

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

[metze]

Author: metze
Date: 2007-09-18 12:00:29 + (Tue, 18 Sep 2007)
New Revision: 25210

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

Log:
fix typo

metze
Modified:
   branches/SAMBA_4_0/source/lib/replace/replace.h


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/replace.h
===
--- branches/SAMBA_4_0/source/lib/replace/replace.h 2007-09-18 11:56:24 UTC 
(rev 25209)
+++ branches/SAMBA_4_0/source/lib/replace/replace.h 2007-09-18 12:00:29 UTC 
(rev 25210)
@@ -474,7 +474,7 @@
 #define __STRING(x)#x
 #endif
 
-#ifndef _STRINGSTRING
+#ifndef __STRINGSTRING
 #define __STRINGSTRING(x) __STRING(x)
 #endif
 

svn commit: samba r25209 - in branches/SAMBA_4_0/source/lib/talloc: .

[metze]

Author: metze
Date: 2007-09-18 11:56:24 + (Tue, 18 Sep 2007)
New Revision: 25209

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

Log:
unify logic of talloc_vasprintf_append() and talloc_vasprintf_append_buffer()

metze
Modified:
   branches/SAMBA_4_0/source/lib/talloc/talloc.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/talloc/talloc.c
===
--- branches/SAMBA_4_0/source/lib/talloc/talloc.c   2007-09-18 11:54:10 UTC 
(rev 25208)
+++ branches/SAMBA_4_0/source/lib/talloc/talloc.c   2007-09-18 11:56:24 UTC 
(rev 25209)
@@ -1313,30 +1313,18 @@
return ret;
 }
 
-
-/**
- * Realloc @p s to append the formatted result of @p fmt and @p ap,
- * and return @p s, which may have moved.  Good for gradually
- * accumulating output into a string buffer. Appends at the end
- * of the string.
- **/
-char *talloc_vasprintf_append(char *s, const char *fmt, va_list ap)
+static inline char *__talloc_vaslenprintf_append(char *s, size_t slen,
+const char *fmt, va_list ap)
 {
-   int len, s_len;
+   ssize_t alen;
va_list ap2;
char c;
 
-   if (s == NULL) {
-   return talloc_vasprintf(NULL, fmt, ap);
-   }
-
-   s_len = strlen(s);
-
va_copy(ap2, ap);
-   len = vsnprintf(&c, 1, fmt, ap2);
+   alen = vsnprintf(&c, 1, fmt, ap2);
va_end(ap2);
 
-   if (len <= 0) {
+   if (alen <= 0) {
/* Either the vsnprintf failed or the format resulted in
 * no characters being formatted. In the former case, we
 * ought to return NULL, in the latter we ought to return
@@ -1346,60 +1334,51 @@
return s;
}
 
-   s = talloc_realloc(NULL, s, char, s_len + len+1);
+   s = talloc_realloc(NULL, s, char, slen + alen + 1);
if (!s) return NULL;
 
va_copy(ap2, ap);
-   vsnprintf(s+s_len, len+1, fmt, ap2);
+   vsnprintf(s + slen, alen + 1, fmt, ap2);
va_end(ap2);
-   _talloc_set_name_const(s, s);
 
+   _talloc_set_name_const(s, s);
return s;
 }
 
 /**
  * Realloc @p s to append the formatted result of @p fmt and @p ap,
+ * and return @p s, which may have moved.  Good for gradually
+ * accumulating output into a string buffer. Appends at the end
+ * of the string.
+ **/
+char *talloc_vasprintf_append(char *s, const char *fmt, va_list ap)
+{
+   if (unlikely(!s)) {
+   return talloc_vasprintf(NULL, fmt, ap);
+   }
+
+   return __talloc_vaslenprintf_append(s, strlen(s), fmt, ap);
+}
+
+/**
+ * Realloc @p s to append the formatted result of @p fmt and @p ap,
  * and return @p s, which may have moved. Always appends at the
  * end of the talloc'ed buffer, not the end of the string.
  **/
 char *talloc_vasprintf_append_buffer(char *s, const char *fmt, va_list ap)
 {
-   struct talloc_chunk *tc;
-   int len, s_len;
-   va_list ap2;
-   char c;
+   size_t slen;
 
-   if (s == NULL) {
+   if (unlikely(!s)) {
return talloc_vasprintf(NULL, fmt, ap);
}
 
-   tc = talloc_chunk_from_ptr(s);
-
-   s_len = tc->size - 1;
-
-   va_copy(ap2, ap);
-   len = vsnprintf(&c, 1, fmt, ap2);
-   va_end(ap2);
-
-   if (len <= 0) {
-   /* Either the vsnprintf failed or the format resulted in
-* no characters being formatted. In the former case, we
-* ought to return NULL, in the latter we ought to return
-* the original string. Most current callers of this
-* function expect it to never return NULL.
-*/
-   return s;
+   slen = talloc_get_size(s);
+   if (likely(slen > 0)) {
+   slen--;
}
 
-   s = talloc_realloc(NULL, s, char, s_len + len+1);
-   if (!s) return NULL;
-
-   va_copy(ap2, ap);
-   vsnprintf(s+s_len, len+1, fmt, ap2);
-   va_end(ap2);
-   _talloc_set_name_const(s, s);
-
-   return s;
+   return __talloc_vaslenprintf_append(s, slen, fmt, ap);
 }
 
 /*

svn commit: samba r25208 - in branches/SAMBA_4_0/source/lib/talloc: .

[metze]

Author: metze
Date: 2007-09-18 11:54:10 + (Tue, 18 Sep 2007)
New Revision: 25208

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

Log:
add talloc_str[n]dup_append[_buffer]() functions

metze
Modified:
   branches/SAMBA_4_0/source/lib/talloc/talloc.c
   branches/SAMBA_4_0/source/lib/talloc/talloc.h


Changeset:
Modified: branches/SAMBA_4_0/source/lib/talloc/talloc.c
===
--- branches/SAMBA_4_0/source/lib/talloc/talloc.c   2007-09-18 11:52:35 UTC 
(rev 25207)
+++ branches/SAMBA_4_0/source/lib/talloc/talloc.c   2007-09-18 11:54:10 UTC 
(rev 25208)
@@ -1167,6 +1167,102 @@
return __talloc_strlendup(t, p, strnlen(p, n));
 }
 
+static inline char *__talloc_strlendup_append(char *s, size_t slen,
+ const char *a, size_t alen)
+{
+   char *ret;
+
+   ret = talloc_realloc(NULL, s, char, slen + alen + 1);
+   if (unlikely(!ret)) return NULL;
+
+   /* append the string and the trailing \0 */
+   memcpy(&ret[slen], a, alen);
+   ret[slen+alen] = 0;
+
+   _talloc_set_name_const(ret, ret);
+   return ret;
+}
+
+/*
+ * Appends at the end of the string.
+ */
+char *talloc_strdup_append(char *s, const char *a)
+{
+   if (unlikely(!s)) {
+   return talloc_strdup(NULL, a);
+   }
+
+   if (unlikely(!a)) {
+   return s;
+   }
+
+   return __talloc_strlendup_append(s, strlen(s), a, strlen(a));
+}
+
+/*
+ * Appends at the end of the talloc'ed buffer,
+ * not the end of the string.
+ */
+char *talloc_strdup_append_buffer(char *s, const char *a)
+{
+   size_t slen;
+
+   if (unlikely(!s)) {
+   return talloc_strdup(NULL, a);
+   }
+
+   if (unlikely(!a)) {
+   return s;
+   }
+
+   slen = talloc_get_size(s);
+   if (likely(slen > 0)) {
+   slen--;
+   }
+
+   return __talloc_strlendup_append(s, slen, a, strlen(a));
+}
+
+/*
+ * Appends at the end of the string.
+ */
+char *talloc_strndup_append(char *s, const char *a, size_t n)
+{
+   if (unlikely(!s)) {
+   return talloc_strdup(NULL, a);
+   }
+
+   if (unlikely(!a)) {
+   return s;
+   }
+
+   return __talloc_strlendup_append(s, strlen(s), a, strnlen(a, n));
+}
+
+/*
+ * Appends at the end of the talloc'ed buffer,
+ * not the end of the string.
+ */
+char *talloc_strndup_append_buffer(char *s, const char *a, size_t n)
+{
+   size_t slen;
+
+   if (unlikely(!s)) {
+   return talloc_strdup(NULL, a);
+   }
+
+   if (unlikely(!a)) {
+   return s;
+   }
+
+   slen = talloc_get_size(s);
+   if (likely(slen > 0)) {
+   slen--;
+   }
+
+   return __talloc_strlendup_append(s, slen, a, strnlen(a, n));
+}
+
 #ifndef HAVE_VA_COPY
 #ifdef HAVE___VA_COPY
 #define va_copy(dest, src) __va_copy(dest, src)

Modified: branches/SAMBA_4_0/source/lib/talloc/talloc.h
===
--- branches/SAMBA_4_0/source/lib/talloc/talloc.h   2007-09-18 11:52:35 UTC 
(rev 25207)
+++ branches/SAMBA_4_0/source/lib/talloc/talloc.h   2007-09-18 11:54:10 UTC 
(rev 25208)
@@ -152,15 +152,6 @@
 void talloc_enable_leak_report_full(void);
 void *_talloc_zero(const void *ctx, size_t size, const char *name);
 void *_talloc_memdup(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);
-char *talloc_vasprintf(const void *t, const char *fmt, va_list ap) 
PRINTF_ATTRIBUTE(2,0);
-char *talloc_vasprintf_append(char *s, const char *fmt, va_list ap) 
PRINTF_ATTRIBUTE(2,0);
-char *talloc_vasprintf_append_buffer(char *s, const char *fmt, va_list ap) 
PRINTF_ATTRIBUTE(2,0);
-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);
-char *talloc_asprintf_append_buffer(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_zero_array(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);
@@ -171,4 +162,22 @@
 void talloc_show_parents(const void *context, FILE *file);
 int talloc_is_parent(const void *context, const void *ptr);
 
+char *talloc_strdup(const void *t, const char *p);
+char *talloc_strdup_append(char *s, const char *a);
+char *talloc_strdup_append_buffer(char *s, const char *a);
+
+char *talloc_strndup(const void *t, const char *p, size_t n);
+char *talloc_strndup_append(char *s, const char *a, size_t n);
+char *talloc

svn commit: samba r25207 - in branches/SAMBA_4_0/source/lib/talloc: .

[metze]

Author: metze
Date: 2007-09-18 11:52:35 + (Tue, 18 Sep 2007)
New Revision: 25207

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

Log:
remove one nesting level and use unlikely()

metze
Modified:
   branches/SAMBA_4_0/source/lib/talloc/talloc.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/talloc/talloc.c
===
--- branches/SAMBA_4_0/source/lib/talloc/talloc.c   2007-09-18 11:51:41 UTC 
(rev 25206)
+++ branches/SAMBA_4_0/source/lib/talloc/talloc.c   2007-09-18 11:52:35 UTC 
(rev 25207)
@@ -1186,18 +1186,18 @@
va_copy(ap2, ap);
len = vsnprintf(&c, 1, fmt, ap2);
va_end(ap2);
-   if (len < 0) {
+   if (unlikely(len < 0)) {
return NULL;
}
 
ret = (char *)__talloc(t, len+1);
-   if (ret) {
-   va_copy(ap2, ap);
-   vsnprintf(ret, len+1, fmt, ap2);
-   va_end(ap2);
-   _talloc_set_name_const(ret, ret);
-   }
+   if (unlikely(!ret)) return NULL;
 
+   va_copy(ap2, ap);
+   vsnprintf(ret, len+1, fmt, ap2);
+   va_end(ap2);
+
+   _talloc_set_name_const(ret, ret);
return ret;
 }
 

svn commit: samba r25206 - in branches/SAMBA_4_0/source/lib/talloc: .

[metze]

Author: metze
Date: 2007-09-18 11:51:41 + (Tue, 18 Sep 2007)
New Revision: 25206

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

Log:
unify logic of talloc_strdup() and talloc_strndup(),
only strlen() vs. strnlen() is the difference now.

metze
Modified:
   branches/SAMBA_4_0/source/lib/talloc/talloc.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/talloc/talloc.c
===
--- branches/SAMBA_4_0/source/lib/talloc/talloc.c   2007-09-18 11:50:39 UTC 
(rev 25205)
+++ branches/SAMBA_4_0/source/lib/talloc/talloc.c   2007-09-18 11:51:41 UTC 
(rev 25206)
@@ -1109,20 +1109,27 @@
return newp;
 }
 
+static inline char *__talloc_strlendup(const void *t, const char *p, size_t 
len)
+{
+   char *ret;
+
+   ret = (char *)__talloc(t, len + 1);
+   if (unlikely(!ret)) return NULL;
+
+   memcpy(ret, p, len);
+   ret[len] = 0;
+
+   _talloc_set_name_const(ret, ret);
+   return ret;
+}
+
 /*
-  strdup with a talloc 
+  strdup with a talloc
 */
 char *talloc_strdup(const void *t, const char *p)
 {
-   char *ret;
-   if (!p) {
-   return NULL;
-   }
-   ret = (char *)talloc_memdup(t, p, strlen(p) + 1);
-   if (likely(ret)) {
-   _talloc_set_name_const(ret, ret);
-   }
-   return ret;
+   if (unlikely(!p)) return NULL;
+   return __talloc_strlendup(t, p, strlen(p));
 }
 
 /*
@@ -1152,21 +1159,12 @@
 }
 
 /*
-  strndup with a talloc 
+  strndup with a talloc
 */
 char *talloc_strndup(const void *t, const char *p, size_t n)
 {
-   size_t len;
-   char *ret;
-
-   for (len=0; len

svn commit: samba r25205 - in branches/SAMBA_4_0/source/lib/talloc: .

[metze]

Author: metze
Date: 2007-09-18 11:50:39 + (Tue, 18 Sep 2007)
New Revision: 25205

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

Log:
$(srcdir) isn't expanded here...

metze
Modified:
   branches/SAMBA_4_0/source/lib/talloc/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/lib/talloc/config.mk
===
--- branches/SAMBA_4_0/source/lib/talloc/config.mk  2007-09-18 06:36:07 UTC 
(rev 25204)
+++ branches/SAMBA_4_0/source/lib/talloc/config.mk  2007-09-18 11:50:39 UTC 
(rev 25205)
@@ -5,7 +5,7 @@
 SO_VERSION = 0
 OBJ_FILES = talloc.o
 MANPAGE = talloc.3
-CFLAGS = -I$(srcdir)/lib/talloc
+CFLAGS = -Ilib/talloc
 PUBLIC_HEADERS = talloc.h
 DESCRIPTION = A hierarchical pool based memory system with destructors
 #