diff options
| author | Gerald Carter <jerry@samba.org> | 2007-05-21 21:17:21 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2007-05-21 21:17:21 +0000 |
| commit | 34059e63c8a644b10cf9a59cca5e67a45053d16e (patch) | |
| tree | b0751d47f93023938656df3c6173618dfef4f1e5 /source/libsmb/libsmbclient.c | |
| parent | c3f0e56c057f6be60bd3721485f013ed63defa6a (diff) | |
| download | samba-34059e63c8a644b10cf9a59cca5e67a45053d16e.tar.gz samba-34059e63c8a644b10cf9a59cca5e67a45053d16e.tar.xz samba-34059e63c8a644b10cf9a59cca5e67a45053d16e.zip | |
r23052: sync with SAMBA_3_0_25 and start updating release notes
Diffstat (limited to 'source/libsmb/libsmbclient.c')
| -rw-r--r-- | source/libsmb/libsmbclient.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/source/libsmb/libsmbclient.c b/source/libsmb/libsmbclient.c index e305409b87c..e04a6385a07 100644 --- a/source/libsmb/libsmbclient.c +++ b/source/libsmb/libsmbclient.c @@ -500,7 +500,7 @@ static int smbc_check_server(SMBCCTX * context, SMBCSRV * server) { - size_t size; + socklen_t size; struct sockaddr addr; /* @@ -4556,7 +4556,7 @@ cacl_get(SMBCCTX *context, return -1; } n = strlen(p); - } else { + } else if (sidstr[0] != '\0') { n = snprintf(buf, bufsize, ",OWNER:%s", sidstr); } @@ -4601,7 +4601,7 @@ cacl_get(SMBCCTX *context, return -1; } n = strlen(p); - } else { + } else if (sidstr[0] != '\0') { n = snprintf(buf, bufsize, ",GROUP:%s", sidstr); } @@ -4709,7 +4709,7 @@ cacl_get(SMBCCTX *context, ace->access_mask); } } - if (n > bufsize) { + if (!determine_size && n > bufsize) { errno = ERANGE; return -1; } @@ -5327,7 +5327,9 @@ smbc_setxattr_ctx(SMBCCTX *context, ipc_srv = smbc_attr_server(context, server, share, workgroup, user, password, &pol); - srv->no_nt_session = True; + if (! ipc_srv) { + srv->no_nt_session = True; + } } else { ipc_srv = NULL; } @@ -5752,7 +5754,9 @@ smbc_removexattr_ctx(SMBCCTX *context, ipc_srv = smbc_attr_server(context, server, share, workgroup, user, password, &pol); - srv->no_nt_session = True; + if (! ipc_srv) { + srv->no_nt_session = True; + } } else { ipc_srv = NULL; } |