summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2001-11-24 12:12:38 +0000
committerAndrew Bartlett <abartlet@samba.org>2001-11-24 12:12:38 +0000
commitd0a2faf78d316fec200497f5f7997df4c477a1e1 (patch)
treea1d9f9f837b2c88e6154fb5ee6214cbcebc97ad4 /source3/include
parentaf1a0238aa106a43006902e8ef593d7853913b0e (diff)
downloadsamba-d0a2faf78d316fec200497f5f7997df4c477a1e1.tar.gz
samba-d0a2faf78d316fec200497f5f7997df4c477a1e1.tar.bz2
samba-d0a2faf78d316fec200497f5f7997df4c477a1e1.zip
This is another rather major change to the samba authenticaion
subystem. The particular aim is to modularized the interface - so that we can have arbitrary password back-ends. This code adds one such back-end, a 'winbind' module to authenticate against the winbind_auth_crap functionality. While fully-functional this code is mainly useful as a demonstration, because we don't get back the info3 as we would for direct ntdomain authentication. This commit introduced the new 'auth methods' parameter, in the spirit of the 'auth order' discussed on the lists. It is renamed because not all the methods may be consulted, even if previous methods fail - they may not have a suitable challenge for example. Also, we have a 'local' authentication method, for old-style 'unix if plaintext, sam if encrypted' authentication and a 'guest' module to handle guest logins in a single place. While this current design is not ideal, I feel that it does provide a better infrastructure than the current design, and can be built upon. The following parameters have changed: - use rhosts = This has been replaced by the 'rhosts' authentication method, and can be specified like 'auth methods = guest rhosts' - hosts equiv = This needs both this parameter and an 'auth methods' entry to be effective. (auth methods = guest hostsequiv ....) - plaintext to smbpasswd = This is replaced by specifying 'sam' rather than 'local' in the auth methods. The security = parameter is unchanged, and now provides defaults for the 'auth methods' parameter. The available auth methods are: guest rhosts hostsequiv sam (passdb direct hash access) unix (PAM, crypt() etc) local (the combination of the above, based on encryption) smbserver (old security=server) ntdomain (old security=domain) winbind (use winbind to cache DC connections) Assistance in testing, or the production of new and interesting authentication modules is always appreciated. Andrew Bartlett (This used to be commit 8d31eae52a9757739711dbb82035a4dfe6b40c99)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/auth.h54
1 files changed, 48 insertions, 6 deletions
diff --git a/source3/include/auth.h b/source3/include/auth.h
index 04c5aa55e5..e33ccc2e24 100644
--- a/source3/include/auth.h
+++ b/source3/include/auth.h
@@ -53,8 +53,6 @@ typedef struct usersupplied_info
uint32 ntlmssp_flags;
- DATA_BLOB sec_blob;
-
AUTH_STR client_domain; /* domain name string */
AUTH_STR domain; /* domain name after mapping */
AUTH_STR internal_username; /* username after mapping */
@@ -69,16 +67,16 @@ typedef struct usersupplied_info
#define SAM_FILL_UNIX 0x08
#define SAM_FILL_ALL (SAM_FILL_NAME | SAM_FILL_INFO3 | SAM_FILL_SAM | SAM_FILL_UNIX)
-typedef struct serversupplied_info
+typedef struct serversupplied_info
{
BOOL guest;
/* This groups info is needed for when we become_user() for this uid */
int n_groups;
gid_t *groups;
-
+
/* NT group information taken from the info3 structure */
-
+
NT_USER_TOKEN *ptok;
uchar session_key[16];
@@ -86,8 +84,52 @@ typedef struct serversupplied_info
uint8 first_8_lm_hash[8];
uint32 sam_fill_level; /* How far is this structure filled? */
-
+
SAM_ACCOUNT *sam_account;
+
+ void *pam_handle;
+
} auth_serversupplied_info;
+typedef struct authsupplied_info {
+ DATA_BLOB challange;
+
+ /* Who set this up in the first place? */
+ char *challange_set_by; \
+
+ struct auth_methods *challange_set_method;
+ /* What order are the various methods in? Try to stop it changing under us */
+ struct auth_methods *auth_method_list;
+} auth_authsupplied_info;
+
+typedef struct auth_methods
+{
+ struct auth_methods *prev, *next;
+ char *name; /* What name got this module */
+
+ NTSTATUS (*auth)(void *my_private_data,
+ const auth_usersupplied_info *user_info,
+ const struct authsupplied_info *auth_info,
+ auth_serversupplied_info **server_info);
+
+ DATA_BLOB (*get_chal)(void **my_private_data, const struct authsupplied_info *auth_info);
+
+ /* Used to keep tabs on things like the cli for SMB server authentication */
+ void *private_data;
+
+ /* Function to clean up the above arbitary structure */
+ void (*free_private_data)(void **private_data);
+
+ /* Function to send a keepalive message on the above structure */
+ void (*send_keepalive)(void **private_data);
+
+} auth_methods;
+
+typedef struct auth_init_function {
+ char *name;
+ /* Function to create a member of the authmethods list */
+ BOOL (*init)(struct auth_methods **auth_method);
+} auth_init_function;
+
+
#endif /* _SMBAUTH_H_ */