r17584: Some C++ Warnings

[tprouty/samba.git] / source / auth / auth_unix.c

diff --git a/source/auth/auth_unix.c b/source/auth/auth_unix.c
index 29a2a6eafb13505ba57a2db5c9b7eb52d28555a3..efe5203b2336e79e62db0743d15531ce8db53796 100644 (file)
--- a/source/auth/auth_unix.c
+++ b/source/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,17 +20,22 @@
 
 #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;
+       struct samu     *sampass;
        BOOL            ret;
        
-       pdb_init_sam(&sampass);
+       if ( !(sampass = samu_new( NULL )) ) {
+               return False;
+       }
        
        become_root();
        ret = pdb_getsampwnam(sampass, user);
@@ -39,7 +43,7 @@ static BOOL update_smbpassword_file(char *user, char *password)
 
        if(ret == False) {
                DEBUG(0,("pdb_getsampwnam returned NULL\n"));
-               pdb_free_sam(&sampass);
+               TALLOC_FREE(sampass);
                return False;
        }
 
@@ -47,22 +51,20 @@ static BOOL update_smbpassword_file(char *user, char *password)
         * Remove the account disabled flag - we are updating the
         * users password from a login.
         */
-       if (!pdb_set_acct_ctrl(sampass, pdb_get_acct_ctrl(sampass) & ~ACB_DISABLED)) {
-               pdb_free_sam(&sampass);
+       if (!pdb_set_acct_ctrl(sampass, pdb_get_acct_ctrl(sampass) & ~ACB_DISABLED, PDB_CHANGED)) {
+               TALLOC_FREE(sampass);
                return False;
        }
 
        if (!pdb_set_plaintext_passwd (sampass, password)) {
-               pdb_free_sam(&sampass);
+               TALLOC_FREE(sampass);
                return False;
        }
 
        /* 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 = NT_STATUS_IS_OK(pdb_update_sam_account (sampass));
 
        unbecome_root();
 
@@ -70,36 +72,67 @@ 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);
+       TALLOC_FREE(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;
 
        become_root();
-       
-       pass = Get_Pwnam(user_info->unix_username.str);
+       pass = Get_Pwnam(user_info->internal_username);
 
+       
+       /** @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->unix_username.str, 
-                               user_info->plaintext_password.str,
-                               user_info->plaintext_password.len,
+                               pass ? pass->pw_name : user_info->internal_username, 
+                               (char *)user_info->plaintext_password.data,
+                               user_info->plaintext_password.length-1,
                                lp_update_encrypted() ? 
                                update_smbpassword_file : NULL,
                                True);
-
+       
        unbecome_root();
 
+       if (NT_STATUS_IS_OK(nt_status)) {
+               if (pass) {
+                       make_server_info_pw(server_info, pass->pw_name, pass);
+               } else {
+                       /* we need to do somthing more useful here */
+                       nt_status = NT_STATUS_NO_SUCH_USER;
+               }
+       }
+
        return nt_status;
 }
+
+/* module initialisation */
+static NTSTATUS auth_init_unix(struct auth_context *auth_context, const char* param, auth_methods **auth_method) 
+{
+       if (!make_auth_methods(auth_context, auth_method)) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       (*auth_method)->name = "unix";
+       (*auth_method)->auth = check_unix_security;
+       return NT_STATUS_OK;
+}
+
+NTSTATUS auth_unix_init(void)
+{
+       return smb_register_auth(AUTH_INTERFACE_VERSION, "unix", auth_init_unix);
+}