diff options
| author | Richard Sharpe <sharpe@samba.org> | 2002-07-13 05:11:58 +0000 |
|---|---|---|
| committer | Richard Sharpe <sharpe@samba.org> | 2002-07-13 05:11:58 +0000 |
| commit | 1e8952c6849d0d5d4984a61080ab49ac2f64e43d (patch) | |
| tree | 8bf1d774d59b1bf855d7729b8181eb3a45036296 /source3/libsmb | |
| parent | a0489b36c1c4e0de05acec022e59f17bf5e5760e (diff) | |
| download | samba-1e8952c6849d0d5d4984a61080ab49ac2f64e43d.tar.gz samba-1e8952c6849d0d5d4984a61080ab49ac2f64e43d.tar.bz2 samba-1e8952c6849d0d5d4984a61080ab49ac2f64e43d.zip | |
Fix some multibyte problems that I forgot about.
(This used to be commit 481a70f4f005a778a24e2193f8e760217ee3c946)
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/libsmbclient.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c index 77a81c10c8..4100005425 100644 --- a/source3/libsmb/libsmbclient.c +++ b/source3/libsmb/libsmbclient.c @@ -122,8 +122,8 @@ smbc_parse_path(SMBCCTX *context, const char *fname, char *server, char *share, */ /* check that '@' occurs before '/', if '/' exists at all */ - q = strchr(p, '@'); - r = strchr(p, '/'); + q = strchr_m(p, '@'); + r = strchr_m(p, '/'); if (q && (!r || q < r)) { pstring username, passwd, domain; char *u = userinfo; @@ -132,13 +132,13 @@ smbc_parse_path(SMBCCTX *context, const char *fname, char *server, char *share, username[0] = passwd[0] = domain[0] = 0; - if (strchr(u, ';')) { + if (strchr_m(u, ';')) { next_token(&u, domain, ";", sizeof(fstring)); } - if (strchr(u, ':')) { + if (strchr_m(u, ':')) { next_token(&u, username, ":", sizeof(fstring)); @@ -342,11 +342,11 @@ SMBCSRV *smbc_server(SMBCCTX *context, DEBUG(4,("smbc_server: server_n=[%s] server=[%s]\n", server_n, server)); - if ((p=strchr(server_n,'#')) && + if ((p=strchr_m(server_n,'#')) && (strcmp(p+1,"1D")==0 || strcmp(p+1,"01")==0)) { fstrcpy(group, server_n); - p = strchr(group,'#'); + p = strchr_m(group,'#'); *p = 0; } |