summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2004-05-09 23:05:37 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:51:54 -0500
commitbc8e2d5f23bdf539310e53fbad0e98f10465287f (patch)
treee5880a19a2deae450f252d246491d2ab11a790c8 /source4
parentc9bf9773e0634f6346cdd2c62743a1251484b640 (diff)
downloadsamba-bc8e2d5f23bdf539310e53fbad0e98f10465287f.tar.gz
samba-bc8e2d5f23bdf539310e53fbad0e98f10465287f.tar.bz2
samba-bc8e2d5f23bdf539310e53fbad0e98f10465287f.zip
r620: Remove more ununsed code.
Andrew Bartlett (This used to be commit 795ace17a8905f495e9e191ffbd559927894941b)
Diffstat (limited to 'source4')
-rw-r--r--source4/auth/auth_compat.c121
-rw-r--r--source4/auth/config.m42
-rw-r--r--source4/smbd/rewrite.c5
3 files changed, 1 insertions, 127 deletions
diff --git a/source4/auth/auth_compat.c b/source4/auth/auth_compat.c
deleted file mode 100644
index d8c1ad78f0..0000000000
--- a/source4/auth/auth_compat.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- Password and authentication handling
- Copyright (C) Andrew Bartlett 2001-2002
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_AUTH
-
-/****************************************************************************
- COMPATIBILITY INTERFACES:
- ***************************************************************************/
-
-/****************************************************************************
-check if a username/password is OK assuming the password is a 24 byte
-SMB hash
-return True if the password is correct, False otherwise
-****************************************************************************/
-
-NTSTATUS check_plaintext_password(const char *smb_name, DATA_BLOB plaintext_password, auth_serversupplied_info **server_info)
-{
- struct auth_context *plaintext_auth_context = NULL;
- auth_usersupplied_info *user_info = NULL;
- const uint8 *chal;
- NTSTATUS nt_status;
- if (!NT_STATUS_IS_OK(nt_status = make_auth_context_subsystem(&plaintext_auth_context))) {
- return nt_status;
- }
-
- chal = plaintext_auth_context->get_ntlm_challenge(plaintext_auth_context);
-
- if (!make_user_info_for_reply(&user_info,
- smb_name, lp_workgroup(), chal,
- plaintext_password)) {
- return NT_STATUS_NO_MEMORY;
- }
-
- nt_status = plaintext_auth_context->check_ntlm_password(plaintext_auth_context,
- user_info, server_info);
-
- (plaintext_auth_context->free)(&plaintext_auth_context);
- free_user_info(&user_info);
- return nt_status;
-}
-
-static NTSTATUS pass_check_smb(struct server_context *smb,
- const char *smb_name,
- const char *domain,
- DATA_BLOB lm_pwd,
- DATA_BLOB nt_pwd,
- DATA_BLOB plaintext_password,
- BOOL encrypted)
-
-{
- NTSTATUS nt_status;
- auth_serversupplied_info *server_info = NULL;
- if (encrypted) {
- auth_usersupplied_info *user_info = NULL;
- make_user_info_for_reply_enc(&user_info, smb_name,
- domain,
- lm_pwd,
- nt_pwd);
- nt_status = smb->negotiate.auth_context->check_ntlm_password(smb->negotiate.auth_context,
- user_info, &server_info);
- free_user_info(&user_info);
- } else {
- nt_status = check_plaintext_password(smb_name, plaintext_password, &server_info);
- }
- free_server_info(&server_info);
- return nt_status;
-}
-
-/****************************************************************************
-check if a username/password pair is ok via the auth subsystem.
-return True if the password is correct, False otherwise
-****************************************************************************/
-BOOL password_ok(struct server_context *smb, const char *smb_name, DATA_BLOB password_blob)
-{
-
- DATA_BLOB null_password = data_blob(NULL, 0);
- BOOL encrypted = (smb->negotiate.encrypted_passwords && password_blob.length == 24);
-
- if (encrypted) {
- /*
- * The password could be either NTLM or plain LM. Try NTLM first,
- * but fall-through as required.
- * NTLMv2 makes no sense here.
- */
- if (NT_STATUS_IS_OK(pass_check_smb(smb, smb_name, lp_workgroup(), null_password, password_blob, null_password, encrypted))) {
- return True;
- }
-
- if (NT_STATUS_IS_OK(pass_check_smb(smb, smb_name, lp_workgroup(), password_blob, null_password, null_password, encrypted))) {
- return True;
- }
- } else {
- if (NT_STATUS_IS_OK(pass_check_smb(smb, smb_name, lp_workgroup(), null_password, null_password, password_blob, encrypted))) {
- return True;
- }
- }
-
- return False;
-}
-
-
diff --git a/source4/auth/config.m4 b/source4/auth/config.m4
index cb547301f5..23c7b8a3f5 100644
--- a/source4/auth/config.m4
+++ b/source4/auth/config.m4
@@ -5,5 +5,5 @@ SMB_MODULE(auth_builtin,AUTH,STATIC,[auth/auth_builtin.o])
SMB_MODULE(auth_unix,AUTH,STATIC,[auth/auth_unix.o])
SMB_SUBSYSTEM(AUTH,auth/auth.o,
- [auth/auth_ntlmssp.o auth/auth_util.o auth/pampass.o auth/pass_check.o auth/auth_compat.o],
+ [auth/auth_ntlmssp.o auth/auth_util.o auth/pampass.o auth/pass_check.o],
auth/auth_public_proto.h)
diff --git a/source4/smbd/rewrite.c b/source4/smbd/rewrite.c
index 91ccbaf4e4..e5e9340a72 100644
--- a/source4/smbd/rewrite.c
+++ b/source4/smbd/rewrite.c
@@ -62,8 +62,3 @@ BOOL init_names(void)
BOOL become_user_permanently(uid_t uid, gid_t gid)
{ return True; }
-
-int sys_getgrouplist(const char *user, gid_t gid, gid_t *groups, int *ngroups)
-{
- return 0;
-}