diff options
| author | Jeremy Allison <jra@samba.org> | 2007-11-29 17:25:41 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-11-29 17:25:41 -0800 |
| commit | f692694b99319ef1f534ea29f001922656402cdf (patch) | |
| tree | d571e437f4ac8b96f1575d3a9732f2354c0065ae /source3/libsmb/cliconnect.c | |
| parent | b05ffb50652c00c721dc085ffd0938e9e6aa019b (diff) | |
| download | samba-f692694b99319ef1f534ea29f001922656402cdf.tar.gz samba-f692694b99319ef1f534ea29f001922656402cdf.tar.bz2 samba-f692694b99319ef1f534ea29f001922656402cdf.zip | |
Remove PSTRING_LEN from smbd/ nmbd/.
Remove pstring from libsmb/clidfs.c except for a nasty
hack (that will be removed when pstrings are gone from
client/).
Jeremy.
(This used to be commit cc257b71d13daa47e6f2315d0f07a60eb4aaeca6)
Diffstat (limited to 'source3/libsmb/cliconnect.c')
| -rw-r--r-- | source3/libsmb/cliconnect.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index e3800bfb33..14140811d2 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -879,8 +879,8 @@ ntlmssp: password is in plaintext, the same should be done. ****************************************************************************/ -NTSTATUS cli_session_setup(struct cli_state *cli, - const char *user, +NTSTATUS cli_session_setup(struct cli_state *cli, + const char *user, const char *pass, int passlen, const char *ntpass, int ntpasslen, const char *workgroup) @@ -888,8 +888,17 @@ NTSTATUS cli_session_setup(struct cli_state *cli, char *p; fstring user2; + if (user) { + fstrcpy(user2, user); + } else { + user2[0] ='\0'; + } + + if (!workgroup) { + workgroup = ""; + } + /* allow for workgroups as part of the username */ - fstrcpy(user2, user); if ((p=strchr_m(user2,'\\')) || (p=strchr_m(user2,'/')) || (p=strchr_m(user2,*lp_winbind_separator()))) { *p = 0; |