diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-01-14 08:53:59 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-01-14 08:53:59 +0000 |
| commit | 27b7e51a3cc619f879655a3230611457ac43b9e7 (patch) | |
| tree | 7aeb0ed6623ea91092320f13bb12eb167c446809 /source3/utils | |
| parent | d645041d6345ff2802dd2f06ebed1d8f456fee23 (diff) | |
| download | samba-27b7e51a3cc619f879655a3230611457ac43b9e7.tar.gz samba-27b7e51a3cc619f879655a3230611457ac43b9e7.tar.bz2 samba-27b7e51a3cc619f879655a3230611457ac43b9e7.zip | |
Merge from HEAD:
- fstring/pstring mixups
- the detection code that found them (disabled)
- a bit of whitespace
- a static
Andrew Bartlett
(This used to be commit 9b70fa868e7d9481f584c83fc4046174e1dedfd9)
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/nmblookup.c | 2 | ||||
| -rw-r--r-- | source3/utils/smbcacls.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c index 017efc60ae..7e0ed4a203 100644 --- a/source3/utils/nmblookup.c +++ b/source3/utils/nmblookup.c @@ -210,7 +210,7 @@ int main(int argc,char *argv[]) { int opt; unsigned int lookup_type = 0x0; - pstring lookup; + fstring lookup; extern int optind; extern char *optarg; BOOL find_master=False; diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c index e41edcf6f8..a5cee0dae1 100644 --- a/source3/utils/smbcacls.c +++ b/source3/utils/smbcacls.c @@ -718,7 +718,7 @@ static struct cli_state *connect_one(const char *share) if (!got_pass) { char *pass = getpass("Password: "); if (pass) { - pstrcpy(password, pass); + fstrcpy(password, pass); got_pass = True; } } @@ -806,7 +806,7 @@ You can string acls together with spaces, commas or newlines\n\ if ((p=strchr_m(username,'%'))) { *p = 0; - pstrcpy(password,p+1); + fstrcpy(password,p+1); got_pass = True; memset(strchr_m(getenv("USER"), '%') + 1, 'X', strlen(password)); @@ -820,7 +820,7 @@ You can string acls together with spaces, commas or newlines\n\ p = strchr_m(username,'%'); if (p) { *p = 0; - pstrcpy(password, p+1); + fstrcpy(password, p+1); got_pass = 1; } break; |