summaryrefslogtreecommitdiff
path: root/source3/libsmb/libsmb_file.c
diff options
context:
space:
mode:
authorDerrell Lipman <derrell.lipman@unwireduniverse.com>2008-03-03 18:13:33 -0500
committerKarolin Seeger <ks@sernet.de>2008-03-04 09:02:42 +0100
commit2f0a61564ae080b027d43d77428d290fd8ca017b (patch)
treee0a6d6892e148222a922582a5f75aa2412dbc70f /source3/libsmb/libsmb_file.c
parent8cd0cf153e409dd49e66bd500fad8501371a83a5 (diff)
downloadsamba-2f0a61564ae080b027d43d77428d290fd8ca017b.tar.gz
samba-2f0a61564ae080b027d43d77428d290fd8ca017b.tar.bz2
samba-2f0a61564ae080b027d43d77428d290fd8ca017b.zip
Continued revamping of libsmbclient.
- James suggested using gcc's "deprecated" attribute to mark the context structure fields to generate warnings. This creates a scenario with the best of all worlds. I'm able to move to an organization that more easily allows future enhancements, while avoiding any mandatory changes by applications. Thanks, James! - Updated WHATSNEW.txt so that it accurately reflects the current state of affairs. Derrell (cherry picked from commit a67f96fbe9683b46c2149f7cb439d13f7f0e6ecd) (This used to be commit 046653403fadfa2d42decce7048eca6321b321c6)
Diffstat (limited to 'source3/libsmb/libsmb_file.c')
-rw-r--r--source3/libsmb/libsmb_file.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/libsmb/libsmb_file.c b/source3/libsmb/libsmb_file.c
index 73c9b96978..423450b23e 100644
--- a/source3/libsmb/libsmb_file.c
+++ b/source3/libsmb/libsmb_file.c
@@ -82,7 +82,7 @@ SMBC_open_ctx(SMBCCTX *context,
}
if (!user || user[0] == (char)0) {
- user = talloc_strdup(frame, context->config.user);
+ user = talloc_strdup(frame, smbc_getUser(context));
if (!user) {
errno = ENOMEM;
TALLOC_FREE(frame);
@@ -188,7 +188,7 @@ SMBC_open_ctx(SMBCCTX *context,
int eno = 0;
eno = SMBC_errno(context, srv->cli);
- file = (context->posix_emu.opendir_fn)(context, fname);
+ file = smbc_getFunctionOpendir(context)(context, fname);
if (!file) errno = eno;
TALLOC_FREE(frame);
return file;
@@ -439,7 +439,7 @@ SMBC_close_ctx(SMBCCTX *context,
/* IS a dir ... */
if (!file->file) {
TALLOC_FREE(frame);
- return (context->posix_emu.closedir_fn)(context, file);
+ return smbc_getFunctionClosedir(context)(context, file);
}
/*d_printf(">>>close: parsing %s\n", file->fname);*/
@@ -478,7 +478,7 @@ SMBC_close_ctx(SMBCCTX *context,
DLIST_REMOVE(context->internal->files, file);
SAFE_FREE(file->fname);
SAFE_FREE(file);
- (context->server.remove_unused_server_fn)(context, srv);
+ smbc_getFunctionRemoveUnusedServer(context)(context, srv);
TALLOC_FREE(frame);
return -1;