Cleanups!

[kai/samba.git] / source3 / auth / auth_unix.c

diff --git a/source3/auth/auth_unix.c b/source3/auth/auth_unix.c
index 8c4a520350bdcd135379d87f08ee5a7e57f92953..d624cb12614b8bb20f56602b8e17bbd3546c15ba 100644 (file)
--- a/source3/auth/auth_unix.c
+++ b/source3/auth/auth_unix.c
@@ -1,6 +1,5 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 2.2
+   Unix SMB/CIFS implementation.
    Password and authentication handling
    Copyright (C) Andrew Bartlett              2001
    
@@ -21,12 +20,15 @@
 
 #include "includes.h"
 
-/****************************************************************************
-update the encrypted smbpasswd file from the plaintext username and password
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_AUTH
 
-this ugly hack needs to die, but not quite yet...
-*****************************************************************************/
-static BOOL update_smbpassword_file(char *user, char *password)
+/**
+ * update the encrypted smbpasswd file from the plaintext username and password
+ *  
+ *  this ugly hack needs to die, but not quite yet, I think people still use it...
+ **/
+static BOOL update_smbpassword_file(const char *user, const char *password)
 {
        SAM_ACCOUNT     *sampass = NULL;
        BOOL            ret;
@@ -60,9 +62,7 @@ static BOOL update_smbpassword_file(char *user, char *password)
        /* Now write it into the file. */
        become_root();
 
-       /* Here, the override flag is True, because we want to ignore the
-           XXXXXXX'd out password */
-       ret = pdb_update_sam_account (sampass, True);
+       ret = pdb_update_sam_account (sampass);
 
        unbecome_root();
 
@@ -70,19 +70,22 @@ static BOOL update_smbpassword_file(char *user, char *password)
                DEBUG(3,("pdb_update_sam_account returned %d\n",ret));
        }
 
-       memset(password, '\0', strlen(password));
-
        pdb_free_sam(&sampass);
        return ret;
 }
 
 
-/****************************************************************************
-check if a username/password is OK assuming the password 
-in PLAIN TEXT
-****************************************************************************/
+/** Check a plaintext username/password
+ *
+ * Cannot deal with an encrupted password in any manner whatsoever,
+ * unless the account has a null password.
+ **/
 
-NTSTATUS check_unix_security(const auth_usersupplied_info *user_info, auth_serversupplied_info **server_info)
+static NTSTATUS check_unix_security(const struct auth_context *auth_context,
+                            void *my_private_data, 
+                            TALLOC_CTX *mem_ctx,
+                            const auth_usersupplied_info *user_info, 
+                            auth_serversupplied_info **server_info)
 {
        NTSTATUS nt_status;
        struct passwd *pass = NULL;
@@ -90,6 +93,9 @@ NTSTATUS check_unix_security(const auth_usersupplied_info *user_info, auth_serve
        become_root();
        pass = Get_Pwnam(user_info->internal_username.str);
 
+       
+       /** @todo This call assumes a ASCII password, no charset transformation is 
+           done.  We may need to revisit this **/
        nt_status = pass_check(pass,
                                pass ? pass->pw_name : user_info->internal_username.str, 
                                (char *)user_info->plaintext_password.data,
@@ -104,9 +110,21 @@ NTSTATUS check_unix_security(const auth_usersupplied_info *user_info, auth_serve
                if (pass) {
                        make_server_info_pw(server_info, pass);
                } else {
+                       /* we need to do somthing more useful here */
                        nt_status = NT_STATUS_NO_SUCH_USER;
                }
        }
 
        return nt_status;
 }
+
+/* module initialisation */
+BOOL auth_init_unix(struct auth_context *auth_context, auth_methods **auth_method) 
+{
+       if (!make_auth_methods(auth_context, auth_method)) {
+               return False;
+       }
+
+       (*auth_method)->auth = check_unix_security;
+       return True;
+}