Changeset 587 for vendor/current/source3/lib

Timestamp:

Jun 29, 2011, 7:36:41 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.6

Location:

vendor/current/source3/lib

Files:

• netapi/cm.c (modified) (12 diffs)
• netapi/netapi_private.h (modified) (1 diff)
• system.c (modified) (1 diff)
• tdb_validate.c (modified) (1 diff)

vendor/current/source3/lib/netapi/cm.c

@@ -26 +26 @@
 ********************************************************************/
 
+struct client_ipc_connection {
+        struct client_ipc_connection *prev, *next;
+        struct cli_state *cli;
+        struct client_pipe_connection *pipe_connections;
+};
+
+struct client_pipe_connection {
+        struct client_pipe_connection *prev, *next;
+        struct rpc_pipe_client *pipe;
+};
+
+/********************************************************************
+********************************************************************/
+
+static struct client_ipc_connection *ipc_cm_find(
+        struct libnetapi_private_ctx *priv_ctx, const char *server_name)
+{
+        struct client_ipc_connection *p;
+
+        for (p = priv_ctx->ipc_connections; p; p = p->next) {
+                if (strequal(p->cli->desthost, server_name)) {
+                        return p;
+                }
+        }
+
+        return NULL;
+}
+
+/********************************************************************
+********************************************************************/
+
 static WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx,
                                             const char *server_name,
-                                            struct cli_state **cli)
-{
+                                            struct client_ipc_connection **pp)
+{
+        struct libnetapi_private_ctx *priv_ctx =
+                (struct libnetapi_private_ctx *)ctx->private_data;
         struct user_auth_info *auth_info = NULL;
         struct cli_state *cli_ipc = NULL;
-
-        if (!ctx || !cli || !server_name) {
+        struct client_ipc_connection *p;
+
+        if (!ctx || !pp || !server_name) {
                 return WERR_INVALID_PARAM;
         }
 
-        auth_info = user_auth_info_init(NULL);
+        p = ipc_cm_find(priv_ctx, server_name);
+        if (p) {
+                *pp = p;
+                return WERR_OK;
+        }
+
+        auth_info = user_auth_info_init(ctx);
         if (!auth_info) {
                 return WERR_NOMEM;
@@ -79 +119 @@
         }
 
-        *cli = cli_ipc;
+        p = TALLOC_ZERO_P(ctx, struct client_ipc_connection);
+        if (p == NULL) {
+                return WERR_NOMEM;
+        }
+
+        p->cli = cli_ipc;
+        DLIST_ADD(priv_ctx->ipc_connections, p);
+
+        *pp = p;
 
         return WERR_OK;
@@ -87 +135 @@
 ********************************************************************/
 
-struct client_pipe_connection {
-        struct client_pipe_connection *prev, *next;
-        struct rpc_pipe_client *pipe;
-        struct cli_state *cli;
-};
-
-static struct client_pipe_connection *pipe_connections;
-
-/********************************************************************
-********************************************************************/
-
 WERROR libnetapi_shutdown_cm(struct libnetapi_ctx *ctx)
 {
-        struct client_pipe_connection *p;
-
-        for (p = pipe_connections; p; p = p->next) {
+        struct libnetapi_private_ctx *priv_ctx =
+                (struct libnetapi_private_ctx *)ctx->private_data;
+        struct client_ipc_connection *p;
+
+        for (p = priv_ctx->ipc_connections; p; p = p->next) {
                 cli_shutdown(p->cli);
         }
@@ -112 +151 @@
 ********************************************************************/
 
-static NTSTATUS pipe_cm_find(struct cli_state *cli,
+static NTSTATUS pipe_cm_find(struct client_ipc_connection *ipc,
                              const struct ndr_syntax_id *interface,
                              struct rpc_pipe_client **presult)
@@ -118 +157 @@
         struct client_pipe_connection *p;
 
-        for (p = pipe_connections; p; p = p->next) {
+        for (p = ipc->pipe_connections; p; p = p->next) {
 
                 if (!rpc_pipe_np_smb_conn(p->pipe)) {
@@ -124 +163 @@
                 }
 
-                if (strequal(cli->desthost, p->pipe->desthost)
+                if (strequal(ipc->cli->desthost, p->pipe->desthost)
                     && ndr_syntax_id_equal(&p->pipe->abstract_syntax,
                                            interface)) {
@@ -139 +178 @@
 
 static NTSTATUS pipe_cm_connect(TALLOC_CTX *mem_ctx,
-                                struct cli_state *cli,
+                                struct client_ipc_connection *ipc,
                                 const struct ndr_syntax_id *interface,
                                 struct rpc_pipe_client **presult)
@@ -151 +190 @@
         }
 
-        status = cli_rpc_pipe_open_noauth(cli, interface, &p->pipe);
+        status = cli_rpc_pipe_open_noauth(ipc->cli, interface, &p->pipe);
         if (!NT_STATUS_IS_OK(status)) {
                 TALLOC_FREE(p);
@@ -157 +196 @@
         }
 
-        p->cli = cli;
-        DLIST_ADD(pipe_connections, p);
+        DLIST_ADD(ipc->pipe_connections, p);
 
         *presult = p->pipe;
@@ -168 +206 @@
 
 static NTSTATUS pipe_cm_open(TALLOC_CTX *ctx,
-                             struct cli_state *cli,
+                             struct client_ipc_connection *ipc,
                              const struct ndr_syntax_id *interface,
                              struct rpc_pipe_client **presult)
 {
-        if (NT_STATUS_IS_OK(pipe_cm_find(cli, interface, presult))) {
+        if (NT_STATUS_IS_OK(pipe_cm_find(ipc, interface, presult))) {
                 return NT_STATUS_OK;
         }
 
-        return pipe_cm_connect(ctx, cli, interface, presult);
+        return pipe_cm_connect(ctx, ipc, interface, presult);
 }
 
@@ -190 +228 @@
         NTSTATUS status;
         WERROR werr;
-        struct cli_state *cli = NULL;
+        struct client_ipc_connection *ipc = NULL;
 
         if (!presult) {
@@ -196 +234 @@
         }
 
-        werr = libnetapi_open_ipc_connection(ctx, server_name, &cli);
+        werr = libnetapi_open_ipc_connection(ctx, server_name, &ipc);
         if (!W_ERROR_IS_OK(werr)) {
                 return werr;
         }
 
-        status = pipe_cm_open(ctx, cli, interface, &result);
+        status = pipe_cm_open(ctx, ipc, interface, &result);
         if (!NT_STATUS_IS_OK(status)) {
                 libnetapi_set_error_string(ctx, "failed to open PIPE %s: %s",

vendor/current/source3/lib/netapi/netapi_private.h

@@ -44 +44 @@
         } samr;
 
+        struct client_ipc_connection *ipc_connections;
 };
 

vendor/current/source3/lib/system.c

@@ -535 +535 @@
         dst->st_ex_ctime = get_ctimespec(src);
         make_create_timespec(src, dst, fake_dir_create_times);
+#ifdef HAVE_STAT_ST_BLKSIZE
         dst->st_ex_blksize = src->st_blksize;
+#else
+        dst->st_ex_blksize = STAT_ST_BLOCKSIZE;
+#endif
+
+#ifdef HAVE_STAT_ST_BLOCKS
         dst->st_ex_blocks = src->st_blocks;
+#else
+        dst->st_ex_blocks = src->st_size / dst->st_ex_blksize + 1;
+#endif
 
 #ifdef HAVE_STAT_ST_FLAGS

vendor/current/source3/lib/tdb_validate.c

@@ -193 +193 @@
         DEBUG(5, ("tdb_validate_open called for tdb '%s'\n", tdb_path));
 
-        tdb = tdb_open_log(tdb_path, 0, TDB_DEFAULT, O_RDONLY, 0);
+        tdb = tdb_open_log(tdb_path, 0, TDB_DEFAULT, O_RDWR, 0);
         if (!tdb) {
                 DEBUG(1, ("Error opening tdb %s\n", tdb_path));