svn commit: samba r26360 - in branches/SAMBA_4_0: . source/auth
source/client source/dsdb/samdb/ldb_modules
jelmer at samba.org
jelmer at samba.org
Mon Dec 10 04:33:41 GMT 2007
Author: jelmer
Date: 2007-12-10 04:33:39 +0000 (Mon, 10 Dec 2007)
New Revision: 26360
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26360
Log:
Add some const.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/auth/auth_anonymous.c
branches/SAMBA_4_0/source/auth/auth_developer.c
branches/SAMBA_4_0/source/auth/ntlm_check.c
branches/SAMBA_4_0/source/client/client.c
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/partition.c
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/auth/auth_anonymous.c
===================================================================
--- branches/SAMBA_4_0/source/auth/auth_anonymous.c 2007-12-10 04:33:36 UTC (rev 26359)
+++ branches/SAMBA_4_0/source/auth/auth_anonymous.c 2007-12-10 04:33:39 UTC (rev 26360)
@@ -56,7 +56,7 @@
return auth_anonymous_server_info(mem_ctx, lp_netbios_name(ctx->auth_ctx->lp_ctx), _server_info);
}
-static struct auth_operations anonymous_auth_ops = {
+static const struct auth_operations anonymous_auth_ops = {
.name = "anonymous",
.get_challenge = auth_get_challenge_not_implemented,
.want_check = anonymous_want_check,
Modified: branches/SAMBA_4_0/source/auth/auth_developer.c
===================================================================
--- branches/SAMBA_4_0/source/auth/auth_developer.c 2007-12-10 04:33:36 UTC (rev 26359)
+++ branches/SAMBA_4_0/source/auth/auth_developer.c 2007-12-10 04:33:39 UTC (rev 26360)
@@ -129,7 +129,7 @@
return nt_status;
}
-static struct auth_operations name_to_ntstatus_auth_ops = {
+static const struct auth_operations name_to_ntstatus_auth_ops = {
.name = "name_to_ntstatus",
.get_challenge = auth_get_challenge_not_implemented,
.want_check = name_to_ntstatus_want_check,
@@ -179,7 +179,7 @@
return NT_STATUS_NO_SUCH_USER;
}
-static struct auth_operations fixed_challenge_auth_ops = {
+static const struct auth_operations fixed_challenge_auth_ops = {
.name = "fixed_challenge",
.get_challenge = fixed_challenge_get_challenge,
.want_check = fixed_challenge_want_check,
Modified: branches/SAMBA_4_0/source/auth/ntlm_check.c
===================================================================
--- branches/SAMBA_4_0/source/auth/ntlm_check.c 2007-12-10 04:33:36 UTC (rev 26359)
+++ branches/SAMBA_4_0/source/auth/ntlm_check.c 2007-12-10 04:33:39 UTC (rev 26360)
@@ -295,7 +295,7 @@
DATA_BLOB *user_sess_key,
DATA_BLOB *lm_sess_key)
{
- static const uint8_t zeros[8];
+ const static uint8_t zeros[8];
DATA_BLOB tmp_sess_key;
if (stored_nt == NULL) {
Modified: branches/SAMBA_4_0/source/client/client.c
===================================================================
--- branches/SAMBA_4_0/source/client/client.c 2007-12-10 04:33:36 UTC (rev 26359)
+++ branches/SAMBA_4_0/source/client/client.c 2007-12-10 04:33:39 UTC (rev 26360)
@@ -51,8 +51,6 @@
#include "librpc/gen_ndr/ndr_nbt.h"
#include "param/param.h"
-static int io_bufsize = 64512;
-
struct smbclient_context {
char *remote_cur_dir;
struct smbcli_state *cli;
@@ -64,6 +62,7 @@
bool lowercase;
int printmode;
bool translation;
+ int io_bufsize;
};
/* timing globals */
@@ -680,7 +679,7 @@
bool newhandle = false;
uint8_t *data;
struct timeval tp_start;
- int read_size = io_bufsize;
+ int read_size = ctx->io_bufsize;
uint16_t attr;
size_t size;
off_t start = 0;
@@ -1074,7 +1073,7 @@
size_t start = 0;
off_t nread = 0;
uint8_t *buf = NULL;
- int maxwrite = io_bufsize;
+ int maxwrite = ctx->io_bufsize;
int rc = 0;
struct timeval tp_start;
@@ -3017,17 +3016,12 @@
/*****************************************************
return a connection to a server
*******************************************************/
-static struct smbclient_context *do_connect(TALLOC_CTX *mem_ctx,
+static bool do_connect(struct smbclient_context *ctx,
const char *specified_server, const char *specified_share, struct cli_credentials *cred)
{
NTSTATUS status;
- struct smbclient_context *ctx = talloc_zero(mem_ctx, struct smbclient_context);
char *server, *share;
- if (!ctx) {
- return NULL;
- }
-
rl_ctx = ctx; /* Ugly hack */
if (strncmp(specified_share, "\\\\", 2) == 0 ||
@@ -3148,6 +3142,9 @@
exit(1);
}
+ ctx = talloc(mem_ctx, struct smbclient_context);
+ ctx->io_bufsize = 64512;
+
pc = poptGetContext("smbclient", argc, (const char **) argv, long_options, 0);
poptSetOtherOptionHelp(pc, "[OPTIONS] service <password>");
@@ -3176,7 +3173,7 @@
base_directory = strdup(poptGetOptArg(pc));
break;
case 'b':
- io_bufsize = MAX(1, atoi(poptGetOptArg(pc)));
+ ctx->io_bufsize = MAX(1, atoi(poptGetOptArg(pc)));
break;
}
}
@@ -3227,9 +3224,7 @@
return do_message_op(lp_netbios_name(cmdline_lp_ctx), desthost, dest_ip, name_type, lp_name_resolve_order(cmdline_lp_ctx), lp_max_xmit(cmdline_lp_ctx), lp_maxmux(cmdline_lp_ctx));
}
-
- ctx = do_connect(mem_ctx, desthost, service, cmdline_credentials);
- if (!ctx)
+ if (!do_connect(ctx, desthost, service, cmdline_credentials))
return 1;
if (base_directory)
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/partition.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/partition.c 2007-12-10 04:33:36 UTC (rev 26359)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/partition.c 2007-12-10 04:33:39 UTC (rev 26360)
@@ -711,7 +711,7 @@
{
int ret, i;
TALLOC_CTX *mem_ctx = talloc_new(module);
- static const char *attrs[] = { "partition", "replicateEntries", "modules", NULL };
+ const char *attrs[] = { "partition", "replicateEntries", "modules", NULL };
struct ldb_result *res;
struct ldb_message *msg;
struct ldb_message_element *partition_attributes;
More information about the samba-cvs
mailing list