summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-03-11 10:35:41 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:55:58 -0500
commit44f1a1a510d0776fb4a892e65f4c11fa19418fb7 (patch)
tree9d81e781a83cfed90afc1135b0fd2eaaed4c4328
parent9d65e0778425b1e49e789178999ce98e59395569 (diff)
downloadsamba-44f1a1a510d0776fb4a892e65f4c11fa19418fb7.tar.gz
samba-44f1a1a510d0776fb4a892e65f4c11fa19418fb7.tar.bz2
samba-44f1a1a510d0776fb4a892e65f4c11fa19418fb7.zip
r5738: fix my build breakage; fix a few compiler warnings
(This used to be commit acbe9efeb6de33610776560978f8632cbb847821)
-rw-r--r--source3/libsmb/libsmb_cache.c2
-rw-r--r--source3/libsmb/libsmbclient.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/source3/libsmb/libsmb_cache.c b/source3/libsmb/libsmb_cache.c
index dabf5a527d..71399f14db 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->options.one_share_per_server) {
+ if (context->internal->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 bc15fe7d50..c876720cfa 100644
--- a/source3/libsmb/libsmbclient.c
+++ b/source3/libsmb/libsmbclient.c
@@ -4370,9 +4370,7 @@ int smbc_getxattr_ctx(SMBCCTX *context,
/* Yup. */
ret = cacl_get(context, ctx, srv,
ipc_srv == NULL ? NULL : &ipc_srv->cli,
- &pol,
- (char *) path, (char *) name,
- (const char *) value, size);
+ &pol, path, name, (const char *) value, size);
if (ret < 0 && errno == 0) {
errno = smbc_errno(context, &srv->cli);
}