diff options
| author | Andrew Tridgell <tridge@samba.org> | 1997-09-14 16:37:18 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1997-09-14 16:37:18 +0000 |
| commit | 33a003de4056532be0c9a199d4857b9da1b18034 (patch) | |
| tree | 69362f80d2ff1db2d79bd218701f5cff2320f8ed /source3/client | |
| parent | 58ec10049b8029de82e70ba10559e143a1b16707 (diff) | |
| download | samba-33a003de4056532be0c9a199d4857b9da1b18034.tar.gz samba-33a003de4056532be0c9a199d4857b9da1b18034.tar.bz2 samba-33a003de4056532be0c9a199d4857b9da1b18034.zip | |
This commit does 3 main things:
1) put the encryption code in by default, with no #ifdef. It is still
disabled by default so you need to add "encrypt passwords = yes" in
smb.conf but at least all binaries will have it.
2) cleanup the kanji code so it compiles with no warnings
3) get rid of lots of uses of ugly non-portable C code. The main
offender being things like "register" but also remove uses of the
"const" keyword as there are compilers out there that don't support it
and even those that do often complain about its usage. Users don't
like warnings :-(
There is still some work to do. We need to replace the md4 code with
our own implementation. The current code (from rfc1186) is PD but is
not very portable. The new RFC (rfc1320) is more portable but adds
copyright restrictions. I'll do a from-scratch MD4 soon.
We also need to test that what I've implemented is portable. It should
be, but I'm too tired right now to test it on anything other than
intel linux.
(This used to be commit db917c62c14315afe6f0745a8097c1bca25cbf07)
Diffstat (limited to 'source3/client')
| -rw-r--r-- | source3/client/client.c | 6 | ||||
| -rw-r--r-- | source3/client/clientutil.c | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index e9042555e2..da4acbb855 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -3303,15 +3303,11 @@ static BOOL send_login(char *inbuf,char *outbuf,BOOL start_session,BOOL use_setu int passlen = strlen(pass)+1; strcpy(pword,pass); -#ifdef SMB_PASSWD if (doencrypt && *pass) { DEBUG(3,("Using encrypted passwords\n")); passlen = 24; SMBencrypt((uchar *)pass,(uchar *)cryptkey,(uchar *)pword); } -#else - doencrypt = False; -#endif /* if in share level security then don't send a password now */ if (!(sec_mode & 1)) {strcpy(pword, "");passlen=1;} @@ -3422,12 +3418,10 @@ static BOOL send_login(char *inbuf,char *outbuf,BOOL start_session,BOOL use_setu fstring pword; strcpy(pword,pass); -#ifdef SMB_PASSWD if (doencrypt && *pass) { passlen=24; SMBencrypt((uchar *)pass,(uchar *)cryptkey,(uchar *)pword); } -#endif /* if in user level security then don't send a password now */ if ((sec_mode & 1)) { diff --git a/source3/client/clientutil.c b/source3/client/clientutil.c index b4f0849c5f..07c340ccac 100644 --- a/source3/client/clientutil.c +++ b/source3/client/clientutil.c @@ -440,15 +440,11 @@ BOOL cli_send_login(char *inbuf, char *outbuf, BOOL start_session, BOOL use_setu int passlen = strlen(pass)+1; strcpy(pword,pass); -#ifdef SMB_PASSWD if (doencrypt && *pass) { DEBUG(5,("Using encrypted passwords\n")); passlen = 24; SMBencrypt((uchar *)pass,(uchar *)cryptkey,(uchar *)pword); } -#else - doencrypt = False; -#endif /* if in share level security then don't send a password now */ if (!(sec_mode & 1)) {strcpy(pword, "");passlen=1;} @@ -559,12 +555,10 @@ BOOL cli_send_login(char *inbuf, char *outbuf, BOOL start_session, BOOL use_setu fstring pword; strcpy(pword,pass); -#ifdef SMB_PASSWD if (doencrypt && *pass) { passlen=24; SMBencrypt((uchar *)pass,(uchar *)cryptkey,(uchar *)pword); } -#endif /* if in user level security then don't send a password now */ if ((sec_mode & 1)) { |