diff options
| author | Gerald Carter <jerry@samba.org> | 2005-03-11 17:01:30 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:55:59 -0500 |
| commit | 51310680ce751e30fd5b143e87d025e0dc92ff3c (patch) | |
| tree | 8580381b5f889c9d542b62ec7e1150197aa66998 /source3/libsmb | |
| parent | 3677b964c8118a4197f173d432b559e1df3768bc (diff) | |
| download | samba-51310680ce751e30fd5b143e87d025e0dc92ff3c.tar.gz samba-51310680ce751e30fd5b143e87d025e0dc92ff3c.tar.bz2 samba-51310680ce751e30fd5b143e87d025e0dc92ff3c.zip | |
r5752: implement derrell's solution for binary compatibilty in the _SMBCCTX structure; note that we break compat with 3.0.11 but are ok with earlier versions
(This used to be commit 6e8d171551bfe480cb1a526469defc33276550f6)
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/libsmb_cache.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/libsmbclient.c | 16 |
2 files changed, 8 insertions, 10 deletions
diff --git a/source3/libsmb/libsmb_cache.c b/source3/libsmb/libsmb_cache.c index 71399f14db..dabf5a527d 100644 --- a/source3/libsmb/libsmb_cache.c +++ b/source3/libsmb/libsmb_cache.c @@ -143,7 +143,7 @@ static SMBCSRV * smbc_get_cached_server(SMBCCTX * context, const char * server, * a connection to the server (other than the * attribute server connection) is cool. */ - if (context->internal->options.one_share_per_server) { + if (context->options.one_share_per_server) { /* * The currently connected share name * doesn't match the requested share, so diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c index c876720cfa..441ca96478 100644 --- a/source3/libsmb/libsmbclient.c +++ b/source3/libsmb/libsmbclient.c @@ -571,7 +571,7 @@ SMBCSRV *smbc_server(SMBCCTX *context, * If we found a connection and we're only allowed one share per * server... */ - if (srv && *share != '\0' && context->internal->options.one_share_per_server) { + if (srv && *share != '\0' && context->options.one_share_per_server) { /* * ... then if there's no current connection to the share, @@ -1932,9 +1932,9 @@ static SMBCFILE *smbc_opendir_ctx(SMBCCTX *context, const char *fname) } /* Determine how many local master browsers to query */ - max_lmb_count = (context->internal->options.browse_max_lmb_count == 0 + max_lmb_count = (context->options.browse_max_lmb_count == 0 ? INT_MAX - : context->internal->options.browse_max_lmb_count); + : context->options.browse_max_lmb_count); pstrcpy(u_info.username, user); pstrcpy(u_info.password, password); @@ -2216,7 +2216,7 @@ static void smbc_readdir_internal(SMBCCTX * context, struct smbc_dirent *src, int max_namebuf_len) { - if (context->internal->options.urlencode_readdir_entries) { + if (context->options.urlencode_readdir_entries) { /* url-encode the name. get back remaining buffer space */ max_namebuf_len = @@ -4804,8 +4804,6 @@ SMBCCTX * smbc_new_context(void) return NULL; } - context->flags = SMBCCTX_FLAG_CTXVER; - ZERO_STRUCTP(context->internal); @@ -4813,9 +4811,9 @@ SMBCCTX * smbc_new_context(void) context->debug = 0; context->timeout = 20000; /* 20 seconds */ - context->internal->options.browse_max_lmb_count = 3; /* # LMBs to query */ - context->internal->options.urlencode_readdir_entries = False;/* backward compat */ - context->internal->options.one_share_per_server = False;/* backward compat */ + context->options.browse_max_lmb_count = 3; /* # LMBs to query */ + context->options.urlencode_readdir_entries = False;/* backward compat */ + context->options.one_share_per_server = False;/* backward compat */ context->open = smbc_open_ctx; context->creat = smbc_creat_ctx; |